ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-14 13:18:18 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Enable new test to run in remote database mode - add SQL setup, add finance packages to create tables by Liquidate. (#1284)

Browse Source
This commit is contained in:
szymonsztuka
2018-07-20 14:09:58 +01:00
committed by GitHub
parent 099756c4c7
commit 6e91fcbb32
5 changed files with 61 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
docs/source/example-code/src/integration-test/java/net/corda/docs/JavaIntegrationTestingTutorial.java
View File

@ -14,13 +14,15 @@ import net.corda.finance.flows.CashPaymentFlow;
import net.corda.testing.driver.DriverParameters; import net.corda.testing.driver.DriverParameters;
import net.corda.testing.driver.NodeHandle; import net.corda.testing.driver.NodeHandle;
import net.corda.testing.driver.NodeParameters; import net.corda.testing.driver.NodeParameters;
import net.corda.testing.internal.IntegrationTest;
import net.corda.testing.internal.IntegrationTestKt;
import net.corda.testing.internal.IntegrationTestSchemas;
import net.corda.testing.node.User; import net.corda.testing.node.User;
import org.junit.ClassRule;
import org.junit.Test; import org.junit.Test;
import rx.Observable; import rx.Observable;
import java.util.Currency; import java.util.*;
import java.util.HashSet;
import java.util.List;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
import static java.util.Collections.singletonList; import static java.util.Collections.singletonList;
@ -31,16 +33,22 @@ import static net.corda.testing.core.ExpectKt.expect;
import static net.corda.testing.core.ExpectKt.expectEvents; import static net.corda.testing.core.ExpectKt.expectEvents;
import static net.corda.testing.core.TestConstants.ALICE_NAME; import static net.corda.testing.core.TestConstants.ALICE_NAME;
import static net.corda.testing.core.TestConstants.BOB_NAME; import static net.corda.testing.core.TestConstants.BOB_NAME;
import static net.corda.testing.core.TestConstants.DUMMY_NOTARY_NAME;
import static net.corda.testing.driver.Driver.driver; import static net.corda.testing.driver.Driver.driver;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
public class JavaIntegrationTestingTutorial { public class JavaIntegrationTestingTutorial extends IntegrationTest {
@ClassRule
public static IntegrationTestSchemas databaseSchemas = new IntegrationTestSchemas(IntegrationTestKt.toDatabaseSchemaName(ALICE_NAME), IntegrationTestKt.toDatabaseSchemaName(BOB_NAME),
IntegrationTestKt.toDatabaseSchemaName(DUMMY_NOTARY_NAME));
@Test @Test
public void aliceBobCashExchangeExample() { public void aliceBobCashExchangeExample() {
// START 1 // START 1
driver(new DriverParameters() driver(new DriverParameters()
.withStartNodesInProcess(true) .withStartNodesInProcess(true)
.withExtraCordappPackagesToScan(singletonList("net.corda.finance.contracts.asset")), dsl -> { .withExtraCordappPackagesToScan(Arrays.asList("net.corda.finance.contracts.asset", "net.corda.finance.schemas")), dsl -> {
User aliceUser = new User("aliceUser", "testPassword1", new HashSet<>(asList( User aliceUser = new User("aliceUser", "testPassword1", new HashSet<>(asList(
startFlow(CashIssueAndPaymentFlow.class), startFlow(CashIssueAndPaymentFlow.class),

11
docs/source/example-code/src/integration-test/java/net/corda/docs/java/TutorialFlowAsyncOperationTest.java
View File

@ -7,7 +7,11 @@ import net.corda.core.utilities.KotlinUtilsKt;
import net.corda.docs.java.tutorial.flowstatemachines.ExampleSummingFlow; import net.corda.docs.java.tutorial.flowstatemachines.ExampleSummingFlow;
import net.corda.node.services.Permissions; import net.corda.node.services.Permissions;
import net.corda.testing.driver.*; import net.corda.testing.driver.*;
import net.corda.testing.internal.IntegrationTest;
import net.corda.testing.internal.IntegrationTestKt;
import net.corda.testing.internal.IntegrationTestSchemas;
import net.corda.testing.node.User; import net.corda.testing.node.User;
import org.junit.ClassRule;
import org.junit.Test; import org.junit.Test;
import java.util.Collections; import java.util.Collections;
@ -15,9 +19,14 @@ import java.util.HashSet;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import static net.corda.testing.core.TestConstants.ALICE_NAME; import static net.corda.testing.core.TestConstants.ALICE_NAME;
import static net.corda.testing.core.TestConstants.DUMMY_NOTARY_NAME;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
public final class TutorialFlowAsyncOperationTest { public final class TutorialFlowAsyncOperationTest extends IntegrationTest {
@ClassRule
public static IntegrationTestSchemas databaseSchemas = new IntegrationTestSchemas(IntegrationTestKt.toDatabaseSchemaName(ALICE_NAME), IntegrationTestKt.toDatabaseSchemaName(DUMMY_NOTARY_NAME));
// DOCSTART summingWorks // DOCSTART summingWorks
@Test @Test
public final void summingWorks() { public final void summingWorks() {

15
docs/source/example-code/src/integration-test/kotlin/net/corda/docs/KotlinIntegrationTestingTutorial.kt
View File

@ -19,19 +19,30 @@ import net.corda.node.services.Permissions.Companion.startFlow
import net.corda.testing.core.* import net.corda.testing.core.*
import net.corda.testing.driver.DriverParameters import net.corda.testing.driver.DriverParameters
import net.corda.testing.driver.driver import net.corda.testing.driver.driver
import net.corda.testing.internal.IntegrationTest
import net.corda.testing.internal.IntegrationTestSchemas
import net.corda.testing.internal.toDatabaseSchemaName
import net.corda.testing.node.User import net.corda.testing.node.User
import org.junit.ClassRule
import org.junit.Test import org.junit.Test
import rx.Observable import rx.Observable
import java.util.* import java.util.*
import kotlin.test.assertEquals import kotlin.test.assertEquals
class KotlinIntegrationTestingTutorial { class KotlinIntegrationTestingTutorial : IntegrationTest() {
companion object {
@ClassRule
@JvmField
val databaseSchemas = IntegrationTestSchemas(ALICE_NAME.toDatabaseSchemaName(), BOB_NAME.toDatabaseSchemaName(),
DUMMY_NOTARY_NAME.toDatabaseSchemaName())
}
@Test @Test
fun `alice bob cash exchange example`() { fun `alice bob cash exchange example`() {
// START 1 // START 1
driver(DriverParameters( driver(DriverParameters(
startNodesInProcess = true, startNodesInProcess = true,
extraCordappPackagesToScan = listOf("net.corda.finance.contracts.asset") extraCordappPackagesToScan = listOf("net.corda.finance.contracts.asset", "net.corda.finance.schemas")
)) { )) {
val aliceUser = User("aliceUser", "testPassword1", permissions = setOf( val aliceUser = User("aliceUser", "testPassword1", permissions = setOf(
startFlow<CashIssueAndPaymentFlow>(), startFlow<CashIssueAndPaymentFlow>(),

14
docs/source/example-code/src/integration-test/kotlin/net/corda/docs/TutorialFlowAsyncOperationTest.kt
View File

@ -6,13 +6,25 @@ import net.corda.core.utilities.getOrThrow
import net.corda.docs.tutorial.flowstatemachines.ExampleSummingFlow import net.corda.docs.tutorial.flowstatemachines.ExampleSummingFlow
import net.corda.node.services.Permissions import net.corda.node.services.Permissions
import net.corda.testing.core.ALICE_NAME import net.corda.testing.core.ALICE_NAME
import net.corda.testing.core.BOB_NAME
import net.corda.testing.core.DUMMY_NOTARY_NAME
import net.corda.testing.driver.DriverParameters import net.corda.testing.driver.DriverParameters
import net.corda.testing.driver.driver import net.corda.testing.driver.driver
import net.corda.testing.internal.IntegrationTest
import net.corda.testing.internal.IntegrationTestSchemas
import net.corda.testing.internal.toDatabaseSchemaName
import net.corda.testing.node.User import net.corda.testing.node.User
import org.junit.ClassRule
import org.junit.Test import org.junit.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals
class TutorialFlowAsyncOperationTest { class TutorialFlowAsyncOperationTest : IntegrationTest() {
companion object {
@ClassRule
@JvmField
val databaseSchemas = IntegrationTestSchemas(ALICE_NAME.toDatabaseSchemaName(), DUMMY_NOTARY_NAME.toDatabaseSchemaName())
}
// DOCSTART summingWorks // DOCSTART summingWorks
@Test @Test
fun summingWorks() { fun summingWorks() {

13
node/src/integration-test/java/net/corda/serialization/reproduction/GenericReturnFailureReproductionIntegrationTest.java
View File

@ -10,7 +10,11 @@ import net.corda.testing.driver.Driver;
import net.corda.testing.driver.DriverParameters; import net.corda.testing.driver.DriverParameters;
import net.corda.testing.driver.NodeHandle; import net.corda.testing.driver.NodeHandle;
import net.corda.testing.driver.NodeParameters; import net.corda.testing.driver.NodeParameters;
import net.corda.testing.internal.IntegrationTest;
import net.corda.testing.internal.IntegrationTestKt;
import net.corda.testing.internal.IntegrationTestSchemas;
import net.corda.testing.node.User; import net.corda.testing.node.User;
import org.junit.ClassRule;
import org.junit.Test; import org.junit.Test;
import java.util.Collections; import java.util.Collections;
@ -19,7 +23,14 @@ import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.IntStream; import java.util.stream.IntStream;
public class GenericReturnFailureReproductionIntegrationTest { import static net.corda.testing.core.TestConstants.*;
public class GenericReturnFailureReproductionIntegrationTest extends IntegrationTest {
@ClassRule
public static IntegrationTestSchemas databaseSchemas = new IntegrationTestSchemas(IntegrationTestKt.toDatabaseSchemaName(ALICE_NAME), IntegrationTestKt.toDatabaseSchemaName(BOB_NAME),
IntegrationTestKt.toDatabaseSchemaName(DUMMY_BANK_A_NAME), IntegrationTestKt.toDatabaseSchemaName(DUMMY_NOTARY_NAME));
@Test() @Test()
public void flowShouldReturnGenericList() { public void flowShouldReturnGenericList() {