From e98dbcc2af276dec139ddc3e25a031e17d68958f Mon Sep 17 00:00:00 2001 From: Stefano Franz Date: Fri, 4 Jan 2019 15:42:11 +0000 Subject: [PATCH] move back into test-utils --- build.gradle | 1 - finance/test-contracts/build.gradle | 37 ------------------- node/build.gradle | 2 +- settings.gradle | 1 - testing/test-utils/build.gradle | 1 + .../corda/finance/test/SampleCashSchemaV1.kt | 0 .../corda/finance/test/SampleCashSchemaV2.kt | 0 .../corda/finance/test/SampleCashSchemaV3.kt | 0 .../test/SampleCommercialPaperSchemaV1.kt | 0 .../test/SampleCommercialPaperSchemaV2.kt | 0 10 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 finance/test-contracts/build.gradle rename {finance/test-contracts => testing/test-utils}/src/main/kotlin/net/corda/finance/test/SampleCashSchemaV1.kt (100%) rename {finance/test-contracts => testing/test-utils}/src/main/kotlin/net/corda/finance/test/SampleCashSchemaV2.kt (100%) rename {finance/test-contracts => testing/test-utils}/src/main/kotlin/net/corda/finance/test/SampleCashSchemaV3.kt (100%) rename {finance/test-contracts => testing/test-utils}/src/main/kotlin/net/corda/finance/test/SampleCommercialPaperSchemaV1.kt (100%) rename {finance/test-contracts => testing/test-utils}/src/main/kotlin/net/corda/finance/test/SampleCommercialPaperSchemaV2.kt (100%) diff --git a/build.gradle b/build.gradle index 9fabeb5162..3a20bd5e99 100644 --- a/build.gradle +++ b/build.gradle @@ -366,7 +366,6 @@ bintrayConfig { 'corda-finance', // maintained for backwards compatibility only 'corda-finance-workflows', 'corda-finance-contracts', - 'corda-finance-test-contracts', 'corda-node', 'corda-node-api', 'corda-test-common', diff --git a/finance/test-contracts/build.gradle b/finance/test-contracts/build.gradle deleted file mode 100644 index b23cd0bd09..0000000000 --- a/finance/test-contracts/build.gradle +++ /dev/null @@ -1,37 +0,0 @@ -apply plugin: 'kotlin' -// Java Persistence API support: create no-arg constructor -// see: http://stackoverflow.com/questions/32038177/kotlin-with-jpa-default-constructor-hell -apply plugin: 'kotlin-jpa' -apply plugin: 'java' -apply plugin: CanonicalizerPlugin -apply plugin: 'net.corda.plugins.publish-utils' -apply plugin: 'com.jfrog.artifactory' - -description 'Corda finance module - testing contracts' - -dependencies { - compile project(':core') - compile project(':confidential-identities') - - // For JSON - compile "com.fasterxml.jackson.core:jackson-databind:${jackson_version}" - - compile project(':test-utils') - compile project(path: ':core', configuration: 'testArtifacts') - compile "junit:junit:$junit_version" - - // AssertJ: for fluent assertions for testing - compile "org.assertj:assertj-core:$assertj_version" -} - -jar { - baseName 'corda-finance-test-contracts' - manifest { - attributes('Corda-Revision': 'n/a') - attributes('Corda-Vendor': 'Corda Open Source') - } -} - -publish { - name jar.baseName -} \ No newline at end of file diff --git a/node/build.gradle b/node/build.gradle index 292bf38313..a920b2bfe9 100644 --- a/node/build.gradle +++ b/node/build.gradle @@ -185,7 +185,7 @@ dependencies { compile "com.palominolabs.metrics:metrics-new-relic:${metrics_new_relic_version}" testCompile(project(':test-cli')) - testCompile(project(':finance:test-contracts')) + testCompile(project(':test-utils')) } tasks.withType(JavaCompile) { diff --git a/settings.gradle b/settings.gradle index 0462feb7af..34aa7dbc4e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,7 +5,6 @@ include 'confidential-identities' include 'finance' // maintained for backwards compatibility only include 'finance:contracts' include 'finance:workflows' -include 'finance:test-contracts' include 'isolated' include 'core' include 'docs' diff --git a/testing/test-utils/build.gradle b/testing/test-utils/build.gradle index 5ff7c3121c..5154820e4f 100644 --- a/testing/test-utils/build.gradle +++ b/testing/test-utils/build.gradle @@ -26,6 +26,7 @@ dependencies { // OkHTTP: Simple HTTP library. compile "com.squareup.okhttp3:okhttp:$okhttp_version" + compile project(':confidential-identities') } jar { diff --git a/finance/test-contracts/src/main/kotlin/net/corda/finance/test/SampleCashSchemaV1.kt b/testing/test-utils/src/main/kotlin/net/corda/finance/test/SampleCashSchemaV1.kt similarity index 100% rename from finance/test-contracts/src/main/kotlin/net/corda/finance/test/SampleCashSchemaV1.kt rename to testing/test-utils/src/main/kotlin/net/corda/finance/test/SampleCashSchemaV1.kt diff --git a/finance/test-contracts/src/main/kotlin/net/corda/finance/test/SampleCashSchemaV2.kt b/testing/test-utils/src/main/kotlin/net/corda/finance/test/SampleCashSchemaV2.kt similarity index 100% rename from finance/test-contracts/src/main/kotlin/net/corda/finance/test/SampleCashSchemaV2.kt rename to testing/test-utils/src/main/kotlin/net/corda/finance/test/SampleCashSchemaV2.kt diff --git a/finance/test-contracts/src/main/kotlin/net/corda/finance/test/SampleCashSchemaV3.kt b/testing/test-utils/src/main/kotlin/net/corda/finance/test/SampleCashSchemaV3.kt similarity index 100% rename from finance/test-contracts/src/main/kotlin/net/corda/finance/test/SampleCashSchemaV3.kt rename to testing/test-utils/src/main/kotlin/net/corda/finance/test/SampleCashSchemaV3.kt diff --git a/finance/test-contracts/src/main/kotlin/net/corda/finance/test/SampleCommercialPaperSchemaV1.kt b/testing/test-utils/src/main/kotlin/net/corda/finance/test/SampleCommercialPaperSchemaV1.kt similarity index 100% rename from finance/test-contracts/src/main/kotlin/net/corda/finance/test/SampleCommercialPaperSchemaV1.kt rename to testing/test-utils/src/main/kotlin/net/corda/finance/test/SampleCommercialPaperSchemaV1.kt diff --git a/finance/test-contracts/src/main/kotlin/net/corda/finance/test/SampleCommercialPaperSchemaV2.kt b/testing/test-utils/src/main/kotlin/net/corda/finance/test/SampleCommercialPaperSchemaV2.kt similarity index 100% rename from finance/test-contracts/src/main/kotlin/net/corda/finance/test/SampleCommercialPaperSchemaV2.kt rename to testing/test-utils/src/main/kotlin/net/corda/finance/test/SampleCommercialPaperSchemaV2.kt