Merge pull request #255 from alvasw/global_junit_setup

Gradle: Global JUnit 5 Setup
bisq-network · Apr 21, 2022 · 6f3f971 · 6f3f971
2 parents 1057d68 + f88cce8
commit 6f3f971
Show file tree

Hide file tree

Showing 34 changed files with 4 additions and 81 deletions.
diff --git a/account/build.gradle b/account/build.gradle
@@ -5,7 +5,6 @@ plugins {
 
 apply from: '../buildSrc/bisq-version.gradle'
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 dependencies {
     api platform(project(':platforms:common-platform'))

diff --git a/application/build.gradle b/application/build.gradle
@@ -5,7 +5,6 @@ plugins {
 
 apply from: '../buildSrc/bisq-version.gradle'
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 dependencies {
     api platform(project(':platforms:common-platform'))

diff --git a/build.gradle b/build.gradle
@@ -13,9 +13,4 @@ repositories {
 }
 
 apply from: 'buildSrc/bisq-version.gradle'
-apply from: 'buildSrc/os-arch.gradle'
-
-test {
-    useJUnitPlatform()
-    exclude '**/**Integration*'
-}
+apply from: 'buildSrc/os-arch.gradle'
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -13,40 +13,12 @@ repositories {
 
 apply from: 'bisq-version.gradle'
 
-ext {
-    createTestReports = false
-}
-
 configurations.all {
     resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
 }
 
-java {
-    modularity.inferModulePath = false
-    withJavadocJar()
-    withSourcesJar()
-}
-
 jar {
     // Exclude .proto files from generated jars.
     exclude '*.proto'
     includeEmptyDirs false
 }
-
-tasks.withType(Test).configureEach {
-    maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
-    if (!project.hasProperty("createTestReports")) {
-        reports.html.enabled = false
-        reports.junitXml.enabled = false
-    }
-}
-
-tasks.named("javadoc") {
-    source = sourceSets.main.allJava
-    options.addStringOption('Xdoclint:none', '-quiet')
-}
-
-tasks.named("test") {
-    useJUnitPlatform()
-    exclude '**/**Integration*'
-}
diff --git a/buildSrc/src/main/groovy/bisq.java-library.gradle b/buildSrc/src/main/groovy/bisq.java-library.gradle
@@ -18,6 +18,8 @@ dependencies {
     annotationProcessor(libs.lombok)
     testCompileOnly(libs.lombok)
     testAnnotationProcessor(libs.lombok)
+
+    testImplementation(libs.junit.jupiter)
 }
 
 test {

diff --git a/buildSrc/test-dependencies.gradle b/buildSrc/test-dependencies.gradle
diff --git a/cli/build.gradle b/cli/build.gradle
@@ -5,7 +5,6 @@ plugins {
 
 apply from: '../buildSrc/bisq-version.gradle'
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 dependencies {
     api platform(project(':platforms:grpc-platform'))

diff --git a/common/build.gradle b/common/build.gradle
@@ -5,7 +5,6 @@ plugins {
 
 apply from: '../buildSrc/bisq-version.gradle'
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 dependencies {
     api platform(project(':platforms:common-platform'))

diff --git a/contract/build.gradle b/contract/build.gradle
@@ -5,7 +5,6 @@ plugins {
 
 apply from: '../buildSrc/bisq-version.gradle'
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 dependencies {
     api platform(project(':platforms:common-platform'))

diff --git a/desktop/build.gradle b/desktop/build.gradle
@@ -5,7 +5,6 @@ plugins {
 
 apply from: '../buildSrc/bisq-version.gradle'
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 javafx {
     version = '17.0.1'

diff --git a/desktopapp/build.gradle b/desktopapp/build.gradle
@@ -43,7 +43,6 @@ javafx {
 }
 
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 dependencies {
     api platform(project(':platforms:common-platform'))

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -33,8 +33,7 @@ google-guava =      { module = 'com.google.guava:guava',            version.ref
 i2p-streaming =     { module = 'net.i2p.client:streaming',          version.ref = 'i2p-lib' }
 i2p-core =          { module = 'net.i2p:i2p',                       version.ref = 'i2p-lib' }
 i2p-router =        { module = 'net.i2p:router',                    version.ref = 'i2p-lib' }
-junit-jupiter-api = { module = 'org.junit.jupiter:junit-jupiter-api', version.ref = 'junit-jupiter-lib' }
-junit-jupiter-engine = { module = 'org.junit.jupiter:junit-jupiter-engine', version.ref = 'junit-jupiter-lib' }
+junit-jupiter =     { module = 'org.junit.jupiter:junit-jupiter', version.ref = 'junit-jupiter-lib' }
 logback-core =      { module = 'ch.qos.logback:logback-core',       version.ref = 'logback-lib' }
 logback-classic =   { module = 'ch.qos.logback:logback-classic',    version.ref = 'logback-lib' }
 lombok =            { module = 'org.projectlombok:lombok',          version.ref = 'lombok-lib' }

diff --git a/grpc/build.gradle b/grpc/build.gradle
@@ -5,7 +5,6 @@ plugins {
 
 apply from: '../buildSrc/bisq-version.gradle'
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 dependencies {
     api platform(project(':platforms:grpc-platform'))

diff --git a/i18n/build.gradle b/i18n/build.gradle
@@ -5,7 +5,6 @@ plugins {
 
 apply from: '../buildSrc/bisq-version.gradle'
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 dependencies {
     api platform(project(':platforms:common-platform'))

diff --git a/i2p/build.gradle b/i2p/build.gradle
@@ -5,7 +5,6 @@ plugins {
 
 apply from: '../buildSrc/bisq-version.gradle'
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 dependencies {
     api platform(project(':platforms:common-platform'))

diff --git a/identity/build.gradle b/identity/build.gradle
@@ -5,7 +5,6 @@ plugins {
 
 apply from: '../buildSrc/bisq-version.gradle'
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 dependencies {
     api platform(project(':platforms:common-platform'))

diff --git a/network/build.gradle b/network/build.gradle
@@ -5,7 +5,6 @@ plugins {
 
 apply from: '../buildSrc/bisq-version.gradle'
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 apply from: '../buildSrc/gen-protos.gradle'
 
 dependencies {

diff --git a/offer/build.gradle b/offer/build.gradle
@@ -5,7 +5,6 @@ plugins {
 
 apply from: '../buildSrc/bisq-version.gradle'
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 dependencies {
     api platform(project(':platforms:common-platform'))

diff --git a/oracle/build.gradle b/oracle/build.gradle
@@ -5,7 +5,6 @@ plugins {
 
 apply from: '../buildSrc/bisq-version.gradle'
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 dependencies {
     api platform(project(':platforms:common-platform'))

diff --git a/persistence/build.gradle b/persistence/build.gradle
@@ -5,7 +5,6 @@ plugins {
 
 apply from: '../buildSrc/bisq-version.gradle'
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 dependencies {
     api platform(project(':platforms:common-platform'))

diff --git a/platforms/test-platform/build.gradle b/platforms/test-platform/build.gradle
diff --git a/platforms/test-platform/settings.gradle b/platforms/test-platform/settings.gradle
diff --git a/presentation/build.gradle b/presentation/build.gradle
@@ -5,7 +5,6 @@ plugins {
 
 apply from: '../buildSrc/bisq-version.gradle'
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 dependencies {
     api platform(project(':platforms:common-platform'))

diff --git a/protocol/build.gradle b/protocol/build.gradle
@@ -5,7 +5,6 @@ plugins {
 
 apply from: '../buildSrc/bisq-version.gradle'
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 dependencies {
     api platform(project(':platforms:common-platform'))

diff --git a/satoshisquareapp/build.gradle b/satoshisquareapp/build.gradle
@@ -7,7 +7,6 @@ plugins {
 
 apply from: '../buildSrc/bisq-version.gradle'
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 application {
     project.mainClassName = 'bisq.satoshisquareapp.Main'

diff --git a/security/build.gradle b/security/build.gradle
@@ -5,7 +5,6 @@ plugins {
 
 apply from: '../buildSrc/bisq-version.gradle'
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 dependencies {
     api platform(project(':platforms:common-platform'))

diff --git a/seed/build.gradle b/seed/build.gradle
@@ -6,7 +6,6 @@ plugins {
 
 apply from: '../buildSrc/bisq-version.gradle'
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 application {
     project.mainClassName = 'bisq.seed.SeedMain'

diff --git a/settings/build.gradle b/settings/build.gradle
@@ -5,7 +5,6 @@ plugins {
 
 apply from: '../buildSrc/bisq-version.gradle'
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 dependencies {
     api platform(project(':platforms:common-platform'))

diff --git a/social/build.gradle b/social/build.gradle
@@ -10,7 +10,6 @@ repositories {
 
 apply from: '../buildSrc/bisq-version.gradle'
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 dependencies {
     api platform(project(':platforms:common-platform'))

diff --git a/support/build.gradle b/support/build.gradle
@@ -5,7 +5,6 @@ plugins {
 
 apply from: '../buildSrc/bisq-version.gradle'
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 dependencies {
     api platform(project(':platforms:common-platform'))

diff --git a/tools/build.gradle b/tools/build.gradle
@@ -33,7 +33,6 @@ javafx {
 }
 
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 dependencies {
     api platform(project(':platforms:common-platform'))

diff --git a/tor/build.gradle b/tor/build.gradle
@@ -4,7 +4,6 @@ plugins {
 
 apply from: '../buildSrc/bisq-version.gradle'
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 dependencies {
     api platform(project(':platforms:common-platform'))

diff --git a/wallets/build.gradle b/wallets/build.gradle
@@ -5,7 +5,6 @@ plugins {
 
 apply from: '../buildSrc/bisq-version.gradle'
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 ext {
     jsonrpc4jVersion = '1.6.0.bisq.2'

diff --git a/web/build.gradle b/web/build.gradle
@@ -6,7 +6,6 @@ version '0.0.1-SNAPSHOT'
 
 apply from: '../buildSrc/bisq-version.gradle'
 apply from: '../buildSrc/logging-dependencies.gradle'
-apply from: '../buildSrc/test-dependencies.gradle'
 
 dependencies {
     api platform(project(':platforms:common-platform'))