Merge pull request corda#4 from xavierlepretre/master

peterli-r3 · web-flow · commit 2b15a9d2b0e2 · 2020-05-11T09:22:44.000-04:00
Fixed different lender and borrower test.
diff --git a/Basic/cordapp-example/contracts-java/src/main/java/com/example/contract/IOUContract.java b/Basic/cordapp-example/contracts-java/src/main/java/com/example/contract/IOUContract.java
@@ -42,7 +42,7 @@ public void verify(LedgerTransaction tx) {
                     tx.getOutputs().size() == 1);
             final IOUState out = tx.outputsOfType(IOUState.class).get(0);
             require.using("The lender and the borrower cannot be the same entity.",
-                    out.getLender() != out.getBorrower());
+                    !out.getLender().equals(out.getBorrower()));
             require.using("All of the participants must be signers.",
                     command.getSigners().containsAll(out.getParticipants().stream().map(AbstractParty::getOwningKey).collect(Collectors.toList())));
 
diff --git a/Basic/cordapp-example/workflows-java/src/test/java/com/example/test/contract/IOUContractTests.java b/Basic/cordapp-example/workflows-java/src/test/java/com/example/test/contract/IOUContractTests.java
@@ -9,8 +9,7 @@
 import net.corda.testing.node.MockServices;
 import org.junit.Test;
 
-import static java.util.Arrays.*;
-
+import static java.util.Arrays.asList;
 import static net.corda.testing.node.NodeTestUtils.ledger;
 
 public class IOUContractTests {
@@ -89,9 +88,10 @@ public void borrowerMustSignTransaction() {
 
     @Test
     public void lenderIsNotBorrower() {
+        final TestIdentity megaCorpDupe = new TestIdentity(megaCorp.getName(), megaCorp.getKeyPair());
         ledger(ledgerServices, (ledger -> {
             ledger.transaction(tx -> {
-                tx.output(IOUContract.ID, new IOUState(iouValue, megaCorp.getParty(), megaCorp.getParty(), new UniqueIdentifier()));
+                tx.output(IOUContract.ID, new IOUState(iouValue, megaCorp.getParty(), megaCorpDupe.getParty(), new UniqueIdentifier()));
                 tx.command(ImmutableList.of(megaCorp.getPublicKey(), miniCorp.getPublicKey()), new IOUContract.Commands.Create());
                 tx.failsWith("The lender and the borrower cannot be the same entity.");
                 return null;
