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

CORDA-2893, ENT-3422: Tweak JUnit 5 configurations to keep vintage engine off compile classpaths. (#5138)

Browse Source 
* Tweak JUnit 5 configurations to keep vintage engine off compile classpaths.

* Configure Gradle tests to use JUnit 5.
This commit is contained in:
Chris Rankin
2019-05-20 11:57:56 +01:00
committed by Rick Parker
parent 688c742706
commit b9f7c1a08a
41 changed files with 132 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
samples/trader-demo/build.gradle
View File

@ -25,7 +25,7 @@ sourceSets {
configurations {
integrationTestCompile.extendsFrom testCompile
integrationTestRuntime.extendsFrom testRuntime
integrationTestRuntimeOnly.extendsFrom testRuntimeOnly
}
dependencies {
@ -36,7 +36,7 @@ dependencies {
// Cordformation needs a SLF4J implementation when executing the Network
// Bootstrapper, but Log4J doesn't shutdown completely from within Gradle.
// Use a much simpler SLF4J implementation here instead.
runtimeOnly "org.slf4j:slf4j-simple:$slf4j_version"
cordaRuntime "org.slf4j:slf4j-simple:$slf4j_version"
// We only need this for its DUMMY_BANK constants, and
// DO NOT want it added to Gradle's runtime classpath.
@ -57,11 +57,12 @@ dependencies {
}
testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
testImplementation "junit:junit:$junit_version"
testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
testCompile "org.assertj:assertj-core:$assertj_version"
}

7
samples/trader-demo/workflows-trader/build.gradle
View File

@ -13,11 +13,12 @@ dependencies {
testCompile project(':node-driver')
testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
testImplementation "junit:junit:$junit_version"
testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
testCompile "org.assertj:assertj-core:$assertj_version"
}
@ -34,4 +35,4 @@ cordapp {
vendor "R3"
licence "Open Source (Apache 2)"
}
}
}