Upgrade tests to JUnit platform

deephaven · Dec 28, 2023 · aa0e4de · aa0e4de
1 parent 5b60730
commit aa0e4de
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 9 deletions.
diff --git a/java/processor-functions/build.gradle b/java/processor-functions/build.gradle
@@ -10,7 +10,12 @@ dependencies {
 
     implementation project(':engine-time')
 
-    Classpaths.inheritJUnitClassic(project, 'testImplementation')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    Classpaths.inheritJUnitPlatform(project)
     Classpaths.inheritAssertJ(project)
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
+}
+
+test {
+    useJUnitPlatform()
 }
diff --git a/...unctions/src/test/java/io/deephaven/processor/functions/ObjectProcessorFunctionsTest.java b/...unctions/src/test/java/io/deephaven/processor/functions/ObjectProcessorFunctionsTest.java
@@ -23,7 +23,7 @@
 import io.deephaven.processor.ObjectProcessor;
 import io.deephaven.qst.type.Type;
 import io.deephaven.util.BooleanUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 

diff --git a/java/processor/build.gradle b/java/processor/build.gradle
@@ -10,7 +10,12 @@ dependencies {
 
     implementation project(':engine-time')
 
-    Classpaths.inheritJUnitClassic(project, 'testImplementation')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    Classpaths.inheritJUnitPlatform(project)
     Classpaths.inheritAssertJ(project)
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
+}
+
+test {
+    useJUnitPlatform()
 }
diff --git a/java/processor/src/test/java/io/deephaven/processor/ObjectProcessorNoopTest.java b/java/processor/src/test/java/io/deephaven/processor/ObjectProcessorNoopTest.java
@@ -14,7 +14,7 @@
 import io.deephaven.chunk.WritableShortChunk;
 import io.deephaven.qst.type.Type;
 import io.deephaven.util.QueryConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 

diff --git a/java/processor/src/test/java/io/deephaven/processor/ObjectProcessorRowLimitedTest.java b/java/processor/src/test/java/io/deephaven/processor/ObjectProcessorRowLimitedTest.java
@@ -8,7 +8,7 @@
 import io.deephaven.chunk.WritableIntChunk;
 import io.deephaven.chunk.WritableObjectChunk;
 import io.deephaven.qst.type.Type;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 

diff --git a/java/processor/src/test/java/io/deephaven/processor/ObjectProcessorStrictTest.java b/java/processor/src/test/java/io/deephaven/processor/ObjectProcessorStrictTest.java
@@ -12,7 +12,7 @@
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.qst.type.Type;
 import io.deephaven.util.QueryConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/java/processor/src/test/java/io/deephaven/processor/ObjectProcessorTest.java b/java/processor/src/test/java/io/deephaven/processor/ObjectProcessorTest.java
@@ -6,7 +6,7 @@
 import io.deephaven.chunk.ChunkType;
 import io.deephaven.qst.type.PrimitiveType;
 import io.deephaven.qst.type.Type;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;