Rework server tests to avoid using test sources from other projects

Partial deephaven#4040
niloc132 · Dec 19, 2023 · 30d50d0 · 30d50d0
1 parent 8496924
commit 30d50d0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/server/build.gradle b/server/build.gradle
@@ -96,10 +96,13 @@ dependencies {
 
     testImplementation project(':base-test-utils')
     testImplementation project(':engine-context')
-    testImplementation project(':engine-test-utils')
     testImplementation TestTools.projectDependency(project, 'engine-context')
     testImplementation TestTools.projectDependency(project, 'Util')
 
+    testImplementation project(':server-test')
+    Classpaths.inheritJUnitClassic(project, 'testImplementation')
+    Classpaths.inheritAssertJ(project)
+
     runtimeOnly project(':Numerics'), project(':extensions-kafka')
     Classpaths.inheritAssertJ(project)
 

diff --git a/server/jetty/build.gradle b/server/jetty/build.gradle
@@ -41,7 +41,8 @@ dependencies {
     implementation project(':grpc-java:grpc-mtls')
 
     testImplementation project(':server-test')
-    testImplementation TestTools.projectDependency(project, ':server')
+    Classpaths.inheritJUnitClassic(project, 'testImplementation')
+    Classpaths.inheritAssertJ(project)
 
     testRuntimeOnly project(':log-to-slf4j')
     Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')

diff --git a/server/netty/build.gradle b/server/netty/build.gradle
@@ -24,7 +24,8 @@ dependencies {
     implementation project(':grpc-java:grpc-mtls')
 
     testImplementation project(':server-test')
-    testImplementation TestTools.projectDependency(project, ':server')
+    Classpaths.inheritJUnitClassic(project, 'testImplementation')
+    Classpaths.inheritAssertJ(project)
 
     testRuntimeOnly project(':log-to-slf4j')
     Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')

diff --git a/server/test/build.gradle b/server/test/build.gradle
@@ -14,6 +14,7 @@ dependencies {
     implementation project(':extensions-barrage')
     implementation project(':test-configs')
     implementation depCommonsLang3
+    implementation project(':engine-test-utils')
 
     Classpaths.inheritArrow(project, 'flight-core', 'implementation')
 

diff --git a/...unner/ExecutionContextUnitTestModule.java → ...unner/ExecutionContextUnitTestModule.java b/...unner/ExecutionContextUnitTestModule.java → ...unner/ExecutionContextUnitTestModule.java