Skip to content

Commit 1e790d3

Browse files
adelel1adelel1
authored
Merge pull request #111 from corda/jzadroga/ent-11793/fix-integration-tests
ENT-11793: Fix integration tests in JDK17 CorDapps
2 parents da8cf5d + e832579 commit 1e790d3

88 files changed

Lines changed: 559 additions & 279 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Accounts/supplychain/build.gradle‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ buildscript {
2424
confidential_id_release_group = "com.r3.corda.lib.ci"
2525
confidential_id_release_version = "1.2-RC01"
2626

27-
test_add_opens = ['--add-opens', 'java.base/java.time=ALL-UNNAMED', '--add-opens', 'java.base/java.io=ALL-UNNAMED',
27+
testJvmArgs = ['--add-opens', 'java.base/java.time=ALL-UNNAMED', '--add-opens', 'java.base/java.io=ALL-UNNAMED',
2828
'--add-opens', 'java.base/java.util=ALL-UNNAMED', '--add-opens', 'java.base/java.net=ALL-UNNAMED',
2929
'--add-opens', 'java.base/java.nio=ALL-UNNAMED', '--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED',
3030
'--add-opens', 'java.base/java.security.cert=ALL-UNNAMED', '--add-opens', 'java.base/java.security=ALL-UNNAMED',
@@ -49,6 +49,10 @@ allprojects {
4949
apply from: "${rootProject.projectDir}/repositories.gradle"
5050
apply plugin: 'java'
5151

52+
tasks.withType(Test) {
53+
jvmArgs = rootProject.ext.testJvmArgs
54+
}
55+
5256
repositories {
5357
mavenLocal()
5458

‎Accounts/supplychain/workflows/build.gradle‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ sourceSets {
4242
}
4343

4444
configurations {
45-
integrationTestCompile.extendsFrom testImplementation
46-
integrationTestRuntime.extendsFrom testRuntimeOny
45+
integrationTestImplementation.extendsFrom testImplementation
46+
integrationTestRuntimeOnly.extendsFrom testRuntimeOnly
4747
}
4848

4949
dependencies {
@@ -55,6 +55,7 @@ dependencies {
5555
cordaProvided "$corda_release_group:corda:$corda_release_version"
5656

5757
testImplementation "$corda_release_group:corda-node-driver:$corda_release_version"
58+
testImplementation "$corda_core_release_group:corda-core-test-utils:$corda_core_release_version"
5859

5960
// CorDapp dependencies.
6061
cordapp project(":contracts")
@@ -71,5 +72,5 @@ task integrationTest(type: Test, dependsOn: []) {
7172
}
7273

7374
test {
74-
jvmArgs = rootProject.ext.test_add_opens
75+
jvmArgs = rootProject.ext.testJvmArgs
7576
}

‎Accounts/tictacthor/build.gradle‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ buildscript {
2929
confidential_id_release_group = "com.r3.corda.lib.ci"
3030
confidential_id_release_version = "1.2-RC01"
3131

32-
test_add_opens = ['--add-opens', 'java.base/java.time=ALL-UNNAMED', '--add-opens', 'java.base/java.io=ALL-UNNAMED',
32+
testJvmArgs = ['--add-opens', 'java.base/java.time=ALL-UNNAMED', '--add-opens', 'java.base/java.io=ALL-UNNAMED',
3333
'--add-opens', 'java.base/java.util=ALL-UNNAMED', '--add-opens', 'java.base/java.net=ALL-UNNAMED',
3434
'--add-opens', 'java.base/java.nio=ALL-UNNAMED', '--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED',
3535
'--add-opens', 'java.base/java.security.cert=ALL-UNNAMED', '--add-opens', 'java.base/java.security=ALL-UNNAMED',
@@ -57,6 +57,10 @@ allprojects {
5757
apply from: "${rootProject.projectDir}/repositories.gradle"
5858
apply plugin: 'java'
5959

60+
tasks.withType(Test) {
61+
jvmArgs = rootProject.ext.testJvmArgs
62+
}
63+
6064
repositories {
6165
mavenLocal()
6266

‎Accounts/tictacthor/contracts/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ dependencies {
4141
}
4242

4343
test {
44-
jvmArgs = rootProject.ext.test_add_opens
44+
jvmArgs = rootProject.ext.testJvmArgs
4545
}

‎Accounts/tictacthor/workflows/build.gradle‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ sourceSets {
4242
}
4343

4444
configurations {
45-
integrationTestCompile.extendsFrom testImplementation
46-
integrationTestRuntime.extendsFrom testRuntimeOnly
45+
integrationTestImplementation.extendsFrom testImplementation
46+
integrationTestRuntimeOnly.extendsFrom testRuntimeOnly
4747
}
4848

4949
dependencies {
@@ -55,6 +55,7 @@ dependencies {
5555
cordaProvided "$corda_release_group:corda:$corda_release_version"
5656

5757
testImplementation "$corda_release_group:corda-node-driver:$corda_release_version"
58+
testImplementation "$corda_core_release_group:corda-core-test-utils:$corda_core_release_version"
5859

5960
// CorDapp dependencies.
6061
cordapp project(":contracts")
@@ -71,5 +72,5 @@ task integrationTest(type: Test, dependsOn: []) {
7172
}
7273

7374
test {
74-
jvmArgs = rootProject.ext.test_add_opens
75+
jvmArgs = rootProject.ext.testJvmArgs
7576
}

‎Accounts/worldcupticketbooking/build.gradle‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@ buildscript {
3131
//springboot
3232
spring_boot_version = '3.2.5'
3333
spring_boot_gradle_plugin_version = '3.2.5'
34+
35+
testJvmArgs = ['--add-opens', 'java.base/java.time=ALL-UNNAMED', '--add-opens', 'java.base/java.io=ALL-UNNAMED',
36+
'--add-opens', 'java.base/java.util=ALL-UNNAMED', '--add-opens', 'java.base/java.net=ALL-UNNAMED',
37+
'--add-opens', 'java.base/java.nio=ALL-UNNAMED', '--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED',
38+
'--add-opens', 'java.base/java.security.cert=ALL-UNNAMED', '--add-opens', 'java.base/java.security=ALL-UNNAMED',
39+
'--add-opens', 'java.base/javax.net.ssl=ALL-UNNAMED', '--add-opens', 'java.base/java.lang=ALL-UNNAMED',
40+
'--add-opens', 'java.base/java.util.concurrent=ALL-UNNAMED', '--add-opens', 'java.sql/java.sql=ALL-UNNAMED',]
3441
}
3542

3643
repositories {
@@ -52,6 +59,10 @@ allprojects {
5259
apply from: "${rootProject.projectDir}/repositories.gradle"
5360
apply plugin: 'java'
5461

62+
tasks.withType(Test) {
63+
jvmArgs = rootProject.ext.testJvmArgs
64+
}
65+
5566
repositories {
5667
mavenLocal()
5768

‎Accounts/worldcupticketbooking/workflows/build.gradle‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,20 @@ sourceSets {
4242
}
4343

4444
configurations {
45-
integrationTestCompile.extendsFrom testImplementation
46-
integrationTestRuntime.extendsFrom testRuntimeOny
45+
integrationTestImplementation.extendsFrom testImplementation
46+
integrationTestRuntimeOnly.extendsFrom testRuntimeOnly
4747
}
4848

4949
dependencies {
50+
implementation group: 'com.google.guava', name: 'guava', version: '23.5-jre'
5051
testImplementation "junit:junit:$junit_version"
5152

5253
// Corda dependencies.
5354
cordaProvided "$corda_core_release_group:corda-core:$corda_core_release_version"
5455
cordaProvided "$corda_release_group:corda:$corda_release_version"
5556

5657
testImplementation "$corda_release_group:corda-node-driver:$corda_release_version"
58+
testImplementation "$corda_core_release_group:corda-core-test-utils:$corda_core_release_version"
5759

5860
// CorDapp dependencies.
5961
cordapp project(":contracts")

‎Advanced/auction-cordapp/build.gradle‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ buildscript {
4141
spring_boot_version = '3.2.5'
4242
spring_boot_gradle_plugin_version = '3.2.5'
4343

44-
test_add_opens = ['--add-opens', 'java.base/java.time=ALL-UNNAMED', '--add-opens', 'java.base/java.io=ALL-UNNAMED',
44+
testJvmArgs = ['--add-opens', 'java.base/java.time=ALL-UNNAMED', '--add-opens', 'java.base/java.io=ALL-UNNAMED',
4545
'--add-opens', 'java.base/java.util=ALL-UNNAMED', '--add-opens', 'java.base/java.net=ALL-UNNAMED',
4646
'--add-opens', 'java.base/java.nio=ALL-UNNAMED', '--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED',
4747
'--add-opens', 'java.base/java.security.cert=ALL-UNNAMED', '--add-opens', 'java.base/java.security=ALL-UNNAMED',
@@ -68,6 +68,10 @@ buildscript {
6868
allprojects {
6969
apply plugin: 'java'
7070

71+
tasks.withType(Test) {
72+
jvmArgs = rootProject.ext.testJvmArgs
73+
}
74+
7175
repositories {
7276
mavenLocal()
7377

‎Advanced/auction-cordapp/workflows/build.gradle‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ sourceSets {
3434
}
3535

3636
configurations {
37-
integrationTestCompile.extendsFrom testImplementation
38-
integrationTestRuntime.extendsFrom testRuntimeOnly
37+
integrationTestImplementation.extendsFrom testImplementation
38+
integrationTestRuntimeOnly.extendsFrom testRuntimeOnly
3939
}
4040

4141
dependencies {
@@ -48,6 +48,7 @@ dependencies {
4848
cordaProvided "$corda_release_group:corda-finance-workflows:$corda_release_version"
4949
cordaProvided "$corda_release_group:corda:$corda_release_version"
5050
testImplementation "$corda_release_group:corda-node-driver:$corda_release_version"
51+
testImplementation "$corda_core_release_group:corda-core-test-utils:$corda_core_release_version"
5152

5253
// CorDapp dependencies.
5354
cordapp project(":contracts")
@@ -59,5 +60,5 @@ task integrationTest(type: Test, dependsOn: []) {
5960
}
6061

6162
test {
62-
jvmArgs = rootProject.ext.test_add_opens
63+
jvmArgs = rootProject.ext.testJvmArgs
6364
}

‎Advanced/duediligence-cordapp/build.gradle‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ buildscript {//properties that you need to build the project
4141
spring_boot_version = '3.2.5'
4242
spring_boot_gradle_plugin_version = '3.2.5'
4343

44-
test_add_opens = ['--add-opens', 'java.base/java.time=ALL-UNNAMED', '--add-opens', 'java.base/java.io=ALL-UNNAMED',
44+
testJvmArgs = ['--add-opens', 'java.base/java.time=ALL-UNNAMED', '--add-opens', 'java.base/java.io=ALL-UNNAMED',
4545
'--add-opens', 'java.base/java.util=ALL-UNNAMED', '--add-opens', 'java.base/java.net=ALL-UNNAMED',
4646
'--add-opens', 'java.base/java.nio=ALL-UNNAMED', '--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED',
4747
'--add-opens', 'java.base/java.security.cert=ALL-UNNAMED', '--add-opens', 'java.base/java.security=ALL-UNNAMED',
@@ -68,6 +68,10 @@ allprojects {//Properties that you need to compile your project (The application
6868
apply from: "${rootProject.projectDir}/repositories.gradle"
6969
apply plugin: 'java'
7070

71+
tasks.withType(Test) {
72+
jvmArgs = rootProject.ext.testJvmArgs
73+
}
74+
7175
repositories {
7276
mavenLocal()
7377

0 commit comments

Comments
 (0)