Build: split integration tests into a separate subproject (#588)

alexklibisz · Nov 19, 2023 · c56d7ae · c56d7ae
1 parent 50dc2de
commit c56d7ae
Show file tree

Hide file tree

Showing 25 changed files with 19 additions and 7 deletions.
diff --git a/Taskfile.yaml b/Taskfile.yaml
@@ -158,7 +158,7 @@ tasks:
   jvmCompile:
     desc: Compile Scala and Java code using SBT
     cmds:
-      - sbt -client "compile; Test/compile; IntegrationTest/compile"
+      - sbt -client "compile; Test/compile"
 
   jvmAssemble:
     desc: Build the plugin bundle using SBT
@@ -169,17 +169,22 @@ tasks:
   jvmIntegrationTest:
     desc: Run JVM tests using SBT
     cmds:
-      - sbt -client IntegrationTest/test
+      - sbt -client elastiknn-plugin-integration-tests/test
 
   jvmIntegrationTestQuick:
     desc: Run JVM tests using SBT, but only the ones that were recompiled
     cmds:
-      - sbt -client IntegrationTest/testQuick
+      - sbt -client elastiknn-plugin-integration-tests/testQuick
 
   jvmUnitTest:
     desc: Run JVM tests using SBT
     cmds:
-      - sbt -client test
+      - sbt -client elastiknn-api4s/test
+      - sbt -client elastiknn-client-elastic4s/test
+      - sbt -client elastiknn-lucene/test
+      - sbt -client elastiknn-models/test
+      - sbt -client elastiknn-models-benchmarks/test
+      - sbt -client elastiknn-plugin/test
 
   jvmUnitTestQuick:
     desc: Run JVM tests using SBT, but only the ones that were recompiled

diff --git a/build.sbt b/build.sbt
@@ -27,7 +27,8 @@ lazy val `elastiknn-root` = project
     `elastiknn-lucene`,
     `elastiknn-models`,
     `elastiknn-models-benchmarks`,
-    `elastiknn-plugin`
+    `elastiknn-plugin`,
+    `elastiknn-plugin-integration-tests`
   )
 
 lazy val `elastiknn-api4s` = project
@@ -104,7 +105,6 @@ lazy val `elastiknn-plugin` = project
     `elastiknn-lucene` % "compile->compile;test->test",
     `elastiknn-client-elastic4s` % "test->compile"
   )
-  .configs(IntegrationTest.extend(Test))
   .settings(
     name := "elastiknn",
     version := ElastiknnVersion,
@@ -125,6 +125,13 @@ lazy val `elastiknn-plugin` = project
       "com.klibisz.futil" %% "futil" % "0.1.2" % Test
     ),
     scalacOptions ++= ScalacOptions,
-    Defaults.itSettings,
+    TestSettings
+  )
+
+lazy val `elastiknn-plugin-integration-tests` = project
+  .in(file("elastiknn-plugin-integration-tests"))
+  .dependsOn(`elastiknn-plugin` % "test->test")
+  .settings(
+    scalacOptions ++= ScalacOptions,
     TestSettings
   )
diff --git a/...lastiknn/testdata-densefloat-unit.json.gz → ...lastiknn/testdata-densefloat-unit.json.gz b/...lastiknn/testdata-densefloat-unit.json.gz → ...lastiknn/testdata-densefloat-unit.json.gz
diff --git a/...isz/elastiknn/testdata-densefloat.json.gz → ...isz/elastiknn/testdata-densefloat.json.gz b/...isz/elastiknn/testdata-densefloat.json.gz → ...isz/elastiknn/testdata-densefloat.json.gz
diff --git a/...isz/elastiknn/testdata-sparsebool.json.gz → ...isz/elastiknn/testdata-sparsebool.json.gz b/...isz/elastiknn/testdata-sparsebool.json.gz → ...isz/elastiknn/testdata-sparsebool.json.gz
diff --git a/...-plugin/src/it/resources/log4j.properties → ...tests/src/test/resources/log4j.properties b/...-plugin/src/it/resources/log4j.properties → ...tests/src/test/resources/log4j.properties
diff --git a/...-plugin/src/it/resources/logback-test.xml → ...tests/src/test/resources/logback-test.xml b/...-plugin/src/it/resources/logback-test.xml → ...tests/src/test/resources/logback-test.xml
diff --git a/...iknn/ApproximateQueryTotalHitsSuite.scala → ...iknn/ApproximateQueryTotalHitsSuite.scala b/...iknn/ApproximateQueryTotalHitsSuite.scala → ...iknn/ApproximateQueryTotalHitsSuite.scala
diff --git a/...elastiknn/CloseIndexRegressionSuite.scala → ...elastiknn/CloseIndexRegressionSuite.scala b/...elastiknn/CloseIndexRegressionSuite.scala → ...elastiknn/CloseIndexRegressionSuite.scala
diff --git a/...m/klibisz/elastiknn/ClusterCatSuite.scala → ...m/klibisz/elastiknn/ClusterCatSuite.scala b/...m/klibisz/elastiknn/ClusterCatSuite.scala → ...m/klibisz/elastiknn/ClusterCatSuite.scala
diff --git a/...astiknn/DocsWithMissingVectorsSuite.scala → ...astiknn/DocsWithMissingVectorsSuite.scala b/...astiknn/DocsWithMissingVectorsSuite.scala → ...astiknn/DocsWithMissingVectorsSuite.scala
diff --git a/...stiknn/DocsWithMultipleVectorsSuite.scala → ...stiknn/DocsWithMultipleVectorsSuite.scala b/...stiknn/DocsWithMultipleVectorsSuite.scala → ...stiknn/DocsWithMultipleVectorsSuite.scala
diff --git a/...lastiknn/DocsWithNestedVectorsSuite.scala → ...lastiknn/DocsWithNestedVectorsSuite.scala b/...lastiknn/DocsWithNestedVectorsSuite.scala → ...lastiknn/DocsWithNestedVectorsSuite.scala
diff --git a/...klibisz/elastiknn/Elastic4sMatchers.scala → ...klibisz/elastiknn/Elastic4sMatchers.scala b/...klibisz/elastiknn/Elastic4sMatchers.scala → ...klibisz/elastiknn/Elastic4sMatchers.scala
diff --git a/...libisz/elastiknn/ElasticAsyncClient.scala → ...libisz/elastiknn/ElasticAsyncClient.scala b/...libisz/elastiknn/ElasticAsyncClient.scala → ...libisz/elastiknn/ElasticAsyncClient.scala
diff --git a/.../klibisz/elastiknn/ExistsQuerySuite.scala → .../klibisz/elastiknn/ExistsQuerySuite.scala b/.../klibisz/elastiknn/ExistsQuerySuite.scala → .../klibisz/elastiknn/ExistsQuerySuite.scala
diff --git a/...z/elastiknn/FunctionScoreQuerySuite.scala → ...z/elastiknn/FunctionScoreQuerySuite.scala b/...z/elastiknn/FunctionScoreQuerySuite.scala → ...z/elastiknn/FunctionScoreQuerySuite.scala
diff --git a/...libisz/elastiknn/IndexedVectorSuite.scala → ...libisz/elastiknn/IndexedVectorSuite.scala b/...libisz/elastiknn/IndexedVectorSuite.scala → ...libisz/elastiknn/IndexedVectorSuite.scala
diff --git a/...astiknn/MixedIndexSearchDeleteSuite.scala → ...astiknn/MixedIndexSearchDeleteSuite.scala b/...astiknn/MixedIndexSearchDeleteSuite.scala → ...astiknn/MixedIndexSearchDeleteSuite.scala
diff --git a/...libisz/elastiknn/QueryRescorerSuite.scala → ...libisz/elastiknn/QueryRescorerSuite.scala b/...libisz/elastiknn/QueryRescorerSuite.scala → ...libisz/elastiknn/QueryRescorerSuite.scala
diff --git a/...a/com/klibisz/elastiknn/RecallSuite.scala → ...a/com/klibisz/elastiknn/RecallSuite.scala b/...a/com/klibisz/elastiknn/RecallSuite.scala → ...a/com/klibisz/elastiknn/RecallSuite.scala
diff --git a/...om/klibisz/elastiknn/SilentMatchers.scala → ...om/klibisz/elastiknn/SilentMatchers.scala b/...om/klibisz/elastiknn/SilentMatchers.scala → ...om/klibisz/elastiknn/SilentMatchers.scala
diff --git a/...lastiknn/SparseUnsortedIndicesSuite.scala → ...lastiknn/SparseUnsortedIndicesSuite.scala b/...lastiknn/SparseUnsortedIndicesSuite.scala → ...lastiknn/SparseUnsortedIndicesSuite.scala
diff --git a/...cala/com/klibisz/elastiknn/TestData.scala → ...cala/com/klibisz/elastiknn/TestData.scala b/...cala/com/klibisz/elastiknn/TestData.scala → ...cala/com/klibisz/elastiknn/TestData.scala
diff --git a/...klibisz/elastiknn/VectorMapperSuite.scala → ...klibisz/elastiknn/VectorMapperSuite.scala b/...klibisz/elastiknn/VectorMapperSuite.scala → ...klibisz/elastiknn/VectorMapperSuite.scala