pr remarks

eclipse-tractusx · May 22, 2023 · 9a5c76b · 9a5c76b
1 parent 1fe84c0
commit 9a5c76b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 53 deletions.
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
@@ -126,9 +126,9 @@ jobs:
       - uses: ./.github/actions/setup-java
 
       - name: Run E2E tests
-        run: ./gradlew :edc-tests:runtime:build test -DincludeTags="EndToEndTest"
+        run: ./gradlew test -DincludeTags="EndToEndTest"
 
-  postgres-end-to-end-tests:
+  postgres-tests:
     runs-on: ubuntu-latest
     needs: [ verify-formatting ]
 
@@ -145,4 +145,4 @@ jobs:
       - uses: ./.github/actions/setup-java
 
       - name: Run Postgresql E2E tests
-        run: ./gradlew :edc-tests:runtime:build  test -DincludeTags="PostgresqlIntegrationTest"
+        run: ./gradlew test -DincludeTags="PostgresqlIntegrationTest"
diff --git a/edc-tests/e2e-tests/build.gradle.kts b/edc-tests/e2e-tests/build.gradle.kts
@@ -36,6 +36,10 @@ dependencies {
     testImplementation(libs.edc.ext.jsonld)
     testImplementation(libs.edc.dsp)
     testImplementation(testFixtures(libs.edc.sql.core))
+
+    testCompileOnly(project(":edc-tests:runtime:extensions"))
+    testCompileOnly(project(":edc-tests:runtime:runtime-memory"))
+    testCompileOnly(project(":edc-tests:runtime:runtime-postgresql"))
 }
 
 // do not publish

diff --git a/edc-tests/runtime/build.gradle.kts b/edc-tests/runtime/build.gradle.kts
diff --git a/edc-tests/runtime/runtime-memory/build.gradle.kts b/edc-tests/runtime/runtime-memory/build.gradle.kts
@@ -15,7 +15,6 @@
 plugins {
     `java-library`
     id("application")
-    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 
@@ -28,13 +27,13 @@ dependencies {
         exclude(module = "data-encryption")
     }
 
-
+    implementation(project(":edc-tests:runtime:extensions"))
+
     // use basic (all in-mem) data plane
     runtimeOnly(project(":edc-dataplane:edc-dataplane-base")) {
         exclude("org.eclipse.edc", "api-observability")
     }
 
-    runtimeOnly(project(":edc-tests:runtime:extensions"))
 
     implementation(libs.edc.core.controlplane)
     // for the controller
@@ -45,11 +44,6 @@ application {
     mainClass.set("org.eclipse.edc.boot.system.runtime.BaseRuntime")
 }
 
-tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
-    mergeServiceFiles()
-    archiveFileName.set("app.jar")
-}
-
 // do not publish
 edcBuild {
     publish.set(false)

diff --git a/edc-tests/runtime/runtime-postgresql/README.md b/edc-tests/runtime/runtime-postgresql/README.md
@@ -1,3 +1,3 @@
-# In-Memory Runtime for Testing Purposes
+# PostgreSQL Runtime for Testing Purposes
 
-This module provides a very small, purely in-mem runtime to execute tests against. Not intended for anything other than testing!
+This module provides a very small,runtime using PostgreSQL as persistence backend to execute tests against. Not intended for anything other than testing!
diff --git a/edc-tests/runtime/runtime-postgresql/build.gradle.kts b/edc-tests/runtime/runtime-postgresql/build.gradle.kts
@@ -15,7 +15,6 @@
 plugins {
     `java-library`
     id("application")
-    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 
@@ -29,13 +28,13 @@ dependencies {
         exclude(module = "hashicorp-vault")
     }
 
-
+    implementation(project(":edc-tests:runtime:extensions"))
+
     // use basic (all in-mem) data plane
     runtimeOnly(project(":edc-dataplane:edc-dataplane-base")) {
         exclude("org.eclipse.edc", "api-observability")
     }
 
-    runtimeOnly(project(":edc-tests:runtime:extensions"))
 
     implementation(libs.edc.core.controlplane)
     // for the controller
@@ -46,11 +45,6 @@ application {
     mainClass.set("org.eclipse.edc.boot.system.runtime.BaseRuntime")
 }
 
-tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
-    mergeServiceFiles()
-    archiveFileName.set("app.jar")
-}
-
 // do not publish
 edcBuild {
     publish.set(false)