Merge remote-tracking branch 'eclipse/main' into fix-93

# Conflicts: # kuksa-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/DataBrokerConnectionTest.kt
eclipse-kuksa · Mar 18, 2024 · eb26b5e · eb26b5e
2 parents 16bb945 + fbc54b7
commit eb26b5e
Show file tree

Hide file tree

Showing 36 changed files with 813 additions and 286 deletions.
diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml
@@ -14,19 +14,14 @@ inputs:
   kotest-tag:
     description: >
       The Kotest Tag to use when executing the tests. Check Tag.kt for valid options. Different Tags might require the
-      Databroker to be started in a different mode. Currently only unsecured mode (no tls, no authentication) is
-      supported.
-    default: '!CustomDatabroker'
+      Databroker to be started in a different mode.
+    default: ''
 
 runs:
   using: "composite"
   steps:
-    - name: "Run Docker Container of Databroker in detached mode"
-      run: docker run --pull=always --rm --publish 55556:55556/tcp --detach --name databroker ghcr.io/eclipse/kuksa.val/databroker:${{ inputs.databroker-version }} --port 55556 --insecure
-      shell: bash
-
     - name: Run 'test' with Gradle Wrapper
-      run: ./gradlew test -Dkotest.tags="${{ inputs.kotest-tag}}"
+      run: ./gradlew test -Ddatabroker.tag="${{ inputs.databroker-version }}" -Dkotest.tags="${{ inputs.kotest-tag}}"
       shell: bash
 
     - name: Upload Test Reports
@@ -51,8 +46,3 @@ runs:
         path: ${{ github.workspace }}/build/reports/jacoco/jacocoRootReport/html/*
         if-no-files-found: error
         retention-days: 14
-
-    - name: "Stop Docker Container of Databroker"
-      if: always()
-      run: docker stop databroker
-      shell: bash
diff --git a/.github/workflows/daily_integration_main-master.yaml b/.github/workflows/daily_integration_main-master.yaml
@@ -21,4 +21,4 @@ jobs:
         with:
           upload-test-reports: true
           databroker-version: master
-          kotest-tag: "Integration & DefaultDatabroker"
+          kotest-tag: "Integration"
diff --git a/.run/kuksa-vss-core_UnitTests.run.xml → .run/All Tests.run.xml b/.run/kuksa-vss-core_UnitTests.run.xml → .run/All Tests.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="kuksa-vss-core:UnitTests" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="All Tests" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -10,14 +10,15 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value=":vss-core:test" />
+          <option value="test" />
         </list>
       </option>
       <option name="vmOptions" value="" />
     </ExternalSystemSettings>
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
     <method v="2" />
   </configuration>
 </component>
diff --git a/.run/kuksa-sdk_UnitTests.run.xml → .run/Functional Tests.run.xml b/.run/kuksa-sdk_UnitTests.run.xml → .run/Functional Tests.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="kuksa-sdk:UnitTests" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="Functional Tests" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -10,14 +10,15 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value=":kuksa-sdk:testDebugUnitTest" />
+          <option value="test" />
         </list>
       </option>
-      <option name="vmOptions" value="-Dkotest.tags=&quot;Unit&quot;" />
+      <option name="vmOptions" value="-Dkotest.tags=&quot;Functional&quot;" />
     </ExternalSystemSettings>
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
     <method v="2" />
   </configuration>
 </component>
diff --git a/.run/kuksa-sdk_IntegrationTests.run.xml → .run/Integration Tests.run.xml b/.run/kuksa-sdk_IntegrationTests.run.xml → .run/Integration Tests.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="kuksa-sdk:IntegrationTests" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="Integration Tests" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -10,10 +10,10 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value=":kuksa-sdk:testDebugUnitTest" />
+          <option value="test" />
         </list>
       </option>
-      <option name="vmOptions" value="-Dkotest.tags=&quot;Integration &amp; DefaultDatabroker&quot;" />
+      <option name="vmOptions" value="-Dkotest.tags=&quot;Integration&quot;" />
     </ExternalSystemSettings>
     <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>

diff --git a/.run/All UnitTests.run.xml → .run/Unit Tests.run.xml b/.run/All UnitTests.run.xml → .run/Unit Tests.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All UnitTests" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="Unit Tests" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -18,6 +18,7 @@
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
     <method v="2" />
   </configuration>
 </component>
diff --git a/.run/app_UnitTests.run.xml b/.run/app_UnitTests.run.xml
diff --git a/.run/kuksa-vss-processor_UnitTests.run.xml b/.run/kuksa-vss-processor_UnitTests.run.xml
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![License](https://img.shields.io/badge/License-Apache%202.0-green.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Gitter](https://img.shields.io/gitter/room/kuksa-val/community)](https://gitter.im/kuksa-val/community)
 
-![SDK:main <-> Databroker:master](https://github.com/eclipse-kuksa/kuksa-android-sdk/actions/workflows/daily_integration_main-master.yaml/badge.svg)
+[![SDK:main <-> Databroker:master](https://github.com/eclipse-kuksa/kuksa-android-sdk/actions/workflows/daily_integration_main-master.yaml/badge.svg)](https://github.com/eclipse-kuksa/kuksa-android-sdk/actions/workflows/daily_integration_main-master.yaml?query=branch%3Amain)
 
 This is an Android SDK for the [KUKSA Vehicle Abstraction Layer](https://github.com/eclipse/kuksa.val).
 

diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
@@ -103,7 +103,7 @@ If this build fails it should be considered as a warning
 
 **SDK:main -> Databroker:master**
 
-![SDK:main <-> Databroker:master](https://github.com/eclipse-kuksa/kuksa-android-sdk/actions/workflows/daily_integration_main-master.yaml/badge.svg)
+[![SDK:main <-> Databroker:master](https://github.com/eclipse-kuksa/kuksa-android-sdk/actions/workflows/daily_integration_main-master.yaml/badge.svg)](https://github.com/eclipse-kuksa/kuksa-android-sdk/actions/workflows/daily_integration_main-master.yaml?query=branch%3Amain)
 
 This means both the SDK and Databroker are running in a kind of "bleeding edge" state in their currently developed version.
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,6 +5,7 @@ detekt = "1.23.5"
 datastore = "1.0.0"
 constraintlayoutCompose = "1.0.1"
 datastorePreferences = "1.0.0"
+dockerJavaCore = "3.3.6"
 dokka = "1.9.10"
 gson = "2.10.1"
 kotlin = "1.9.22"
@@ -34,6 +35,8 @@ androidx-datastore = { module = "androidx.datastore:datastore", version.ref = "d
 androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastorePreferences" }
 androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidxLifecycle" }
 androidx-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata", version.ref = "runtimeLivedata" }
+docker-java-core = { module = "com.github.docker-java:docker-java-core", version.ref = "dockerJavaCore" }
+docker-java-transport-httpclient5 = { module = "com.github.docker-java:docker-java-transport-httpclient5", version.ref = "dockerJavaCore" }
 grpc-okhttp = { group = "io.grpc", name = "grpc-okhttp", version.ref = "grpc" }
 grpc-protobuf = { group = "io.grpc", name = "grpc-protobuf-lite", version.ref = "grpc" }
 grpc-stub = { group = "io.grpc", name = "grpc-stub", version.ref = "grpc" }

diff --git a/kuksa-sdk/build.gradle.kts b/kuksa-sdk/build.gradle.kts
@@ -94,6 +94,9 @@ dependencies {
     testImplementation(libs.kotlinx.coroutines.test)
     testImplementation(libs.kotest)
     testImplementation(libs.mockk)
+
+    testImplementation(libs.docker.java.core)
+    testImplementation(libs.docker.java.transport.httpclient5)
 }
 
 publish {