| Chunk |
|---|
| Conflicting content |
|---|
v1.addEdge("targets", v3);
Assert.assertEquals(1, count(v1.getEdges(v2, Direction.OUT, "targets")));
<<<<<<< HEAD
Assert.assertEquals(0, count(v1.getEdges(v2, Direction.IN, "targets")));
=======
>>>>>>> f61299e73374a327e87b89c69efa67a4efad96a9
Assert.assertEquals(0, count(v1.getEdges(v2, Direction.OUT, "aaa")));
Assert.assertEquals(1, count(v1.getEdges(v3, Direction.OUT, "targets")));
Assert.assertEquals(0, count(v1.getEdges(v3, Direction.OUT, "bbb"))); |
| Solution content |
|---|
v1.addEdge("targets", v3);
Assert.assertEquals(1, count(v1.getEdges(v2, Direction.OUT, "targets")));
Assert.assertEquals(0, count(v1.getEdges(v2, Direction.IN, "targets")));
Assert.assertEquals(0, count(v1.getEdges(v2, Direction.OUT, "aaa")));
Assert.assertEquals(1, count(v1.getEdges(v3, Direction.OUT, "targets")));
Assert.assertEquals(0, count(v1.getEdges(v3, Direction.OUT, "bbb"))); |
| File |
|---|
| OrientGraphSpecificTestSuite.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
Assert.assertEquals(1, count(v1.getEdges(v2, Direction.OUT))); Assert.assertEquals(1, count(v1.getEdges(v3, Direction.OUT))); <<<<<<< HEAD Assert.assertEquals(1, count(v2.getEdges(v1, Direction.IN, "targets"))); Assert.assertEquals(0, count(v2.getEdges(v1, Direction.OUT, "targets"))); Assert.assertEquals(0, count(v2.getEdges(v1, Direction.IN, "aaa"))); Assert.assertEquals(1, count(v2.getEdges(v1, Direction.IN, "targets"))); Assert.assertEquals(0, count(v2.getEdges(v1, Direction.IN, "bbb"))); Assert.assertEquals(1, count(v2.getEdges(v1, Direction.IN))); ======= >>>>>>> f61299e73374a327e87b89c69efa67a4efad96a9 graph.shutdown(); } |
| Solution content |
|---|
Assert.assertEquals(1, count(v1.getEdges(v2, Direction.OUT))); Assert.assertEquals(1, count(v1.getEdges(v3, Direction.OUT))); Assert.assertEquals(1, count(v2.getEdges(v1, Direction.IN, "targets"))); Assert.assertEquals(0, count(v2.getEdges(v1, Direction.OUT, "targets"))); Assert.assertEquals(0, count(v2.getEdges(v1, Direction.IN, "aaa"))); Assert.assertEquals(1, count(v2.getEdges(v1, Direction.IN, "targets"))); Assert.assertEquals(0, count(v2.getEdges(v1, Direction.IN, "bbb"))); Assert.assertEquals(1, count(v2.getEdges(v1, Direction.IN))); graph.shutdown(); } |
| File |
|---|
| OrientGraphSpecificTestSuite.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |