negotiation revamp

Author: peterli-r3

…mples/negotiation/states/TradeState.java …egotiation/states/ProposalStateTest.javaAdvanced/negotiation-cordapp/contracts/src/test/java/net/corda/samples/negotiation/states/TradeState.java renamed to Advanced/negotiation-cordapp/contracts/src/test/java/net/corda/samples/negotiation/states/ProposalStateTest.java Advanced/negotiation-cordapp/contracts/src/test/java/net/corda/samples/negotiation/states/TradeState.java renamed to Advanced/negotiation-cordapp/contracts/src/test/java/net/corda/samples/negotiation/states/ProposalStateTest.java

@@ -1,4 +1,4 @@
 package net.corda.samples.negotiation.states;
-
-public class TradeState {
+//TODO
+public class ProposalStateTest {
 }

…es/negotiation/states/ProposalState.java …s/negotiation/states/TradeStateTest.javaAdvanced/negotiation-cordapp/contracts/src/test/java/net/corda/samples/negotiation/states/ProposalState.java renamed to Advanced/negotiation-cordapp/contracts/src/test/java/net/corda/samples/negotiation/states/TradeStateTest.java Advanced/negotiation-cordapp/contracts/src/test/java/net/corda/samples/negotiation/states/ProposalState.java renamed to Advanced/negotiation-cordapp/contracts/src/test/java/net/corda/samples/negotiation/states/TradeStateTest.java

@@ -1,4 +1,4 @@
 package net.corda.samples.negotiation.states;
-
-public class ProposalState {
+//TODO
+public class TradeStateTest {
 }

Advanced/negotiation-cordapp/gradle.properties

@@ -1,3 +1,3 @@
-name=Test
+name=Negotiation Cordapp
 group=com.negotiation
 version=0.2

Advanced/negotiation-cordapp/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

Advanced/negotiation-cordapp/workflows/src/integrationTest/java/net/corda/samples/negotiation/flows/DriverBasedTest.java

@@ -0,0 +1,48 @@
+package net.corda.samples.negotiation.flows;
+
+import com.google.common.collect.ImmutableList;
+import net.corda.core.concurrent.CordaFuture;
+import net.corda.core.identity.CordaX500Name;
+import net.corda.testing.core.TestIdentity;
+import net.corda.testing.driver.DriverParameters;
+import net.corda.testing.driver.NodeHandle;
+import net.corda.testing.driver.NodeParameters;
+import org.junit.Test;
+
+import java.util.List;
+
+import static net.corda.testing.driver.Driver.driver;
+import static org.junit.Assert.assertEquals;
+
+public class DriverBasedTest {
+    private final TestIdentity bankA = new TestIdentity(new CordaX500Name("BankA", "", "GB"));
+    private final TestIdentity bankB = new TestIdentity(new CordaX500Name("BankB", "", "US"));
+
+    @Test
+    public void nodeTest() {
+        driver(new DriverParameters().withIsDebug(true).withStartNodesInProcess(true), dsl -> {
+            // Start a pair of nodes and wait for them both to be ready.
+            List<CordaFuture<NodeHandle>> handleFutures = ImmutableList.of(
+                    dsl.startNode(new NodeParameters().withProvidedName(bankA.getName())),
+                    dsl.startNode(new NodeParameters().withProvidedName(bankB.getName()))
+            );
+
+            try {
+                NodeHandle partyAHandle = handleFutures.get(0).get();
+                NodeHandle partyBHandle = handleFutures.get(1).get();
+
+                // From each node, make an RPC call to retrieve another node's name from the network map, to verify that the
+                // nodes have started and can communicate.
+
+                // This is a very basic test: in practice tests would be starting flows, and verifying the states in the vault
+                // and other important metrics to ensure that your CorDapp is working as intended.
+                assertEquals(partyAHandle.getRpc().wellKnownPartyFromX500Name(bankB.getName()).getName(), bankB.getName());
+                assertEquals(partyBHandle.getRpc().wellKnownPartyFromX500Name(bankA.getName()).getName(), bankA.getName());
+            } catch (Exception e) {
+                throw new RuntimeException("Caught exception during test: ", e);
+            }
+
+            return null;
+        });
+    }
+}

Advanced/obligation-cordapp/gradle.properties

@@ -1,3 +1,3 @@
-name=Test
+name=Obligation CorDapp
 group=com.obligation
-version=0.1
+version=1.0