| Chunk |
|---|
| Conflicting content |
|---|
log.info("Done.");
<<<<<<< HEAD
LinkContract linkContract = LinkContracts.getLinkContract(contextNode1111_2, false);
assertEquals(linkContract.getNodesWithPermission(XDILinkContractPermission.LC_OP_GET).next(), contextNode1111_2);
assertEquals(linkContract.getAssignees().next(), contextNode4444);
=======
assertTrue(i > 1);
>>>>>>> 56036e76e2a440a0135f7e96c75640f6933047f1
}
} |
| Solution content |
|---|
assertEquals(new IteratorCounter(LinkContracts.getAllLinkContracts(graph)).count(), 1);
assertNull(LinkContracts.getLinkContract(contextNode1111_1, false));
assertNotNull(LinkContracts.getLinkContract(contextNode1111_2, false));
assertNotNull(LinkContracts.findLinkContractByAddress(graph, new XRI3Segment("$(=!1111)$(!2)$do")));
LinkContract linkContract = LinkContracts.getLinkContract(contextNode1111_2, false);
assertEquals(linkContract.getNodesWithPermission(XDILinkContractPermission.LC_OP_GET).next(), contextNode1111_2);
assertEquals(linkContract.getAssignees().next(), contextNode4444);
}
} |
| File |
|---|
| SimpleLinkContractsTest.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method invocation |
| Variable |