Publish deephaven-server-test-utils jar (#5467)

Ultimately, this PR makes the `server-test-utils` jar public so external integrators can write unit tests against it. As part of this effort, all transitive dependencies of `server-test-utils` need to be made public as well. test-configs was elevated to a public jar, and in other cases, "test library code" was extracted from "test code" (in these cases, we already had appropriate public testing jars the code could be moved to).

Fixes #5341

BenchmarkSupport/BenchmarkSupport.gradle

@@ -34,8 +34,7 @@ dependencies {
     implementation project(':Configuration')
     implementation 'org.openjdk.jmh:jmh-core:1.20'
 
-    testImplementation TestTools.projectDependency(project, 'Util')
-    testImplementation TestTools.projectDependency(project, 'engine-table')
+    testImplementation project(':engine-test-utils')
 
     testRuntimeOnly project(path: ':configs')
     testRuntimeOnly project(path: ':test-configs')

Integrations/build.gradle

@@ -22,8 +22,9 @@ dependencies {
     implementation project(':log-factory')
 
     testImplementation project(':engine-test-utils')
-    testImplementation TestTools.projectDependency(project, 'engine-time')
 
+    // Needed for CalendarInit
+    testRuntimeOnly TestTools.projectDependency(project, 'engine-time')
     testRuntimeOnly project(':log-to-slf4j')
     // add configs, and some runtime dependencies to test classpaths
     testRuntimeOnly project(':configs')

ModelFarm/ModelFarm.gradle

@@ -20,11 +20,11 @@ dependencies {
 
     runtimeOnly project(':configs')
 
-    testImplementation TestTools.projectDependency(project, 'engine-table')
+    testImplementation project(':engine-test-utils')
     testRuntimeOnly project(':Numerics')
 
     testRuntimeOnly project(':log-to-slf4j')
-    testRuntimeOnly project(path: ':configs')
-    testRuntimeOnly project(path: ':test-configs')
+    testRuntimeOnly project(':configs')
+    testRuntimeOnly project(':test-configs')
     Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
 }

Plot/Plot.gradle

@@ -25,12 +25,11 @@ dependencies {
 
     Classpaths.inheritGuava(project)
 
-    testImplementation TestTools.projectDependency(project, 'Util')
-    testImplementation TestTools.projectDependency(project, 'engine-table')
+    testImplementation project(':engine-test-utils')
     testImplementation TestTools.projectDependency(project, 'engine-time')
 
-    testRuntimeOnly project(path: ':configs')
-    testRuntimeOnly project(path: ':test-configs')
+    testRuntimeOnly project(':configs')
+    testRuntimeOnly project(':test-configs')
     testRuntimeOnly project(':Numerics')
 
     testRuntimeOnly project(':log-to-slf4j')

base-test-utils/build.gradle

@@ -12,6 +12,6 @@ dependencies {
 
     api 'io.deephaven:hash:0.1.0'
 
-    Classpaths.inheritJUnitClassic(project, 'implementation')
-    Classpaths.inheritJMock(project, 'implementation')
+    Classpaths.inheritJUnitClassic(project, 'api')
+    Classpaths.inheritJMock(project, 'api')
 }

engine/api/build.gradle

@@ -24,7 +24,13 @@ dependencies {
 
     compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
 
-    testImplementation TestTools.projectDependency(project, 'engine-table')
+    testImplementation project(':engine-test-utils')
+    testImplementation depCommonsLang3
 
     Classpaths.inheritJUnitClassic(project, 'testImplementation')
+
+    testRuntimeOnly project(':log-to-slf4j')
+    testRuntimeOnly project(':configs')
+    testRuntimeOnly project(':test-configs')
+    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
 }

engine/context/build.gradle

@@ -26,7 +26,6 @@ dependencies {
     Classpaths.inheritCommonsText(project, 'implementation')
     Classpaths.inheritImmutables(project)
 
-    testImplementation TestTools.projectDependency(project, 'Base')
     testImplementation project(':engine-test-utils')
 
     testRuntimeOnly project(':log-to-slf4j'),

engine/function/build.gradle

@@ -21,7 +21,7 @@ dependencies {
     implementation project(':Base')
     implementation depCommonsLang3
 
-    testImplementation TestTools.projectDependency(project, 'Base')
+    testImplementation project(':base-test-utils')
 }
 
 def generatedFiles = []

engine/table/build.gradle

@@ -53,11 +53,9 @@ dependencies {
 
     Classpaths.inheritGuava(project)
 
-    testImplementation TestTools.projectDependency(project, 'Util')
     testImplementation TestTools.projectDependency(project, 'engine-chunk')
     testImplementation TestTools.projectDependency(project, 'engine-vector')
     testImplementation TestTools.projectDependency(project, 'Numerics')
-    testImplementation TestTools.projectDependency(project, 'engine-context')
     testImplementation TestTools.projectDependency(project, 'engine-time')
     testImplementation project(':base-test-utils')
     testImplementation project(':engine-rowset-test-utils')
@@ -76,9 +74,9 @@ dependencies {
     Classpaths.inheritJUnitPlatform(project)
     Classpaths.inheritAssertJ(project)
 
-    testRuntimeOnly project(':log-to-slf4j'),
-            project(path: ':configs'),
-            project(path: ':test-configs')
+    testRuntimeOnly project(':log-to-slf4j')
+    testRuntimeOnly project(':configs')
+    testRuntimeOnly project(':test-configs')
     Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
 }
 

engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableRangeJoinTest.java

@@ -24,7 +24,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import org.opentest4j.AssertionFailedError;
+import junit.framework.AssertionFailedError;
 
 import java.lang.reflect.Array;
 import java.time.Instant;
@@ -504,7 +504,7 @@ private static void joinAndVerify(
                             assertThat(actualRangeSize).isEqualTo(expectedRangeSize);
                         }
                     } catch (AssertionFailedError e) {
-                        throw new AssertionFailedError(String.format("Failure for type %s at row position %s",
+                        throw new AssertionError(String.format("Failure for type %s at row position %s",
                                 type, rowPosition), e);
                     }
                     ++rowPosition;

engine/table/src/test/java/io/deephaven/engine/table/impl/TestAddOnlyToBlinkTableAdapter.java

@@ -17,8 +17,8 @@
 import static io.deephaven.engine.testutil.TstUtils.*;
 import static io.deephaven.engine.util.TableTools.intCol;
 import static io.deephaven.engine.util.TableTools.stringCol;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
 
 public class TestAddOnlyToBlinkTableAdapter {
 

engine/table/src/test/java/io/deephaven/engine/table/impl/lang/TestQueryLanguageParser.java

@@ -13,12 +13,11 @@
 import io.deephaven.engine.table.impl.QueryCompilerRequestProcessor;
 import io.deephaven.engine.table.impl.lang.QueryLanguageParser.QueryLanguageParseException;
 import io.deephaven.engine.testutil.ControlledUpdateGraph;
+import io.deephaven.engine.util.PropertySaver;
 import io.deephaven.engine.util.PyCallableWrapper;
-import io.deephaven.time.TimeLiteralReplacedExpression;
 import io.deephaven.util.QueryConstants;
 import io.deephaven.util.SafeCloseable;
 import io.deephaven.util.type.TypeUtils;
-import io.deephaven.utils.test.PropertySaver;
 import io.deephaven.vector.Vector;
 import io.deephaven.vector.*;
 import org.apache.commons.lang3.exception.ExceptionUtils;

engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/TestEmMinMax.java

@@ -51,7 +51,7 @@
 import static io.deephaven.util.QueryConstants.*;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.fail;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.Assert.assertThrows;
 
 @Category(OutOfBandTest.class)
 public class TestEmMinMax extends BaseUpdateByTest {
@@ -511,10 +511,11 @@ public void testTimeThrowBehaviors() {
     }
 
     private void testThrowsInternal(TableDefaults table) {
-        assertThrows(TableDataException.class,
+        assertThrows(
+                "Encountered negative delta time during EMS processing",
+                TableDataException.class,
                 () -> table.updateBy(UpdateByOperation.EmMin(
-                        OperationControl.builder().build(), "ts", 100)),
-                "Encountered negative delta time during EMS processing");
+                        OperationControl.builder().build(), "ts", 100)));
     }
 
     @Test

engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/TestEmStd.java

@@ -52,7 +52,7 @@
 import static io.deephaven.util.QueryConstants.*;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.fail;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.Assert.assertThrows;
 
 @Category(OutOfBandTest.class)
 public class TestEmStd extends BaseUpdateByTest {
@@ -525,10 +525,11 @@ public void testTimeThrowBehaviors() {
     }
 
     private void testThrowsInternal(TableDefaults table) {
-        assertThrows(TableDataException.class,
+        assertThrows(
+                "Encountered negative delta time during EMS processing",
+                TableDataException.class,
                 () -> table.updateBy(UpdateByOperation.EmStd(
-                        OperationControl.builder().build(), "ts", 100)),
-                "Encountered negative delta time during EMS processing");
+                        OperationControl.builder().build(), "ts", 100)));
     }
 
     @Test

engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/TestEma.java

@@ -49,7 +49,7 @@
 import static io.deephaven.engine.util.TableTools.*;
 import static io.deephaven.time.DateTimeUtils.*;
 import static io.deephaven.util.QueryConstants.*;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.Assert.assertThrows;
 
 @Category(OutOfBandTest.class)
 public class TestEma extends BaseUpdateByTest {
@@ -272,10 +272,11 @@ public void testTimeThrowBehaviors() {
     }
 
     private void testThrowsInternal(TableDefaults table) {
-        assertThrows(TableDataException.class,
+        assertThrows(
+                "Encountered negative delta time during EMA processing",
+                TableDataException.class,
                 () -> table.updateBy(UpdateByOperation.Ema(
-                        OperationControl.builder().build(), "ts", 100)),
-                "Encountered negative delta time during EMA processing");
+                        OperationControl.builder().build(), "ts", 100)));
     }
 
     @Test

engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/TestEms.java

@@ -51,7 +51,7 @@
 import static io.deephaven.util.QueryConstants.*;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.fail;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.Assert.assertThrows;
 
 @Category(OutOfBandTest.class)
 public class TestEms extends BaseUpdateByTest {
@@ -386,10 +386,11 @@ public void testTimeThrowBehaviors() {
     }
 
     private void testThrowsInternal(TableDefaults table) {
-        assertThrows(TableDataException.class,
+        assertThrows(
+                "Encountered negative delta time during EMS processing",
+                TableDataException.class,
                 () -> table.updateBy(UpdateByOperation.Ems(
-                        OperationControl.builder().build(), "ts", 100)),
-                "Encountered negative delta time during EMS processing");
+                        OperationControl.builder().build(), "ts", 100)));
     }
 
     @Test

engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/TestForwardFill.java

@@ -35,8 +35,8 @@
 import static io.deephaven.engine.util.TableTools.stringCol;
 import static io.deephaven.engine.testutil.junit4.EngineCleanup.printTableUpdates;
 import static io.deephaven.util.QueryConstants.NULL_INT;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
 
 @Category(OutOfBandTest.class)
 public class TestForwardFill extends BaseUpdateByTest {

Util/src/test/java/io/deephaven/utils/test/PropertySaver.java → engine/table/src/test/java/io/deephaven/engine/util/PropertySaver.java

@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
-package io.deephaven.utils.test;
+package io.deephaven.engine.util;
 
 import io.deephaven.configuration.Configuration;
 

Util/src/test/java/io/deephaven/utils/test/PropertySaverTest.java → engine/table/src/test/java/io/deephaven/engine/util/PropertySaverTest.java

@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
-package io.deephaven.utils.test;
+package io.deephaven.engine.util;
 
 import io.deephaven.configuration.Configuration;
 import io.deephaven.configuration.PropertyException;

engine/table/src/test/java/io/deephaven/engine/util/TestWindowCheck.java

@@ -45,7 +45,7 @@
 import static io.deephaven.engine.testutil.TstUtils.*;
 import static io.deephaven.engine.util.TableTools.col;
 import static io.deephaven.engine.util.TableTools.intCol;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.Assert.assertTrue;
 
 @Category(OutOfBandTest.class)
 public class TestWindowCheck {

engine/test-utils/build.gradle

@@ -11,7 +11,7 @@ dependencies {
 
     implementation project(':Configuration')
     implementation project(':engine-tuple')
-    implementation project(':base-test-utils')
+    api project(':base-test-utils')
     implementation project(':engine-rowset-test-utils')
     implementation project(':extensions-source-support')
 

engine/time/build.gradle

@@ -20,7 +20,7 @@ dependencies {
     implementation depJdom2
     Classpaths.inheritDagger(project)
 
-    testImplementation TestTools.projectDependency(project, 'Base')
+    testImplementation project(':base-test-utils')
 
     testRuntimeOnly project(':log-to-slf4j'),
             project(path: ':configs'),

extensions/arrow/build.gradle

@@ -15,8 +15,7 @@ dependencies {
     Classpaths.inheritArrow(project, 'arrow-vector', 'implementation')
     Classpaths.inheritArrow(project, 'arrow-compression', 'implementation')
 
-    testImplementation TestTools.projectDependency(project, 'engine-table'),
-            TestTools.projectDependency(project, 'Util')
+    testImplementation TestTools.projectDependency(project, 'engine-table')
 
     Classpaths.inheritSlf4j(project, 'slf4j-api', 'implementation')
     Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')

extensions/barrage/build.gradle

@@ -30,12 +30,12 @@ dependencies {
 
     Classpaths.inheritImmutables(project)
 
-    testImplementation TestTools.projectDependency(project, 'engine-table'),
-            TestTools.projectDependency(project, 'Util')
+    testImplementation project(':engine-test-utils')
 
     Classpaths.inheritSlf4j(project, 'slf4j-api', 'implementation')
     Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
     testRuntimeOnly project(':log-to-slf4j')
+    testRuntimeOnly project(':test-configs')
 
     Classpaths.inheritJUnitPlatform(project)
     Classpaths.inheritAssertJ(project)

extensions/csv/build.gradle

@@ -21,8 +21,7 @@ dependencies {
 
     testImplementation depCommonsCompress
     testImplementation depCommonsIo
-    testImplementation project(':engine-test-utils'),
-            TestTools.projectDependency(project, 'engine-base')
+    testImplementation project(':engine-test-utils')
 
     Classpaths.inheritJUnitClassic(project, 'testImplementation')
 

extensions/jdbc/build.gradle

@@ -16,12 +16,11 @@ dependencies {
     Classpaths.inheritJUnitPlatform(project)
     Classpaths.inheritAssertJ(project)
 
-    testImplementation TestTools.projectDependency(project, 'engine-table'),
-            TestTools.projectDependency(project, 'Util'),
-            'com.h2database:h2:2.1.212'
+    testImplementation project(':engine-test-utils')
+    testImplementation 'com.h2database:h2:2.1.212'
 
-    testRuntimeOnly project(':log-to-slf4j'),
-            project(path: ':configs'),
-            project(path: ':test-configs')
+    testRuntimeOnly project(':log-to-slf4j')
+    testRuntimeOnly project(':configs')
+    testRuntimeOnly project(':test-configs')
     Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
 }

extensions/kafka/build.gradle

@@ -36,12 +36,12 @@ dependencies {
 
     Classpaths.inheritImmutables(project)
 
-    testImplementation TestTools.projectDependency(project, 'engine-table')
+    testImplementation project(':engine-test-utils')
     Classpaths.inheritJUnitClassic(project, 'testImplementation')
 
-    testRuntimeOnly project(':log-to-slf4j'),
-            project(path: ':configs'),
-            project(path: ':test-configs')
+    testRuntimeOnly project(':log-to-slf4j')
+    testRuntimeOnly project(':configs')
+    testRuntimeOnly project(':test-configs')
     Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
 
     Classpaths.inheritAssertJ(project)

extensions/parquet/benchmark/build.gradle

@@ -14,11 +14,11 @@ sourceSets {
 }
 
 dependencies {
-    testImplementation project(':extensions-parquet-table'),
-            project(':engine-table'),
-            project(':BenchmarkSupport'),
-            TestTools.projectDependency(project, 'engine-rowset'),
-            TestTools.projectDependency(project, 'engine-table')
+    testImplementation project(':extensions-parquet-table')
+    testImplementation project(':engine-table')
+    testImplementation project(':BenchmarkSupport')
+    testImplementation TestTools.projectDependency(project, 'engine-rowset')
+    testImplementation TestTools.projectDependency(project, 'engine-table')
 
     testAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.21'
     testCompileOnly 'org.openjdk.jmh:jmh-generator-annprocess:1.21'