Tidy up test dependencies

vnickolov · vnickolov · commit f8c8c1c5e0d5 · 2025-09-10T10:07:39.000+01:00
diff --git a/annotations/build.gradle b/annotations/build.gradle
@@ -4,6 +4,10 @@ description = 'Neo4j Graph Data Science :: Annotations'
 
 group = 'org.neo4j.gds'
 
+test {
+    useJUnitPlatform()
+}
+
 dependencies {
     annotationProcessor openGds.recordBuilder
     annotationProcessor openGds.immutables.builder
@@ -16,6 +20,7 @@ dependencies {
     testCompileOnly openGds.jetbrains.annotations
 
     testImplementation platform(openGds.junit5bom)
-    testImplementation openGds.junit5.jupiter
-    testImplementation openGds.assertj.core
+    testImplementation openGds.bundles.test.basic
+
+    testRuntimeOnly openGds.bundles.test.platforms
 }
diff --git a/applications/algorithms/machinery/build.gradle b/applications/algorithms/machinery/build.gradle
@@ -30,10 +30,8 @@ dependencies {
     implementation project(':string-formatting')
     implementation project(':termination')
 
-    testImplementation openGds.assertj.core
     testImplementation platform(openGds.junit5bom)
-    testImplementation openGds.junit5.jupiter.api
-    testImplementation openGds.junit5.jupiter.engine
-    testImplementation openGds.junit5.jupiter.params
-    testImplementation openGds.mockito.junit.jupiter
+    testImplementation openGds.bundles.test.mocking
+
+    testRuntimeOnly openGds.bundles.test.platforms
 }
diff --git a/applications/algorithms/path-finding/build.gradle b/applications/algorithms/path-finding/build.gradle
@@ -32,9 +32,7 @@ dependencies {
 
     // Test dependencies
     testImplementation platform(openGds.junit5bom)
-    testImplementation openGds.assertj.core
-    testImplementation openGds.junit5.jupiter.api
-    testImplementation openGds.junit5.jupiter.engine
-    testImplementation openGds.junit5.jupiter.params
-    testImplementation openGds.mockito.junit.jupiter
+    testImplementation openGds.bundles.test.mocking
+
+    testRuntimeOnly openGds.bundles.test.platforms
 }
diff --git a/collections-memory-estimation/build.gradle b/collections-memory-estimation/build.gradle
@@ -9,8 +9,8 @@ dependencies {
     implementation project(':collections')
 
     testImplementation platform(openGds.junit5bom)
-    testImplementation openGds.junit5.jupiter
-    testImplementation openGds.junit5.migration
-    testImplementation openGds.assertj.core
+    testImplementation openGds.bundles.test.basic
     testImplementation openGds.qaladatagen
+
+    testRuntimeOnly openGds.bundles.test.platforms
 }
diff --git a/collections/build.gradle b/collections/build.gradle
@@ -12,11 +12,12 @@ dependencies {
     implementation openGds.hppc
 
     testImplementation platform(openGds.junit5bom)
-    testImplementation openGds.junit5.jupiter
-    testImplementation openGds.junit5.migration
-    testImplementation openGds.assertj.core
+    testImplementation openGds.bundles.test.basic
+
     testImplementation openGds.qaladatagen
     testImplementation openGds.hamcrest
+
+    testRuntimeOnly openGds.bundles.test.platforms
 }
 
 sourceSets {
diff --git a/config-generator/build.gradle b/config-generator/build.gradle
@@ -24,7 +24,8 @@ dependencies {
 
     testImplementation platform(openGds.junit5bom)
     testImplementation project(':core-test-utils')
-    testImplementation openGds.junit5.jupiter
-    testImplementation openGds.junit5.migration
     testImplementation openGds.google.testing.compile
+    testImplementation openGds.bundles.test.basic
+
+    testRuntimeOnly openGds.bundles.test.platforms
 }
diff --git a/defaults-and-limits-configuration/build.gradle b/defaults-and-limits-configuration/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation project(':string-formatting')
 
     testImplementation platform(openGds.junit5bom)
-    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api'
-    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine'
-    testImplementation openGds.assertj.core
+    testImplementation openGds.bundles.test.basic
+
+    testRuntimeOnly openGds.bundles.test.platforms
 }
diff --git a/gds-values/build.gradle b/gds-values/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     api                 project(':graph-projection-api')
     compileOnly         openGds.jetbrains.annotations
     testImplementation  platform(openGds.junit5bom)
-    testImplementation  openGds.junit.pioneer
-    testImplementation  openGds.junit5.jupiter.engine
-    testImplementation  openGds.assertj.core
+    testImplementation openGds.bundles.test.basic
+
+    testRuntimeOnly openGds.bundles.test.platforms
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -30,7 +30,6 @@ jol = "0.17"
 jqwik = "1.9.0"
 junit-pioneer = "2.2.0"
 junit5bom = "5.11.0"
-junit5 = "5.11.0"
 log4j = "2.20.0"
 memoryfilesystem = "2.8.0"
 mockito-junit-jupiter = "5.13.0"
@@ -85,7 +84,7 @@ jqwik = { module = "net.jqwik:jqwik", version.ref = "jqwik" }
 junit-pioneer = { module = "org.junit-pioneer:junit-pioneer", version.ref = "junit-pioneer" }
 junit5-jupiter = { module = "org.junit.jupiter:junit-jupiter" }
 junit5-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api" }
-junit5-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit5" }
+junit5-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine" }
 junit5-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params" }
 junit5-migration = { module = "org.junit.jupiter:junit-jupiter-migrationsupport" }
 junit5-platform = { module = "org.junit.platform:junit-platform-launcher" }
@@ -112,3 +111,14 @@ google-protobuf = "com.google.protobuf:0.9.4"
 nebula-dependencies = "nebula.info-dependencies:11.4.1"
 shadowjar = "com.gradleup.shadow:8.3.2"
 spawn = "ch.kk7.spawn:1.0.20180924200750"
+
+[bundles]
+test-basic = [ "junit5-jupiter", "assertj-core" ]
+test-mocking = [ "junit5-jupiter", "assertj-core", "mockito-junit-jupiter" ]
+test-platforms = [
+    "junit5-platform",
+    # `jqwik` is declared as test engine in `defaults-java.gradle`
+    # and exposed as transitive dependency of `test-utils`
+    # we don't need to bring the whole `test-utils` module everywhere
+    "jqwik"
+]
diff --git a/graph-dimensions/build.gradle b/graph-dimensions/build.gradle
@@ -19,7 +19,7 @@ dependencies {
     testCompileOnly    openGds.immutables.value.annotations
 
     testImplementation platform(openGds.junit5bom)
-    testImplementation openGds.junit5.jupiter
-    testImplementation openGds.junit5.migration
-    testImplementation openGds.assertj.core
+    testImplementation openGds.bundles.test.basic
+
+    testRuntimeOnly openGds.bundles.test.platforms
 }
diff --git a/graph-projection-api/build.gradle b/graph-projection-api/build.gradle
@@ -25,7 +25,8 @@ dependencies {
     testCompileOnly         openGds.immutables.value.annotations
 
     testImplementation platform(openGds.junit5bom)
-    testImplementation openGds.junit5.jupiter
-    testImplementation openGds.assertj.core
+    testImplementation openGds.bundles.test.basic
     testImplementation openGds.hamcrest
+
+    testRuntimeOnly openGds.bundles.test.platforms
 }
diff --git a/graph-schema-api/build.gradle b/graph-schema-api/build.gradle
@@ -18,8 +18,8 @@ dependencies {
 
 
     testImplementation platform(openGds.junit5bom)
-    testImplementation openGds.junit5.jupiter
-    testImplementation openGds.junit5.migration
-    testImplementation openGds.assertj.core
+    testImplementation openGds.bundles.test.basic
+
+    testRuntimeOnly openGds.bundles.test.platforms
 
 }
diff --git a/licensing/build.gradle b/licensing/build.gradle
@@ -16,4 +16,7 @@ dependencies {
     // Test dependencies
     testImplementation project(':core-test-utils')
     testImplementation openGds.mockito.junit.jupiter
+    testImplementation openGds.bundles.test.basic
+
+    testRuntimeOnly openGds.bundles.test.platforms
 }
diff --git a/memory-usage/build.gradle b/memory-usage/build.gradle
@@ -43,7 +43,7 @@ dependencies {
     testCompileOnly    openGds.immutables.value.annotations
 
     testImplementation platform(openGds.junit5bom)
-    testImplementation openGds.junit5.jupiter
-    testImplementation openGds.junit5.migration
-    testImplementation openGds.assertj.core
+    testImplementation openGds.bundles.test.basic
+
+    testRuntimeOnly openGds.bundles.test.platforms
 }
diff --git a/pregel-proc-generator/build.gradle b/pregel-proc-generator/build.gradle
@@ -42,7 +42,9 @@ dependencies {
 
     testImplementation platform(openGds.junit5bom)
     testImplementation project(':core-test-utils')
-    testImplementation openGds.junit5.jupiter
+    testImplementation openGds.bundles.test.basic
     testImplementation openGds.junit5.migration
     testImplementation openGds.google.testing.compile
+
+    testRuntimeOnly openGds.bundles.test.platforms
 }
diff --git a/procedures/facade-api/algorithms-facade-common/build.gradle b/procedures/facade-api/algorithms-facade-common/build.gradle
@@ -24,13 +24,10 @@ dependencies {
 
     // test infrastructure
     testImplementation platform(openGds.junit5bom)
-    testImplementation openGds.junit5.jupiter
-    testImplementation openGds.mockito.junit.jupiter
-    testImplementation openGds.assertj.core
+    testImplementation openGds.bundles.test.mocking
+    
+    testRuntimeOnly openGds.bundles.test.platforms
 
     // There are tests that use WccStreamConfig
     testImplementation project(':community-configs')
-
-    testRuntimeOnly openGds.junit5.jupiter.engine
-
 }
diff --git a/procedures/facade/build.gradle b/procedures/facade/build.gradle
@@ -52,10 +52,7 @@ dependencies {
     testCompileOnly openGds.immutables.value
 
     testImplementation platform(openGds.junit5bom)
-    testImplementation openGds.junit5.jupiter.api
-    testImplementation openGds.junit5.jupiter.params
-    testImplementation openGds.mockito.junit.jupiter
-    testImplementation openGds.assertj.core
+    testImplementation openGds.bundles.test.mocking
 
-    testRuntimeOnly openGds.junit5.jupiter.engine
+    testRuntimeOnly openGds.bundles.test.platforms
 }
diff --git a/procedures/graph-catalog-facade/build.gradle b/procedures/graph-catalog-facade/build.gradle
@@ -36,10 +36,7 @@ dependencies {
     testImplementation project(':annotations')
 
     testImplementation platform(openGds.junit5bom)
-    testImplementation openGds.junit5.jupiter.api
-    testImplementation openGds.junit5.jupiter.params
-    testImplementation openGds.mockito.junit.jupiter
-    testImplementation openGds.assertj.core
+    testImplementation openGds.bundles.test.mocking
 
-    testRuntimeOnly openGds.junit5.jupiter.engine
+    testRuntimeOnly openGds.bundles.test.platforms
 }
diff --git a/procedures/operations-facade-api/build.gradle b/procedures/operations-facade-api/build.gradle
@@ -17,10 +17,8 @@ dependencies {
     implementation project(':string-formatting')
 
     testImplementation platform(openGds.junit5bom)
-    testImplementation openGds.junit5.jupiter.api
-    testImplementation openGds.junit5.jupiter.params
-    testRuntimeOnly openGds.junit5.jupiter.engine
+    testImplementation openGds.bundles.test.basic
 
-    testImplementation openGds.assertj.core
+    testRuntimeOnly openGds.bundles.test.platforms
 
 }
diff --git a/procedures/operations-facade/build.gradle b/procedures/operations-facade/build.gradle
@@ -16,11 +16,9 @@ dependencies {
     testImplementation platform(openGds.junit5bom)
     testImplementation project(':algorithms-machinery')
     testImplementation project(':core')
-    testImplementation openGds.junit5.jupiter.api
-    testImplementation openGds.junit5.jupiter.params
-    testRuntimeOnly openGds.junit5.jupiter.engine
-    testImplementation openGds.assertj.core
-    testImplementation openGds.mockito.junit.jupiter
+    testImplementation openGds.bundles.test.mocking
+
+    testRuntimeOnly openGds.bundles.test.platforms
 
     testImplementation(neo4j.graphdb.api)
 }
diff --git a/string-formatting/build.gradle b/string-formatting/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly openGds.jetbrains.annotations
 
     testImplementation platform(openGds.junit5bom)
-    testImplementation openGds.junit5.jupiter
-    testImplementation openGds.assertj.core
-    testImplementation openGds.hamcrest
+    testImplementation openGds.bundles.test.basic
+
+    testRuntimeOnly openGds.bundles.test.platforms
 }
diff --git a/string-formatting/src/test/java/org/neo4j/gds/utils/StringJoiningTest.java b/string-formatting/src/test/java/org/neo4j/gds/utils/StringJoiningTest.java
@@ -19,20 +19,19 @@
  */
 package org.neo4j.gds.utils;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 class StringJoiningTest {
 
     @Test
     void joinVerbose() {
-        Assertions.assertEquals("A", StringJoining.joinVerbose(List.of("A")));
-        assertEquals("A and B", StringJoining.joinVerbose(List.of("A", "B")));
-        assertEquals("A, B and C", StringJoining.joinVerbose(List.of("A", "B", "C")));
+        assertThat(StringJoining.joinVerbose(List.of("A"))).isEqualTo("A");
+        assertThat(StringJoining.joinVerbose(List.of("A", "B"))).isEqualTo("A and B");
+        assertThat(StringJoining.joinVerbose(List.of("A", "B", "C"))).isEqualTo("A, B and C");
     }
 
 }
