Merge pull request #63 from openbase/feature/tests

Feature Fix Unit Tests

.github/workflows/build-and-test.yml

@@ -22,34 +22,37 @@ jobs:
 
     steps:
       - name: "Checkout Branch"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: "Setup Java"
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
+          distribution: 'temurin'
           java-version: 17
+          cache: 'gradle'
 
       - name: Setup Gradle cache
-        uses: actions/cache@v2.1.2
+        uses: actions/cache@v3
         with:
           path: ~/.gradle
-          key: ${{ runner.os }}-gradle-${{ hashFiles('build.gradle') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle
+          key: ${{ runner.os }}-gradle-${{ hashFiles('versions.properties') }}-${{ github.sha }}
+
+      - name: "prepare libs for build"
+        run: ./prepare.sh
 
       - name: "build backend"
-        run: ./gradlew build -x test
+        run: ./gradlew --build-cache build -x test
 
-      - name: Upload Gradle reports
-        uses: actions/upload-artifact@v2.2.4
-        if: ${{ failure() }}
+      - name: Upload build reports
+        uses: actions/upload-artifact@v3
+        if: ${{ failure() || contains(github.event.pull_request.labels.*.name, 'force reports') }}
         with:
-          name: Build Backend Reports
+          name: Build Reports
           path: "**/build/reports"
 
   test:
     name: "Test"
-    timeout-minutes: 30
+    timeout-minutes: 120
 
     if: github.event.pull_request.draft == false
     needs: build
@@ -58,29 +61,30 @@ jobs:
 
     steps:
       - name: "Checkout Branch"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: "Setup Java"
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
+          distribution: 'temurin'
           java-version: 17
+          cache: 'gradle'
 
       - name: Setup Gradle cache
-        uses: actions/cache@v2.1.2
+        uses: actions/cache@v3
         with:
           path: ~/.gradle
-          key: ${{ runner.os }}-gradle-${{ hashFiles('build.gradle') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle
+          key: ${{ runner.os }}-gradle-${{ hashFiles('versions.properties') }}-${{ github.sha }}
+
+      - name: "prepare libs for tests"
+        run: ./prepare.sh
 
       - name: "test backend"
-        run: ./gradlew check
-        env:
-          RUN_LONG_INTEGRATION_TESTS: false
+        run: ./gradlew --build-cache check
 
-      - name: Upload Gradle reports
-        uses: actions/upload-artifact@v2.2.4
-        if: ${{ failure() }}
+      - name: Upload test reports
+        uses: actions/upload-artifact@v3
+        if: ${{ failure() || contains(github.event.pull_request.labels.*.name, 'force reports') }}
         with:
-          name: Test Backend Reports
-          path: "**/build/reports"
+          name: Test Reports
+          path: "**/build/reports"

buildSrc/build.gradle.kts

@@ -18,13 +18,11 @@ dependencies {
     implementation("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:_")
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    implementation("com.adarshr:gradle-test-logger-plugin:_")
 }
 
 tasks.withType<KotlinCompile> {
     kotlinOptions {
-        freeCompilerArgs = listOf("-Xjsr305=strict")
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
 }
-
-

buildSrc/settings.gradle.kts

@@ -1,6 +1,6 @@
 pluginManagement {
     plugins {
-        id("de.fayard.refreshVersions") version "0.40.1"
+        id("de.fayard.refreshVersions") version "0.40.2"
     }
 }
 

buildSrc/src/main/kotlin/org.openbase.bco.gradle.kts

@@ -6,6 +6,7 @@ plugins {
     `maven-publish`
     kotlin("jvm")
     signing
+    id ("com.adarshr.test-logger")
 }
 
 repositories {
@@ -23,7 +24,7 @@ group = "org.openbase"
 val releaseVersion = !version.toString().endsWith("-SNAPSHOT")
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = sourceCompatibility
     withSourcesJar()
     withJavadocJar()
@@ -35,13 +36,16 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-script-runtime:1.5.21")
     testImplementation("org.junit.jupiter:junit-jupiter:[5.8,5.9-alpha)")
     testImplementation ("org.junit.jupiter:junit-jupiter-api:[5.8,5.9-alpha)")
+    testImplementation(Testing.mockK)
+    testImplementation("io.quarkus:quarkus-junit4-mock:_")
+    testImplementation("io.kotest:kotest-assertions-core-jvm:_")
     testRuntimeOnly ("org.junit.jupiter:junit-jupiter-engine:[5.8,5.9-alpha)")
 }
 
 tasks.withType<KotlinCompile> {
     kotlinOptions {
         freeCompilerArgs = listOf("-Xjsr305=strict")
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
 }
 
@@ -50,7 +54,7 @@ tasks.withType<Test> {
     maxParallelForks = 1
     logging.captureStandardOutput(LogLevel.WARN)
     maxHeapSize = "7G"
-    failFast = true
+    failFast = false
     setForkEvery(1)
 }
 
@@ -142,5 +146,3 @@ tasks.javadoc {
         (options as StandardJavadocDocletOptions).addBooleanOption("html5", true)
     }
 }
-
-

docker/Dockerfile

@@ -1,23 +1,23 @@
 # Install dependencies
-FROM ubuntu:latest AS builder
+FROM eclipse-temurin:17-jdk AS builder
 
 ENV \
     JAVA_OPTS="" \
     LC_ALL="en_US.UTF-8" \
     LANG="en_US.UTF-8" \
-    LANGUAGE="en_US.UTF-8" \
-    JAVA_VERSION="17"
+    LANGUAGE="en_US.UTF-8"
 
 WORKDIR /workspace
 
 # Setup build deps
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt update && \
     apt install -y \
-            openjdk-17-jdk \
             git \
+            gradle \
             rsync \
             curl \
+            ca-certificates \
             locales \
             locales-all \
             wget && \
@@ -38,9 +38,9 @@ RUN cd lib/jul && \
 RUN ./gradlew :bco.app.util:installDist -x test -x javadoc --no-daemon --stacktrace
 
 # Switch to baseline image
-FROM ubuntu:latest
+FROM eclipse-temurin:17-jre
 
-# # Install adhoc
+# # Install app
 COPY --from=builder /workspace/module/app/util/build/install/bco/bin /usr/bin/
 COPY --from=builder /workspace/module/app/util/build/install/bco/lib /usr/lib/
 # COPY --from=builder /workspace/build/share /usr/share/
@@ -75,8 +75,7 @@ ENV \
     BCO_HOME="/home/bco/data" \
     BCO_LOGS="/home/bco/data/log" \
     BCO_BINARY="/usr/bin/bco" \
-    BCO_OPTIONS="" \
-    JAVA_VERSION="11"
+    BCO_OPTIONS=""
 
 # Basic build-time metadata as defined at http://label-schema.org
 LABEL org.label-schema.build-date=$BUILD_DATE \
@@ -92,31 +91,6 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
     org.label-schema.vcs-url="https://github.com/openbase/bco.git" \
     maintainer="Divine Threepwood <divine@openbase.org>"
 
-
-# Install java
-ENV JAVA_HOME='/usr/lib/jvm/default-jvm'
-# Limit JDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
-RUN mkdir -p "${JAVA_HOME}" && \
-    zulu8_amd64_url='https://cdn.azul.com/zulu/bin/zulu8.46.0.19-ca-jdk8.0.252-linux_x64.tar.gz' && \
-    zulu8_armhf_url='https://cdn.azul.com/zulu-embedded/bin/zulu8.46.0.225-ca-jdk8.0.252-linux_aarch32hf.tar.gz' && \
-    zulu8_arm64_url='https://cdn.azul.com/zulu-embedded/bin/zulu8.46.0.225-ca-jdk8.0.252-linux_aarch64.tar.gz' && \
-    zulu11_amd64_url='https://cdn.azul.com/zulu/bin/zulu11.39.15-ca-jdk11.0.7-linux_x64.tar.gz' && \
-    zulu11_armhf_url='https://cdn.azul.com/zulu-embedded/bin/zulu11.39.61-ca-jdk11.0.7-linux_aarch32hf.tar.gz' && \
-    zulu11_arm64_url='https://cdn.azul.com/zulu-embedded/bin/zulu11.39.61-ca-jdk11.0.7-linux_aarch64.tar.gz' && \
-    url_var="zulu${JAVA_VERSION}_$(dpkg --print-architecture)_url" && \
-    eval "java_url=\$$url_var" && \
-    echo "${java_url}" && \
-    wget -nv -O /tmp/java.tar.gz "${java_url}" && \
-    tar --exclude='demo' --exclude='sample' --exclude='src.zip' -xf /tmp/java.tar.gz --strip-components=1 -C "${JAVA_HOME}" && \
-    if [ "${JAVA_VERSION}" = "8" ]; then \
-        sed -i 's/^#crypto.policy=unlimited/crypto.policy=limited/' "${JAVA_HOME}/jre/lib/security/java.security"; \
-    elif [ "${JAVA_VERSION}" = "11" ]; then \
-        sed -i 's/^crypto.policy=unlimited/crypto.policy=limited/' "${JAVA_HOME}/conf/security/java.security"; \
-    fi && \
-    rm /tmp/java.tar.gz && \
-    update-alternatives --install /usr/bin/java java "${JAVA_HOME}/bin/java" 50 && \
-    update-alternatives --install /usr/bin/javac javac "${JAVA_HOME}/bin/javac" 50
-
 # Expose volume
 VOLUME ${BCO_HOME}
 

gradle.properties

@@ -1,5 +1,5 @@
 version = 3.1-SNAPSHOT
 org.gradle.caching = true
-org.gradle.parallel = true
+org.gradle.parallel = false
 org.gradle.daemon = true
 org.gradle.jvmargs = -Xmx2000m

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-rc-3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

module/api/graphql/src/main/java/org/openbase/bco/api/graphql/schema/RegistrySchemaModule.java

@@ -40,6 +40,7 @@
 import org.openbase.bco.registry.unit.lib.filter.UnitConfigFilterImpl;
 import org.openbase.bco.registry.unit.remote.UnitRegistryRemote;
 import org.openbase.jul.exception.CouldNotPerformException;
+import org.openbase.jul.extension.protobuf.ProtoBufBuilderProcessor;
 import org.openbase.jul.extension.type.processing.LabelProcessor;
 import org.openbase.jul.pattern.Filter;
 import org.openbase.jul.pattern.ListFilter;
@@ -139,12 +140,11 @@ ImmutableList<GatewayClass> gatewayClasses() throws CouldNotPerformException, In
     @Mutation("updateUnitConfig")
     UnitConfig updateUnitConfig(@Arg("unitConfig") UnitConfig unitConfig) throws BCOGraphQLError {
         try {
-            unitConfig = Registries.getUnitRegistry(ServerError.BCO_TIMEOUT_SHORT, ServerError.BCO_TIMEOUT_TIME_UNIT)
+            final UnitConfig.Builder unitConfigBuilder = Registries.getUnitRegistry(ServerError.BCO_TIMEOUT_SHORT, ServerError.BCO_TIMEOUT_TIME_UNIT)
                     .getUnitConfigById(unitConfig.getId())
-                    .toBuilder()
-                    .mergeFrom(unitConfig)
-                    .build();
-            return Registries.getUnitRegistry(ServerError.BCO_TIMEOUT_SHORT, ServerError.BCO_TIMEOUT_TIME_UNIT).updateUnitConfig(unitConfig).get(ServerError.BCO_TIMEOUT_SHORT, ServerError.BCO_TIMEOUT_TIME_UNIT);
+                    .toBuilder();
+            ProtoBufBuilderProcessor.mergeFromWithoutRepeatedFields(unitConfigBuilder, unitConfig);
+            return Registries.getUnitRegistry(ServerError.BCO_TIMEOUT_SHORT, ServerError.BCO_TIMEOUT_TIME_UNIT).updateUnitConfig(unitConfigBuilder.build()).get(ServerError.BCO_TIMEOUT_SHORT, ServerError.BCO_TIMEOUT_TIME_UNIT);
         } catch (RuntimeException | CouldNotPerformException | InterruptedException | ExecutionException | TimeoutException ex) {
             throw new GenericError(ex);
         }

module/app/cloudconnector/src/test/java/org/openbase/bco/app/cloudconnector/mapping/unit/UnitTypeMappingTest.java

@@ -26,6 +26,7 @@
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.openbase.type.domotic.unit.UnitTemplateType.UnitTemplate.UnitType;
@@ -45,6 +46,7 @@ public class UnitTypeMappingTest {
      * @throws IllegalArgumentException if the name of a unitTypeMapping does not lead to the according unitType.
      */
     @Test
+    @Timeout(10)
     public void testUnitTypeValidity() throws IllegalArgumentException {
         LOGGER.info("testUnitTypeValidity");
         for (final UnitTypeMapping unitTypeMapping : UnitTypeMapping.values()) {

module/app/influxdbconnector/src/main/java/org/openbase/bco/app/influxdbconnector/InfluxDbconnectorApp.java

@@ -349,8 +349,13 @@ private void storeServiceState(final Unit<?> unit, final ServiceTemplateType.Ser
                     point.addTag(entry.getKey(), entry.getValue());
                 }
             }
+
             List<LabelType.Label.MapFieldEntry> entryList = unit.getConfig().getLabel().getEntryList();
             for (LabelType.Label.MapFieldEntry entry : entryList) {
+                // skip entries that offer a language key but do not provide any label.
+                if(entry.getValueList().isEmpty()) {
+                    continue;
+                }
                 point.addTag("label_" + entry.getKey(), entry.getValue(0));
             }