feat(core): move test utils to a proper package

kestra-io · Jun 20, 2024 · bd5d5c5 · bd5d5c5
1 parent 8370798
commit bd5d5c5
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 3 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -48,6 +48,7 @@ dependencies {
 
     // test
     testAnnotationProcessor project(':processor')
+    testImplementation project(':tests')
 
     testImplementation project(':repository-memory')
     testImplementation project(':runner-memory')

diff --git a/jdbc-h2/build.gradle b/jdbc-h2/build.gradle
@@ -12,4 +12,5 @@ dependencies {
     testImplementation project(':core').sourceSets.test.output
     testImplementation project(':jdbc').sourceSets.test.output
     testImplementation project(':storage-local')
+    testImplementation project(':tests')
 }
diff --git a/jdbc-mysql/build.gradle b/jdbc-mysql/build.gradle
@@ -15,4 +15,5 @@ dependencies {
     testImplementation project(':core').sourceSets.test.output
     testImplementation project(':jdbc').sourceSets.test.output
     testImplementation project(':storage-local')
+    testImplementation project(':tests')
 }
diff --git a/jdbc-postgres/build.gradle b/jdbc-postgres/build.gradle
@@ -15,4 +15,5 @@ dependencies {
     testImplementation project(':core').sourceSets.test.output
     testImplementation project(':jdbc').sourceSets.test.output
     testImplementation project(':storage-local')
+    testImplementation project(':tests')
 }
diff --git a/jdbc/build.gradle b/jdbc/build.gradle
@@ -10,5 +10,6 @@ dependencies {
     implementation("io.micronaut.sql:micronaut-jooq")
     implementation("io.micronaut.flyway:micronaut-flyway")
 
+    testImplementation project(':tests')
     testImplementation project(':core').sourceSets.test.output
 }
diff --git a/repository-memory/build.gradle b/repository-memory/build.gradle
@@ -4,9 +4,9 @@ configurations {
 
 dependencies {
     testImplementation project(":core")
-    testImplementation project(':core').sourceSets.test.output
     implementation("io.micronaut.flyway:micronaut-flyway")
     implementation("io.micronaut.sql:micronaut-jdbc-hikari")
     api project(":jdbc")
     implementation project(":jdbc-h2")
+    testImplementation project(":tests")
 }
diff --git a/runner-memory/build.gradle b/runner-memory/build.gradle
@@ -4,6 +4,8 @@ configurations {
 
 dependencies {
     testImplementation project(":core")
-    testImplementation project(':core').sourceSets.test.output
     api project(":repository-memory")
+
+
+    testImplementation project(':tests')
 }
diff --git a/script/build.gradle b/script/build.gradle
@@ -12,6 +12,7 @@ dependencies {
     implementation 'com.github.docker-java:docker-java-transport-httpclient5:3.3.6'
 
     testImplementation project(':core').sourceSets.test.output
+    testImplementation project(':tests')
     testImplementation project(':storage-local')
     testImplementation project(':repository-memory')
     testImplementation project(':runner-memory')

diff --git a/settings.gradle b/settings.gradle
@@ -4,6 +4,7 @@ include 'platform'
 
 include 'cli'
 include 'core'
+include 'tests'
 
 include 'runner-memory'
 

diff --git a/storage-local/build.gradle b/storage-local/build.gradle
@@ -7,5 +7,5 @@ dependencies {
     implementation project(":core")
 
     testAnnotationProcessor project(":processor")
-    testImplementation project(':core').sourceSets.test.output
+    testImplementation project(':tests')
 }
diff --git a/tests/build.gradle b/tests/build.gradle
@@ -0,0 +1,12 @@
+dependencies {
+    implementation project(':core')
+    implementation "io.micronaut:micronaut-runtime"
+    implementation "io.micronaut.test:micronaut-test-junit5"
+
+    implementation "org.junit.jupiter:junit-jupiter-engine"
+    implementation "org.junit.jupiter:junit-jupiter-engine"
+
+    api 'org.hamcrest:hamcrest:2.2'
+    api 'org.hamcrest:hamcrest-library:2.2'
+    api 'org.mockito:mockito-junit-jupiter'
+}
diff --git a/...src/test/java/io/kestra/core/Helpers.java → ...src/main/java/io/kestra/core/Helpers.java b/...src/test/java/io/kestra/core/Helpers.java → ...src/main/java/io/kestra/core/Helpers.java
diff --git a/...ra/core/junit/annotations/KestraTest.java → ...ra/core/junit/annotations/KestraTest.java b/...ra/core/junit/annotations/KestraTest.java → ...ra/core/junit/annotations/KestraTest.java
diff --git a/...junit/extensions/KestraTestExtension.java → ...junit/extensions/KestraTestExtension.java b/...junit/extensions/KestraTestExtension.java → ...junit/extensions/KestraTestExtension.java
diff --git a/...tasks/runners/AbstractTaskRunnerTest.java → ...tasks/runners/AbstractTaskRunnerTest.java b/...tasks/runners/AbstractTaskRunnerTest.java → ...tasks/runners/AbstractTaskRunnerTest.java
diff --git a/...kestra/core/storage/StorageTestSuite.java → ...kestra/core/storage/StorageTestSuite.java b/...kestra/core/storage/StorageTestSuite.java → ...kestra/core/storage/StorageTestSuite.java
diff --git a/...java/io/kestra/core/utils/TestsUtils.java → ...java/io/kestra/core/utils/TestsUtils.java b/...java/io/kestra/core/utils/TestsUtils.java → ...java/io/kestra/core/utils/TestsUtils.java
diff --git a/webserver/build.gradle b/webserver/build.gradle
@@ -30,6 +30,7 @@ dependencies {
     testImplementation project(':storage-local')
     testImplementation("com.github.tomakehurst:wiremock-jre8")
 
+    testImplementation project(':tests')
     testImplementation project(':jdbc')
     testImplementation project(':jdbc').sourceSets.test.output
     testImplementation project(':jdbc-h2')