Classpaths for junit (classic) (#2670)

Incremental step towards making #2671 possible.
deephaven · Jul 22, 2022 · 6d88cce · 6d88cce
1 parent a313725
commit 6d88cce
Show file tree

Hide file tree

Showing 19 changed files with 43 additions and 29 deletions.
diff --git a/Base/build.gradle b/Base/build.gradle
@@ -10,10 +10,7 @@ dependencies {
 
     compile 'io.deephaven:hash:0.1.0'
 
-    testCompile 'junit:junit:4.13.2'
-    testCompile 'org.jmock:jmock-junit4:2.12.0'
-    testCompile 'org.jmock:jmock-imposters:2.12.0'
-
+    Classpaths.inheritJUnitClassic(project, true, 'testCompile')
 }
 
 sourceSets {

diff --git a/Configuration/build.gradle b/Configuration/build.gradle
@@ -4,9 +4,7 @@ plugins {
 
 dependencies {
     compile project(':Base'), project(':DataStructures'), project(':IO'), project(':log-factory'), depCommonsLang3
-    testCompile 'junit:junit:4.13.2'
-    testCompile 'org.jmock:jmock-junit4:2.12.0'
-    testCompile 'org.jmock:jmock-imposters:2.12.0'
+    Classpaths.inheritJUnitClassic(project, true, 'testCompile')
 
     Classpaths.inheritAutoService(project)
 

diff --git a/Container/build.gradle b/Container/build.gradle
@@ -4,5 +4,5 @@ plugins {
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.13.2'
+    Classpaths.inheritJUnitClassic(project)
 }
diff --git a/buildSrc/src/main/groovy/Classpaths.groovy b/buildSrc/src/main/groovy/Classpaths.groovy
@@ -73,6 +73,15 @@ class Classpaths {
     static final String JUNIT_NAME = 'junit-bom'
     static final String JUNIT_VERSION = '5.7.2'
 
+    static final String JUNIT_CLASSIC_GROUP = 'junit'
+    static final String JUNIT_CLASSIC_NAME = 'junit'
+    static final String JUNIT_CLASSIC_VERSION = '4.13.2'
+
+    static final String JMOCK_GROUP = 'org.jmock'
+    static final String JMOCK_JUNIT_NAME = 'jmock-junit4'
+    static final String JMOCK_IMPORSTERS_NAME = 'jmock-imposters'
+    static final String JMOCK_VERSION = '2.12.0'
+
     static final String ASSERTJ_GROUP = 'org.assertj'
     static final String ASSERTJ_NAME = 'assertj-core'
     static final String ASSERTJ_VERSION = '3.19.0'
@@ -211,6 +220,15 @@ class Classpaths {
         p.getDependencies().add('compileOnly', p.project(':util-immutables'))
     }
 
+    static void inheritJUnitClassic(Project p, boolean includeJMock = false, String configName = JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME) {
+        Configuration config = p.configurations.getByName(configName)
+        addDependency(config, JUNIT_CLASSIC_GROUP, JUNIT_CLASSIC_NAME, JUNIT_CLASSIC_VERSION)
+        if (includeJMock) {
+            addDependency(config, JMOCK_GROUP, JMOCK_JUNIT_NAME, JMOCK_VERSION)
+            addDependency(config, JMOCK_GROUP, JMOCK_IMPORSTERS_NAME, JMOCK_VERSION)
+        }
+    }
+
     static void inheritJUnitPlatform(Project p, String configName = JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME) {
         Configuration config = p.configurations.getByName(configName)
         addDependency(config, p.getDependencies().platform(JUNIT_GROUP + ":" + JUNIT_NAME + ":" + JUNIT_VERSION))

diff --git a/buildSrc/src/main/groovy/io.deephaven.java-classpath-conventions.gradle b/buildSrc/src/main/groovy/io.deephaven.java-classpath-conventions.gradle
@@ -61,9 +61,8 @@ dependencies {
     jama 'gov.nist.math.jama:gov.nist.math.jama:1.1.1'
     mockrunner 'com.mockrunner:mockrunner-jdbc:1.0.4'
     commonsCsv 'org.apache.commons:commons-csv:1.4'
-    junit 'junit:junit:4.13.2'
-    junit 'org.jmock:jmock-junit4:2.12.0'
-    junit 'org.jmock:jmock-imposters:2.12.0'
+
+    Classpaths.inheritJUnitClassic(project, true, 'junit')
 
     // Now, all the various fish libs we depend on, with inherited dependencies matching
     // the actual dependencies used in fishlib... if we were strongly coupled, we could skip

diff --git a/codegen/build.gradle b/codegen/build.gradle
@@ -8,5 +8,5 @@ description 'Codegen: Code generation utilities'
 
 dependencies {
     implementation 'org.freemarker:freemarker:2.3.31'
-    testImplementation 'junit:junit:4.13.2'
+    Classpaths.inheritJUnitClassic(project)
 }
diff --git a/engine/api/build.gradle b/engine/api/build.gradle
@@ -21,7 +21,7 @@ dependencies {
 
     compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
 
-    testImplementation 'junit:junit:4.13.2'
+    Classpaths.inheritJUnitClassic(project)
 }
 
 spotless {

diff --git a/engine/chunk/build.gradle b/engine/chunk/build.gradle
@@ -8,7 +8,7 @@ description 'Engine Chunks: Array-like data structures for dense, efficient data
 dependencies {
     api project(':Util')
 
-    testImplementation 'junit:junit:4.13.2'
+    Classpaths.inheritJUnitClassic(project)
 
     testRuntimeOnly project(':log-to-slf4j'),
             project(path: ':configs'),

diff --git a/engine/rowset/build.gradle b/engine/rowset/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
 
-    testImplementation 'junit:junit:4.13.2'
+    Classpaths.inheritJUnitClassic(project)
 
     testRuntimeOnly project(':log-to-slf4j'),
             project(path: ':configs'),

diff --git a/engine/table/build.gradle b/engine/table/build.gradle
@@ -61,8 +61,9 @@ dependencies {
             project(':Base'),
             project(':BenchmarkSupport'),
             project(':extensions-csv'),
-            project(':extensions-parquet-table'),
-            'junit:junit:4.13.2'
+            project(':extensions-parquet-table')
+
+    Classpaths.inheritJUnitClassic(project)
 
     Classpaths.inheritJUnitPlatform(project)
     Classpaths.inheritAssertJ(project)

diff --git a/engine/tuple/build.gradle b/engine/tuple/build.gradle
@@ -10,7 +10,7 @@ dependencies {
             project(':Util'),
             project(':engine-time')
 
-    testImplementation 'junit:junit:4.13.2'
+    Classpaths.inheritJUnitClassic(project)
 }
 
 spotless {

diff --git a/engine/updategraph/build.gradle b/engine/updategraph/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
 
-    testImplementation 'junit:junit:4.13.2'
+    Classpaths.inheritJUnitClassic(project)
 
     testRuntimeOnly project(':log-to-slf4j'),
             project(path: ':configs'),

diff --git a/engine/vector/build.gradle b/engine/vector/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     api project(':Util'),
             project(':qst')
 
-    testImplementation 'junit:junit:4.13.2'
+    Classpaths.inheritJUnitClassic(project)
 }
 
 spotless {

diff --git a/extensions/csv/build.gradle b/extensions/csv/build.gradle
@@ -19,8 +19,9 @@ dependencies {
     Classpaths.inheritAssertJ(project)
 
     testImplementation TestTools.projectDependency(project, 'engine-table'),
-            TestTools.projectDependency(project, 'engine-base'),
-            'junit:junit:4.13.2'
+            TestTools.projectDependency(project, 'engine-base')
+
+    Classpaths.inheritJUnitClassic(project)
 
     testRuntimeOnly project(':log-to-slf4j'),
             project(path: ':configs'),

diff --git a/extensions/kafka/build.gradle b/extensions/kafka/build.gradle
@@ -18,8 +18,8 @@ dependencies {
 
     Classpaths.inheritImmutables(project)
 
-    testImplementation TestTools.projectDependency(project, 'engine-table'),
-            'junit:junit:4.13.2'
+    testImplementation TestTools.projectDependency(project, 'engine-table')
+    Classpaths.inheritJUnitClassic(project)
 
     testRuntimeOnly project(':log-to-slf4j'),
             project(path: ':configs'),

diff --git a/extensions/parquet/base/build.gradle b/extensions/parquet/base/build.gradle
@@ -12,7 +12,7 @@ dependencies {
 
     implementation project(':Util')
 
-    testImplementation 'junit:junit:4.13.2'
+    Classpaths.inheritJUnitClassic(project)
 }
 
 spotless {

diff --git a/extensions/parquet/table/build.gradle b/extensions/parquet/table/build.gradle
@@ -31,8 +31,8 @@ dependencies {
 
     compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
 
-    testImplementation TestTools.projectDependency(project, 'engine-table'),
-            'junit:junit:4.13.2'
+    testImplementation TestTools.projectDependency(project, 'engine-table')
+    Classpaths.inheritJUnitClassic(project)
 
     testRuntimeOnly project(':log-to-slf4j'),
             project(path: ':configs'),

diff --git a/java-client/session/build.gradle b/java-client/session/build.gradle
@@ -30,7 +30,7 @@ dependencies {
   testImplementation 'org.junit.jupiter:junit-jupiter'
   testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
   testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
-  testImplementation 'junit:junit:4.13.2'
+  Classpaths.inheritJUnitClassic(project)
   testImplementation 'io.grpc:grpc-testing'
 
   Classpaths.inheritAssertJ(project)

diff --git a/server/test/build.gradle b/server/test/build.gradle
@@ -17,6 +17,6 @@ dependencies {
     Classpaths.inheritDagger(project)
 
 //    Classpaths.inheritJUnitPlatform(project, 'api')
-    implementation 'junit:junit:4.13.2'
+    Classpaths.inheritJUnitClassic(project, false, 'implementation')
 
 }