From 7685c996375fffa56188d29147cd646432c69cd7 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Wed, 18 Feb 2026 22:30:22 +0100 Subject: [PATCH 01/41] implement equals check tests and fix color equals check. --- .../provider/ColorStateProviderService.java | 91 ++++- .../ColorStateProviderServiceTest.java | 56 --- .../provider/ColorStateProviderServiceTest.kt | 346 ++++++++++++++++++ 3 files changed, 428 insertions(+), 65 deletions(-) delete mode 100644 module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderServiceTest.java create mode 100644 module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderServiceTest.kt diff --git a/module/dal/lib/src/main/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderService.java b/module/dal/lib/src/main/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderService.java index 792fa1832b..ee1ddb2c4c 100644 --- a/module/dal/lib/src/main/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderService.java +++ b/module/dal/lib/src/main/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderService.java @@ -169,21 +169,94 @@ static Boolean equalServiceStates(final ColorState colorStateA, final ColorState final HSBColor hsbColorA = colorStateA.getColor().getHsbColor(); final HSBColor hsbColorB = colorStateB.getColor().getHsbColor(); + // Helper: compare hues with wrap-around (0 == 360) + // margin in degrees + final double HUE_MARGIN = 1.0; + final double SATURATION_MARGIN = 0.01; + final double BRIGHTNESS_MARGIN = 0.01; - boolean hueEquals = true; - boolean saturationEquals = true; - boolean brightnessEquals = true; + // normalize angle to [0,360) + java.util.function.DoubleUnaryOperator normalize = (v) -> { + double r = v % 360.0; + if (r < 0) r += 360.0; + return r; + }; - if(hsbColorA.hasHue() && hsbColorB.hasHue()) { - hueEquals = OperationService.equals(hsbColorA.getHue(), hsbColorB.getHue(), 1.0); + java.util.function.BiPredicate hueEqualsWithWrap = (ha, hb) -> { + double aNorm = normalize.applyAsDouble(ha); + double bNorm = normalize.applyAsDouble(hb); + double diff = Math.abs(aNorm - bNorm); + if (diff > 180.0) { + diff = 360.0 - diff; // shortest distance on circle + } + return diff <= HUE_MARGIN; + }; + + boolean hueEquals; + if (hsbColorA.hasHue() && hsbColorB.hasHue()) { + hueEquals = hueEqualsWithWrap.test(hsbColorA.getHue(), hsbColorB.getHue()); + } else if (!hsbColorA.hasHue() && !hsbColorB.hasHue()) { + // both undefined -> treat as equal + hueEquals = true; + } else { + // one missing: if the present color is 'neutral' (saturation == 0 or brightness == 0 or both undefined) the hue is irrelevant + final HSBColor present = hsbColorA.hasHue() ? hsbColorA : hsbColorB; + boolean presentIsNeutral = false; + // If both saturation and brightness are missing, treat as neutral (no chroma information) + if (!present.hasSaturation() && !present.hasBrightness()) { + presentIsNeutral = true; + } + // If saturation is present and effectively 0 -> neutral + if (!presentIsNeutral && present.hasSaturation()) { + presentIsNeutral = OperationService.equals(present.getSaturation(), 0d, SATURATION_MARGIN); + } + // If not neutral yet and brightness is present and effectively 0 -> neutral + if (!presentIsNeutral && present.hasBrightness()) { + presentIsNeutral = OperationService.equals(present.getBrightness(), 0d, BRIGHTNESS_MARGIN); + } + hueEquals = presentIsNeutral; } - if(hsbColorA.hasSaturation() && hsbColorB.hasSaturation()) { - saturationEquals = OperationService.equals(hsbColorA.getSaturation(), hsbColorB.getSaturation(), 0.01); + boolean saturationEquals; + if (hsbColorA.hasSaturation() && hsbColorB.hasSaturation()) { + saturationEquals = OperationService.equals(hsbColorA.getSaturation(), hsbColorB.getSaturation(), SATURATION_MARGIN); + } else if (!hsbColorA.hasSaturation() && !hsbColorB.hasSaturation()) { + saturationEquals = true; + } else { + // one missing: consider equal if the present saturation is effectively 0 (neutral) + // or if the present has no saturation but brightness is present and 0 -> neutral + final HSBColor present = hsbColorA.hasSaturation() ? hsbColorA : hsbColorB; + boolean presentIsNeutral = false; + if (present.hasSaturation()) { + presentIsNeutral = OperationService.equals(present.getSaturation(), 0d, SATURATION_MARGIN); + } else if (present.hasBrightness()) { + presentIsNeutral = OperationService.equals(present.getBrightness(), 0d, BRIGHTNESS_MARGIN); + } else { + // no saturation and no brightness information -> treat as neutral + presentIsNeutral = true; + } + saturationEquals = presentIsNeutral; } - if(hsbColorA.hasBrightness() && hsbColorB.hasBrightness()) { - brightnessEquals = OperationService.equals(hsbColorA.getBrightness(), hsbColorB.getBrightness(), 0.01); + boolean brightnessEquals; + if (hsbColorA.hasBrightness() && hsbColorB.hasBrightness()) { + brightnessEquals = OperationService.equals(hsbColorA.getBrightness(), hsbColorB.getBrightness(), BRIGHTNESS_MARGIN); + } else if (!hsbColorA.hasBrightness() && !hsbColorB.hasBrightness()) { + brightnessEquals = true; + } else { + // one missing: consider equal if the present brightness is effectively 0 (off/neutral) + // or if the present has no brightness but saturation is present and 0 -> neutral + final HSBColor present = hsbColorA.hasBrightness() ? hsbColorA : hsbColorB; + boolean presentIsNeutral = false; + if (present.hasBrightness()) { + presentIsNeutral = OperationService.equals(present.getBrightness(), 0d, BRIGHTNESS_MARGIN); + } else if (present.hasSaturation()) { + presentIsNeutral = OperationService.equals(present.getSaturation(), 0d, SATURATION_MARGIN); + } else { + // no brightness and no saturation information -> treat as neutral + presentIsNeutral = true; + } + brightnessEquals = presentIsNeutral; } return hueEquals && saturationEquals && brightnessEquals; diff --git a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderServiceTest.java b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderServiceTest.java deleted file mode 100644 index c7a9b9d05d..0000000000 --- a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderServiceTest.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.openbase.bco.dal.lib.layer.service.provider; - -/*- - * #%L - * BCO DAL Library - * %% - * Copyright (C) 2014 - 2021 openbase.org - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * #L% - */ - -import static org.junit.jupiter.api.Assertions.*; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.Timeout; -import org.openbase.jps.core.JPService; -import org.openbase.jps.exception.JPServiceException; -import org.openbase.jul.exception.VerificationFailedException; -import org.openbase.jul.exception.printer.ExceptionPrinter; -import org.openbase.type.domotic.state.ColorStateType.ColorState; -import org.openbase.type.domotic.state.ColorStateType.ColorState.Builder; - -public class ColorStateProviderServiceTest { - - @Test - @Timeout(10) - public void verifyColorState() throws VerificationFailedException, JPServiceException { - - JPService.setupJUnitTestMode(); - - final Builder builder = ColorState.newBuilder(); - builder.getColorBuilder().getHsbColorBuilder().setHue(240); - builder.getColorBuilder().getHsbColorBuilder().setSaturation(100); - builder.getColorBuilder().getHsbColorBuilder().setBrightness(50); - - ExceptionPrinter.setBeQuit(true); - final ColorState verifiedColorState = ColorStateProviderService.verifyColorState(builder.build()); - ExceptionPrinter.setBeQuit(false); - - assertEquals(builder.getColorBuilder().getHsbColorBuilder().getHue(), verifiedColorState.getColor().getHsbColor().getHue(), 0.00001, "Hue value invalid!"); - assertEquals(1d, verifiedColorState.getColor().getHsbColor().getSaturation(), 0.00001, "Hue value invalid!"); - assertEquals(0.5d, verifiedColorState.getColor().getHsbColor().getBrightness(), 0.00001, "Hue value invalid!"); - } -} diff --git a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderServiceTest.kt b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderServiceTest.kt new file mode 100644 index 0000000000..f2a1e9a584 --- /dev/null +++ b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderServiceTest.kt @@ -0,0 +1,346 @@ +package org.openbase.bco.dal.lib.layer.service.provider + +import io.kotest.matchers.shouldBe +import org.junit.jupiter.api.Assertions +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.Timeout +import org.openbase.jps.core.JPService +import org.openbase.jps.exception.JPServiceException +import org.openbase.jul.exception.VerificationFailedException +import org.openbase.jul.exception.printer.ExceptionPrinter +import org.openbase.type.domotic.state.ColorStateType.ColorState + +/*- +* #%L +* BCO DAL Library +* %% +* Copyright (C) 2014 - 2021 openbase.org +* %% +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Lesser Public License for more details. +* +* You should have received a copy of the GNU General Lesser Public +* License along with this program. If not, see +* . +* #L% +*/ + +class ColorStateProviderServiceTest { + @Test + @Timeout(10) + @Throws(VerificationFailedException::class, JPServiceException::class) + fun verifyColorState() { + JPService.setupJUnitTestMode() + + val builder = ColorState.newBuilder() + builder.getColorBuilder().getHsbColorBuilder().setHue(240.0) + builder.getColorBuilder().getHsbColorBuilder().setSaturation(100.0) + builder.getColorBuilder().getHsbColorBuilder().setBrightness(50.0) + + ExceptionPrinter.setBeQuit(true) + val verifiedColorState = ColorStateProviderService.verifyColorState(builder.build()) + ExceptionPrinter.setBeQuit(false) + + Assertions.assertEquals( + builder.getColorBuilder().getHsbColorBuilder().getHue(), + verifiedColorState.getColor().getHsbColor().getHue(), + 0.00001, + "Hue value invalid!" + ) + Assertions.assertEquals( + 1.0, + verifiedColorState.getColor().getHsbColor().getSaturation(), + 0.00001, + "Hue value invalid!" + ) + Assertions.assertEquals( + 0.5, + verifiedColorState.getColor().getHsbColor().getBrightness(), + 0.00001, + "Hue value invalid!" + ) + } + + @Test + @Timeout(10) + @Throws(VerificationFailedException::class, JPServiceException::class) + fun `should handle color state comparison with equal state`() { + JPService.setupJUnitTestMode() + + ColorStateProviderService.equalServiceStates( + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(240.0) + setSaturation(100.0) + setBrightness(50.0) + } + }.build(), + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(240.0) + setSaturation(100.0) + setBrightness(50.0) + } + }.build(), + ) shouldBe true + + ColorStateProviderService.equalServiceStates( + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(0.0) + setSaturation(100.0) + setBrightness(50.0) + } + }.build(), + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(360.0) + setSaturation(100.0) + setBrightness(50.0) + } + }.build(), + ) shouldBe true + } + + @Test + @Timeout(10) + @Throws(VerificationFailedException::class, JPServiceException::class) + fun `should handle color state comparison with non equal state`() { + JPService.setupJUnitTestMode() + + ColorStateProviderService.equalServiceStates( + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(240.0) + setSaturation(100.0) + setBrightness(50.0) + } + }.build(), + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(240.0) + setSaturation(50.0) + setBrightness(50.0) + } + }.build(), + ) shouldBe false + + ColorStateProviderService.equalServiceStates( + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(240.0) + setSaturation(100.0) + setBrightness(50.0) + } + }.build(), + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(240.0) + setSaturation(100.0) + setBrightness(100.0) + } + }.build(), + ) shouldBe false + + ColorStateProviderService.equalServiceStates( + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(240.0) + setSaturation(100.0) + setBrightness(50.0) + } + }.build(), + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(30.0) + setSaturation(0.0) + setBrightness(50.0) + } + }.build(), + ) shouldBe false + + ColorStateProviderService.equalServiceStates( + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(240.0) + setSaturation(100.0) + setBrightness(50.0) + } + }.build(), + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(240.0) + setSaturation(50.0) + setBrightness(1.0) + } + }.build(), + ) shouldBe false + + ColorStateProviderService.equalServiceStates( + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(240.0) + setSaturation(100.0) + setBrightness(50.0) + } + }.build(), + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(10.0) + setSaturation(100.0) + setBrightness(20.0) + } + }.build(), + ) shouldBe false + + ColorStateProviderService.equalServiceStates( + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(240.0) + setSaturation(100.0) + setBrightness(50.0) + } + }.build(), + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(233.0) + setSaturation(23.0) + setBrightness(12.0) + } + }.build(), + ) shouldBe false + + } + + @Test + @Timeout(10) + @Throws(VerificationFailedException::class, JPServiceException::class) + fun `should handle color state comparison with neutral state`() { + JPService.setupJUnitTestMode() + + ColorStateProviderService.equalServiceStates( + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(240.0) + setSaturation(100.0) + setBrightness(50.0) + } + }.build(), + ColorState.newBuilder().build(), + ) shouldBe false + + ColorStateProviderService.equalServiceStates( + ColorState.newBuilder().build(), + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(240.0) + setSaturation(100.0) + setBrightness(50.0) + } + }.build(), + ) shouldBe false + + ColorStateProviderService.equalServiceStates( + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setSaturation(100.0) + setBrightness(50.0) + } + }.build(), + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(240.0) + setSaturation(100.0) + setBrightness(50.0) + } + }.build(), + ) shouldBe false + + ColorStateProviderService.equalServiceStates( + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(240.0) + setBrightness(50.0) + } + }.build(), + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(240.0) + setSaturation(100.0) + setBrightness(50.0) + } + }.build(), + ) shouldBe false + + ColorStateProviderService.equalServiceStates( + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(240.0) + setSaturation(100.0) + } + }.build(), + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(240.0) + setSaturation(100.0) + setBrightness(50.0) + } + }.build(), + ) shouldBe false + + ColorStateProviderService.equalServiceStates( + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(240.0) + setSaturation(100.0) + setBrightness(50.0) + } + }.build(), + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setSaturation(100.0) + setBrightness(50.0) + } + }.build(), + ) shouldBe false + + ColorStateProviderService.equalServiceStates( + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(240.0) + setSaturation(100.0) + setBrightness(50.0) + } + }.build(), + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(240.0) + setBrightness(50.0) + } + }.build(), + ) shouldBe false + + ColorStateProviderService.equalServiceStates( + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(240.0) + setSaturation(100.0) + setBrightness(50.0) + } + }.build(), + ColorState.newBuilder().apply { + getColorBuilder().getHsbColorBuilder().apply { + setHue(240.0) + setSaturation(100.0) + } + }.build(), + ) shouldBe false + } +} From fb0e868e71eebc068e08bbb5c1d00ca0e289efb1 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Wed, 18 Feb 2026 22:34:44 +0100 Subject: [PATCH 02/41] upgrade jul --- lib/jul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jul b/lib/jul index 9d9befebe1..624961115a 160000 --- a/lib/jul +++ b/lib/jul @@ -1 +1 @@ -Subproject commit 9d9befebe197fd170f73518483ce213bef661653 +Subproject commit 624961115af6d25863de263b70c857320d0fc7a4 From 3ad5f9f677f33844385333fc8791001bf335999c Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Wed, 18 Feb 2026 23:07:39 +0100 Subject: [PATCH 03/41] fix addon commit message contains no addon name. --- .github/workflows/update-addon-version.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-addon-version.yaml b/.github/workflows/update-addon-version.yaml index 988d4f2fb2..129d0be867 100644 --- a/.github/workflows/update-addon-version.yaml +++ b/.github/workflows/update-addon-version.yaml @@ -95,7 +95,7 @@ jobs: git config user.name "$GIT_USERNAME" git config user.email "$GIT_EMAIL" git add config.yaml - git commit -m "Update add-on $ADDONS_DIR version to $VERSION" || { + git commit -m "Update add-on $ADDON_DIR version to $VERSION" || { echo "No changes to commit" exit 0 } From 6b1726a9217b0b1425f0a6fb61fabfa0917e66e7 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Tue, 10 Mar 2026 21:54:04 +0100 Subject: [PATCH 04/41] cleanup code and address revise --- .../service/provider/ColorStateProviderService.java | 12 +++++++----- .../provider/ColorStateProviderServiceTest.kt | 6 +----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/module/dal/lib/src/main/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderService.java b/module/dal/lib/src/main/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderService.java index ee1ddb2c4c..3126cd4f78 100644 --- a/module/dal/lib/src/main/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderService.java +++ b/module/dal/lib/src/main/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderService.java @@ -22,9 +22,9 @@ * #L% */ +import org.jetbrains.annotations.NotNull; import org.openbase.bco.dal.lib.layer.service.operation.OperationService; import org.openbase.jul.annotation.RPCMethod; -import org.openbase.jul.exception.CouldNotPerformException; import org.openbase.jul.exception.CouldNotTransformException; import org.openbase.jul.exception.NotAvailableException; import org.openbase.jul.exception.VerificationFailedException; @@ -38,6 +38,9 @@ import org.openbase.type.vision.RGBColorType.RGBColor; import org.slf4j.LoggerFactory; +import java.util.function.DoubleUnaryOperator; +import java.util.function.BiPredicate; + import static org.openbase.type.domotic.service.ServiceTemplateType.ServiceTemplate.ServiceType.COLOR_STATE_SERVICE; /** @@ -164,8 +167,7 @@ static Boolean isCompatible(final ColorState colorState, final PowerState powerS } static Boolean equalServiceStates(final ColorState colorStateA, final ColorState colorStateB) { - //TODO: explain this (required because of openhab) and put margins into constants - + final HSBColor hsbColorA = colorStateA.getColor().getHsbColor(); final HSBColor hsbColorB = colorStateB.getColor().getHsbColor(); @@ -176,13 +178,13 @@ static Boolean equalServiceStates(final ColorState colorStateA, final ColorState final double BRIGHTNESS_MARGIN = 0.01; // normalize angle to [0,360) - java.util.function.DoubleUnaryOperator normalize = (v) -> { + DoubleUnaryOperator normalize = (v) -> { double r = v % 360.0; if (r < 0) r += 360.0; return r; }; - java.util.function.BiPredicate hueEqualsWithWrap = (ha, hb) -> { + BiPredicate hueEqualsWithWrap = (ha, hb) -> { double aNorm = normalize.applyAsDouble(ha); double bNorm = normalize.applyAsDouble(hb); double diff = Math.abs(aNorm - bNorm); diff --git a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderServiceTest.kt b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderServiceTest.kt index f2a1e9a584..8dd28e294b 100644 --- a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderServiceTest.kt +++ b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderServiceTest.kt @@ -35,8 +35,7 @@ import org.openbase.type.domotic.state.ColorStateType.ColorState class ColorStateProviderServiceTest { @Test @Timeout(10) - @Throws(VerificationFailedException::class, JPServiceException::class) - fun verifyColorState() { + fun `should fix color values once they are defined out of range`() { JPService.setupJUnitTestMode() val builder = ColorState.newBuilder() @@ -70,7 +69,6 @@ class ColorStateProviderServiceTest { @Test @Timeout(10) - @Throws(VerificationFailedException::class, JPServiceException::class) fun `should handle color state comparison with equal state`() { JPService.setupJUnitTestMode() @@ -111,7 +109,6 @@ class ColorStateProviderServiceTest { @Test @Timeout(10) - @Throws(VerificationFailedException::class, JPServiceException::class) fun `should handle color state comparison with non equal state`() { JPService.setupJUnitTestMode() @@ -221,7 +218,6 @@ class ColorStateProviderServiceTest { @Test @Timeout(10) - @Throws(VerificationFailedException::class, JPServiceException::class) fun `should handle color state comparison with neutral state`() { JPService.setupJUnitTestMode() From a76d46e22a299cf28b583b759f28fc80d7cb4bc5 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Tue, 10 Mar 2026 22:40:02 +0100 Subject: [PATCH 05/41] fix formatting --- .../lib/layer/service/provider/ColorStateProviderService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/dal/lib/src/main/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderService.java b/module/dal/lib/src/main/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderService.java index 3126cd4f78..bb9b9052c3 100644 --- a/module/dal/lib/src/main/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderService.java +++ b/module/dal/lib/src/main/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderService.java @@ -167,7 +167,7 @@ static Boolean isCompatible(final ColorState colorState, final PowerState powerS } static Boolean equalServiceStates(final ColorState colorStateA, final ColorState colorStateB) { - + final HSBColor hsbColorA = colorStateA.getColor().getHsbColor(); final HSBColor hsbColorB = colorStateB.getColor().getHsbColor(); From e4e71debae606793745d0f52728b259f7c0bfe6b Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Tue, 10 Mar 2026 23:06:14 +0100 Subject: [PATCH 06/41] improve test performance --- buildSrc/src/main/kotlin/org.openbase.bco.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/org.openbase.bco.gradle.kts b/buildSrc/src/main/kotlin/org.openbase.bco.gradle.kts index fd3ae12c73..00532734ea 100644 --- a/buildSrc/src/main/kotlin/org.openbase.bco.gradle.kts +++ b/buildSrc/src/main/kotlin/org.openbase.bco.gradle.kts @@ -53,7 +53,7 @@ tasks.withType { logging.captureStandardOutput(LogLevel.WARN) maxHeapSize = "7G" failFast = false - setForkEvery(1) + forkEvery = 100 } publishing { From aa7e5787ded956df7710294cafcd9d25fac53926 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Wed, 18 Mar 2026 22:11:33 +0100 Subject: [PATCH 07/41] contiune on module test failure --- .github/workflows/build-and-test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 690728d1ea..3b2446a7a9 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -122,7 +122,7 @@ jobs: run: ./prepare.sh - name: "test backend" - run: ./gradlew --build-cache check + run: ./gradlew --build-cache --continue check - name: Upload test reports uses: actions/upload-artifact@v4 @@ -130,4 +130,3 @@ jobs: with: name: Test Reports path: "**/build/reports" - From df3c09fa19d9195ec00ddbcc865fa74bab785cbf Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Wed, 18 Mar 2026 22:11:48 +0100 Subject: [PATCH 08/41] avoid on each test fork --- buildSrc/src/main/kotlin/org.openbase.bco.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/org.openbase.bco.gradle.kts b/buildSrc/src/main/kotlin/org.openbase.bco.gradle.kts index 00532734ea..028366f412 100644 --- a/buildSrc/src/main/kotlin/org.openbase.bco.gradle.kts +++ b/buildSrc/src/main/kotlin/org.openbase.bco.gradle.kts @@ -53,7 +53,6 @@ tasks.withType { logging.captureStandardOutput(LogLevel.WARN) maxHeapSize = "7G" failFast = false - forkEvery = 100 } publishing { From 34ff0b12dedf7179812eb63d671cdb50c06a7805 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Wed, 18 Mar 2026 22:12:40 +0100 Subject: [PATCH 09/41] patch jul with test container fixes --- lib/jul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jul b/lib/jul index 624961115a..743b0ca2a1 160000 --- a/lib/jul +++ b/lib/jul @@ -1 +1 @@ -Subproject commit 624961115af6d25863de263b70c857320d0fc7a4 +Subproject commit 743b0ca2a10593112a707ea30c80a12106b5cf6e From 114452df0b5c89c5405c5c4ebda3774a898b0beb Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Wed, 18 Mar 2026 22:33:01 +0100 Subject: [PATCH 10/41] upgrade jul to 3.7.3 --- lib/jul | 2 +- versions.properties | 100 +++++++++++++------------------------------- 2 files changed, 30 insertions(+), 72 deletions(-) diff --git a/lib/jul b/lib/jul index 743b0ca2a1..66adfc9142 160000 --- a/lib/jul +++ b/lib/jul @@ -1 +1 @@ -Subproject commit 743b0ca2a10593112a707ea30c80a12106b5cf6e +Subproject commit 66adfc9142ba9b3ee45e8022770c0304529f0792 diff --git a/versions.properties b/versions.properties index 5a79e9c922..d68c133a5b 100644 --- a/versions.properties +++ b/versions.properties @@ -72,9 +72,9 @@ version.com.google.guava..guava=28.0-jre ## # available=31.0.1-android ## # available=31.0.1-jre -version.org.openbase..jul.communication.mqtt.test=3.7.2 +version.org.openbase..jul.communication.mqtt.test=3.7.3 -version.org.openbase..jul.transformation=3.7.2 +version.org.openbase..jul.transformation=3.7.3 version.org.testcontainers..junit-jupiter=1.21.4 @@ -96,74 +96,32 @@ plugin.io.spring.dependency-management=1.1.2 version.kotlin=2.0.0 -version.org.openbase..jul.communication.controller=3.7.2 -## # available=3.0.0 -## # available=3.0.1 -## # available=3.0.2 - -version.org.openbase..jul.communication.mqtt=3.7.2 -## # available=3.0.0 -## # available=3.0.1 -## # available=3.0.2 - -version.org.openbase..jul.exception=3.7.2 -## # available=3.0.0 -## # available=3.0.1 -## # available=3.0.2 - -version.org.openbase..jul.extension.protobuf=3.7.2 -## # available=3.0.0 -## # available=3.0.1 -## # available=3.0.2 - -version.org.openbase..jul.extension.type.processing=3.7.2 -## # available=3.0.0 -## # available=3.0.1 -## # available=3.0.2 - -version.org.openbase..jul.extension.type.storage=3.7.2 -## # available=3.0.0 -## # available=3.0.1 -## # available=3.0.2 - -version.org.openbase..jul.extension.type.transform=3.7.2 -## # available=3.0.0 -## # available=3.0.1 -## # available=3.0.2 - -version.org.openbase..jul.extension.type.util=3.7.2 -## # available=3.0.0 -## # available=3.0.1 -## # available=3.0.2 - -version.org.openbase..jul.pattern.launch=3.7.2 -## # available=3.0.0 -## # available=3.0.1 -## # available=3.0.2 - -version.org.openbase..jul.pattern.trigger=3.7.2 -## # available=3.0.0 -## # available=3.0.1 -## # available=3.0.2 - -version.org.openbase..jul.processing=3.7.2 -## # available=3.0.0 -## # available=3.0.1 -## # available=3.0.2 - -version.org.openbase..jul.storage=3.7.2 -## # available=3.0.0 -## # available=3.0.1 -## # available=3.0.2 - -version.org.openbase..jul.visual.javafx=3.7.2 -## # available=3.0.0 -## # available=3.0.1 -## # available=3.0.2 - -version.org.openbase..jul.visual.swing=3.7.2 -## # available=3.0.0 -## # available=3.0.1 -## # available=3.0.2 +version.org.openbase..jul.communication.controller=3.7.3 + +version.org.openbase..jul.communication.mqtt=3.7.3 + +version.org.openbase..jul.exception=3.7.3 + +version.org.openbase..jul.extension.protobuf=3.7.3 + +version.org.openbase..jul.extension.type.processing=3.7.3 + +version.org.openbase..jul.extension.type.storage=3.7.3 + +version.org.openbase..jul.extension.type.transform=3.7.3 + +version.org.openbase..jul.extension.type.util=3.7.3 +\ +version.org.openbase..jul.pattern.launch=3.7.3 + +version.org.openbase..jul.pattern.trigger=3.7.3 + +version.org.openbase..jul.processing=3.7.3 + +version.org.openbase..jul.storage=3.7.3 + +version.org.openbase..jul.visual.javafx=3.7.3 + +version.org.openbase..jul.visual.swing=3.7.3 version.rxjava2.rxjava=2.2.21 From a55a8e6f37de8a09e53f2353ce81dec9fcae6131 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Wed, 18 Mar 2026 22:44:06 +0100 Subject: [PATCH 11/41] cleanup --- module/authentication/test/build.gradle.kts | 4 ---- versions.properties | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/module/authentication/test/build.gradle.kts b/module/authentication/test/build.gradle.kts index 75188b4844..eedc92c474 100644 --- a/module/authentication/test/build.gradle.kts +++ b/module/authentication/test/build.gradle.kts @@ -2,10 +2,6 @@ plugins { id("org.openbase.bco") } -configurations { - -} - dependencies { api(project(":bco.authentication.core")) api(project(":bco.authentication.lib")) diff --git a/versions.properties b/versions.properties index d68c133a5b..3a30180d11 100644 --- a/versions.properties +++ b/versions.properties @@ -111,7 +111,7 @@ version.org.openbase..jul.extension.type.storage=3.7.3 version.org.openbase..jul.extension.type.transform=3.7.3 version.org.openbase..jul.extension.type.util=3.7.3 -\ + version.org.openbase..jul.pattern.launch=3.7.3 version.org.openbase..jul.pattern.trigger=3.7.3 From 8baced0242b6c15dd95a2297932063b2b6ab6584 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Thu, 19 Mar 2026 00:27:48 +0100 Subject: [PATCH 12/41] improve auth test --- .../lib/future/AuthenticationFutureList.kt | 9 +++++++++ .../authentication/test/AuthenticationFutureListTest.kt | 1 + 2 files changed, 10 insertions(+) diff --git a/module/authentication/lib/src/main/java/org/openbase/bco/authentication/lib/future/AuthenticationFutureList.kt b/module/authentication/lib/src/main/java/org/openbase/bco/authentication/lib/future/AuthenticationFutureList.kt index b9ac4c2a55..8f9ee7db34 100644 --- a/module/authentication/lib/src/main/java/org/openbase/bco/authentication/lib/future/AuthenticationFutureList.kt +++ b/module/authentication/lib/src/main/java/org/openbase/bco/authentication/lib/future/AuthenticationFutureList.kt @@ -81,4 +81,13 @@ object AuthenticationFutureList { notificationCondition.await() } } + + fun reset() { + synchronized(authenticatedFuturesLock) { + synchronized(incomingFuturesLock) { + incomingFutures.clear() + authenticatedFutures.clear() + } + } + } } diff --git a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticationFutureListTest.kt b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticationFutureListTest.kt index b7781c6a0c..82917ab05c 100644 --- a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticationFutureListTest.kt +++ b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticationFutureListTest.kt @@ -45,6 +45,7 @@ class AuthenticationFutureListTest { @Timeout(5) @Test fun testScheduledTask() { + AuthenticationFutureList.reset() val lock = ReentrantLock() val condition: Condition = lock.newCondition() From 5c61eff42d1a37683112c8228bd5aa3dd41be90b Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Thu, 19 Mar 2026 00:28:20 +0100 Subject: [PATCH 13/41] improve message manager thread safety --- .../bco/dal/control/message/MessageManager.kt | 1 + .../bco/dal/remote/action/RemoteAction.java | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/module/dal/control/src/main/java/org/openbase/bco/dal/control/message/MessageManager.kt b/module/dal/control/src/main/java/org/openbase/bco/dal/control/message/MessageManager.kt index b0cd960f05..eed9c963f6 100644 --- a/module/dal/control/src/main/java/org/openbase/bco/dal/control/message/MessageManager.kt +++ b/module/dal/control/src/main/java/org/openbase/bco/dal/control/message/MessageManager.kt @@ -41,6 +41,7 @@ class MessageManager : Launchable, VoidInitializable { fun removeOutdatedMessages(auth: AuthToken? = null) { logger.trace("removeOutdatedMessages") Registries.getMessageRegistry().userMessages + .toList() .filterNot { message -> message.conditionList.any { condition -> Units.getUnit(condition.unitId, true).let { unit -> diff --git a/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/action/RemoteAction.java b/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/action/RemoteAction.java index 0ea35e8516..85ac8b26e7 100644 --- a/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/action/RemoteAction.java +++ b/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/action/RemoteAction.java @@ -619,7 +619,7 @@ public boolean isRunning() { try { if (getActionDescription().getIntermediary()) { - for (final RemoteAction impactedRemoteAction : impactedRemoteActions) { + for (final RemoteAction impactedRemoteAction : impactedRemoteActions.stream().toList()) { if (impactedRemoteAction.isRunning()) { return true; } @@ -650,7 +650,7 @@ public boolean isDone() { try { if (getActionDescription().getIntermediary()) { - for (final RemoteAction impactedRemoteAction : impactedRemoteActions) { + for (final RemoteAction impactedRemoteAction : impactedRemoteActions.stream().toList()) { if (!impactedRemoteAction.isDone()) { return false; } @@ -854,7 +854,7 @@ private void cleanup() { // cleanup synchronisation and observation tasks actionDescriptionObservable.reset(); - for (RemoteAction impactedRemoteAction : impactedRemoteActions) { + for (RemoteAction impactedRemoteAction : impactedRemoteActions.stream().toList()) { impactedRemoteAction.removeActionDescriptionObserver(impactActionObserver); } impactedRemoteActions.clear(); @@ -955,7 +955,7 @@ public void waitUntilDone() throws CouldNotPerformException, InterruptedExceptio try { if (getActionDescription().getIntermediary()) { - for (final RemoteAction impactedRemoteAction : impactedRemoteActions) { + for (final RemoteAction impactedRemoteAction : impactedRemoteActions.stream().toList()) { impactedRemoteAction.waitUntilDone(); } return; @@ -1006,7 +1006,7 @@ public void waitForActionState(final ActionState.State actionState, final long t try { if (actionDescription.getIntermediary()) { - for (final RemoteAction impactedRemoteAction : impactedRemoteActions) { + for (final RemoteAction impactedRemoteAction : impactedRemoteActions.stream().toList()) { impactedRemoteAction.waitForActionState(actionState, timeSplit.getTime(), timeSplit.getTimeUnit()); } return; @@ -1091,7 +1091,7 @@ public void waitForRegistration() throws CouldNotPerformException, InterruptedEx } if (getActionDescription().getIntermediary()) { - for (final RemoteAction impactedRemoteAction : impactedRemoteActions) { + for (final RemoteAction impactedRemoteAction : impactedRemoteActions.stream().toList()) { impactedRemoteAction.waitForRegistration(); } } @@ -1130,7 +1130,7 @@ public void waitForRegistration(final long timeout, final TimeUnit timeUnit) thr } if (getActionDescription().getIntermediary()) { - for (final RemoteAction impactedRemoteAction : impactedRemoteActions) { + for (final RemoteAction impactedRemoteAction : impactedRemoteActions.stream().toList()) { impactedRemoteAction.waitForRegistration(timeSplit.getTime(), timeSplit.getTimeUnit()); } } @@ -1147,7 +1147,7 @@ public boolean isRegistrationDone() { } if (actionDescription.getIntermediary()) { - for (final RemoteAction impactedRemoteAction : impactedRemoteActions) { + for (final RemoteAction impactedRemoteAction : impactedRemoteActions.stream().toList()) { if (!impactedRemoteAction.isRegistrationDone()) { return false; } From 572a1e90da987f0b6f82a55d39926cb42597b947 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Thu, 19 Mar 2026 00:32:02 +0100 Subject: [PATCH 14/41] update jule --- lib/jul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jul b/lib/jul index 66adfc9142..b5b7d12b09 160000 --- a/lib/jul +++ b/lib/jul @@ -1 +1 @@ -Subproject commit 66adfc9142ba9b3ee45e8022770c0304529f0792 +Subproject commit b5b7d12b09b3d38dec3a33a539a7b2ba75b366d0 From 9373aab72200c1d07dae61b06d5b0626964cab44 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Sun, 29 Mar 2026 14:14:24 +0200 Subject: [PATCH 15/41] always shutdown message manager after each test. --- .../src/main/java/org/openbase/app/test/agent/BCOAppTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/module/app/test/src/main/java/org/openbase/app/test/agent/BCOAppTest.java b/module/app/test/src/main/java/org/openbase/app/test/agent/BCOAppTest.java index 2fd9c73e49..7968737e70 100644 --- a/module/app/test/src/main/java/org/openbase/app/test/agent/BCOAppTest.java +++ b/module/app/test/src/main/java/org/openbase/app/test/agent/BCOAppTest.java @@ -101,6 +101,9 @@ public static void tearDownBCOApp() throws Throwable { if (deviceManagerLauncher != null) { deviceManagerLauncher.shutdown(); } + if (messageManagerLauncher != null) { + messageManagerLauncher.shutdown(); + } LOGGER.info("App tests finished!"); } catch (Throwable ex) { throw ExceptionPrinter.printHistoryAndReturnThrowable(ex, LOGGER); From fea60a20ecc40e3f68d622aaa5968ce1c989a791 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Sun, 29 Mar 2026 22:35:35 +0200 Subject: [PATCH 16/41] patch jul --- lib/jul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jul b/lib/jul index b5b7d12b09..cb61f55de3 160000 --- a/lib/jul +++ b/lib/jul @@ -1 +1 @@ -Subproject commit b5b7d12b09b3d38dec3a33a539a7b2ba75b366d0 +Subproject commit cb61f55de3d4466b8eef02cfe2707c0be3db5f9f From 220c1357f8d83b2b8efe6abaa2b4a4c118eea630 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Mon, 30 Mar 2026 12:01:13 +0200 Subject: [PATCH 17/41] improve logging in RemoteAction --- .../java/org/openbase/bco/dal/remote/action/RemoteAction.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/action/RemoteAction.java b/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/action/RemoteAction.java index 85ac8b26e7..f107fa08eb 100644 --- a/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/action/RemoteAction.java +++ b/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/action/RemoteAction.java @@ -1027,7 +1027,9 @@ public void waitForActionState(final ActionState.State actionState, final long t while (actionDescription == null || (actionDescription.getActionState().getValue() != actionState) && !checkIfStateWasPassed(actionState, timeSplit.getTimestamp(), actionDescription)) { // Waiting makes no sense if the action is done but the state is still not reached. if (actionDescription != null && isDone()) { - throw new CouldNotPerformException(targetUnit.getLabel() + " - stop waiting because state[" + actionState.name() + "] cannot be reached from state[" + actionDescription.getActionState().getValue().name() + "]"); + final State currentState = actionDescription.getActionState().getValue(); + LOGGER.warn(getTargetUnit().getLabel() + " - Action [" + this + "] reached terminal state [" + currentState.name() + "] instead of target state [" + actionState.name() + "]"); + throw new CouldNotPerformException(targetUnit.getLabel() + " - stop waiting because state[" + actionState.name() + "] cannot be reached from state[" + currentState.name() + "]"); } LOGGER.trace(getTargetUnit().getLabel() + " - wait for action [" + this + "] to be in state [" + actionState + "] "); executionSync.wait(timeSplit.getTime()); From 783a522c8dc8c2956937df43429b1ebb282344fa Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Mon, 30 Mar 2026 12:02:23 +0200 Subject: [PATCH 18/41] log action details in abstract bco test. --- .../bco/dal/test/AbstractBCOTest.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCOTest.java b/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCOTest.java index 80f9ab06b8..c379d499d2 100644 --- a/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCOTest.java +++ b/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCOTest.java @@ -32,6 +32,7 @@ import org.openbase.bco.registry.mock.MockRegistryHolder; import org.openbase.jul.communication.mqtt.test.MqttIntegrationTest; import org.openbase.jul.exception.CouldNotPerformException; +import org.openbase.jul.exception.NotAvailableException; import org.openbase.jul.exception.StackTracePrinter; import org.openbase.jul.exception.printer.ExceptionPrinter; import org.openbase.type.domotic.action.ActionDescriptionType.ActionDescription; @@ -86,6 +87,8 @@ public static void tearDownBCO() throws Throwable { @Timeout(30) public void notifyAboutTestStart() { LOGGER.info("===================================== Start BCO Test ====================================="); + LOGGER.debug("Test class: " + getClass().getSimpleName()); + LOGGER.debug("Active test actions before test execution: " + testActions.size()); } /** @@ -97,6 +100,7 @@ public void notifyAboutTestStart() { public void autoCancelActionsAfterTestRun() { LOGGER.info("===================================== Finish BCO Test ====================================="); + LOGGER.debug("Active test actions after test execution: " + testActions.size()); // before canceling pending actions lets just validate that the test did not cause any deadlocks assertFalse(StackTracePrinter.detectDeadLocksAndPrintStackTraces(LOGGER), "Deadlocks found!"); @@ -374,9 +378,14 @@ public RemoteAction observe(final RemoteAction remoteAction) { // register current action. testActions.add(remoteAction); + LOGGER.debug("Registered test action. Total active actions: " + testActions.size()); // cleanup finished actions + final int beforeCleanup = testActions.size(); testActions.removeIf(RemoteAction::isDone); + if (beforeCleanup > testActions.size()) { + LOGGER.debug("Cleaned up " + (beforeCleanup - testActions.size()) + " finished test action(s). Remaining: " + testActions.size()); + } return remoteAction; } @@ -392,6 +401,30 @@ public void cancelAllTestActions() throws CouldNotPerformException, InterruptedE if (testActions.size() > 0) { LOGGER.info("Cancel " + testActions.size() + " ongoing test action" + (testActions.size() == 1 ? "" : "s") + " ..."); + + // Log action states for debugging + int canceledCount = 0; + int rejectedCount = 0; + int finishedCount = 0; + for (RemoteAction action : testActions) { + final State state = action.getActionState(); + switch (state) { + case CANCELED: + canceledCount++; + break; + case REJECTED: + rejectedCount++; + break; + case FINISHED: + finishedCount++; + break; + default: + LOGGER.debug("Action in state: " + state); + } + } + if (canceledCount > 0 || rejectedCount > 0 || finishedCount > 0) { + LOGGER.debug("Action state summary - Canceled: " + canceledCount + ", Rejected: " + rejectedCount + ", Finished: " + finishedCount); + } } final List> cancelTasks = new ArrayList<>(); From 5a83be786bbf3a224fe94772f4aac550d3ff1a2a Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Mon, 30 Mar 2026 12:18:27 +0200 Subject: [PATCH 19/41] update jul --- lib/jul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jul b/lib/jul index cb61f55de3..5331478366 160000 --- a/lib/jul +++ b/lib/jul @@ -1 +1 @@ -Subproject commit cb61f55de3d4466b8eef02cfe2707c0be3db5f9f +Subproject commit 5331478366a4809a4e3c09522db03f29d756c06f From e64a143515aa0a17a950c7949ca806569a122000 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Mon, 30 Mar 2026 12:18:55 +0200 Subject: [PATCH 20/41] improve scene test error logging. --- .../layer/unit/scene/SceneRemoteTest.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java index 1de16c1664..838c2acb46 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java @@ -27,6 +27,7 @@ import org.openbase.bco.dal.control.layer.unit.device.DeviceManagerLauncher; import org.openbase.bco.dal.control.layer.unit.location.LocationManagerLauncher; import org.openbase.bco.dal.control.layer.unit.scene.SceneManagerLauncher; +import org.openbase.bco.dal.lib.action.Action; import org.openbase.bco.dal.lib.layer.service.ServiceJSonProcessor; import org.openbase.bco.dal.lib.layer.service.Services; import org.openbase.bco.dal.lib.layer.service.provider.ColorStateProviderService; @@ -56,6 +57,7 @@ import org.openbase.jul.exception.printer.ExceptionPrinter; import org.openbase.jul.extension.type.processing.LabelProcessor; import org.openbase.jul.extension.type.processing.MultiLanguageTextProcessor; +import org.slf4j.LoggerFactory; import org.openbase.type.domotic.action.ActionDescriptionType; import org.openbase.type.domotic.action.ActionDescriptionType.ActionDescription; import org.openbase.type.domotic.action.ActionParameterType.ActionParameter; @@ -453,7 +455,22 @@ public void testTriggerUnitGroupByScene() throws Exception { for (String memberId : unitGroupRemote.getConfig().getUnitGroupConfig().getMemberIdList()) { colorableLightRemotes.add(Units.getUnit(memberId, true, ColorableLightRemote.class)); } - waitForExecution(sceneRemote.setActivationState(State.ACTIVE)); + + var actionFuture = sceneRemote.setActivationState(State.ACTIVE); + + // Try to activate scene with error handling for canceled actions + try { + waitForExecution(actionFuture); + } catch (CouldNotPerformException ex) { + var action = actionFuture.get(); + + // Log action state if available to help with diagnostics + final ActionDescription currentAction = sceneRemote.getActionList().getFirst(); + LoggerFactory.getLogger(SceneRemoteTest.class).error( + "Scene activation was " + action.getActionState().getValue().name() + " (likely due to higher priority actions): " + + currentAction.getDescription(), ex); + throw ex; + } for (ColorableLightRemote colorableLightRemote : colorableLightRemotes) { assertEquals(GROUP_COLOR_VALUE, colorableLightRemote.getColorState().getColor().getHsbColor(), "ColorState has not been set for light[" + colorableLightRemote.getLabel() + "]"); From 841cb87d6d66a5d9a9f83acb10cb150480ec8356 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Tue, 7 Apr 2026 00:28:27 +0200 Subject: [PATCH 21/41] update jul --- lib/jul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jul b/lib/jul index 5331478366..fae838b7a8 160000 --- a/lib/jul +++ b/lib/jul @@ -1 +1 @@ -Subproject commit 5331478366a4809a4e3c09522db03f29d756c06f +Subproject commit fae838b7a818d5d4461b47e83c268b270c79b2a2 From 02ced832e267da1965118f06483b9899d49978e4 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Thu, 9 Apr 2026 22:19:04 +0200 Subject: [PATCH 22/41] upgrade jul to lastest --- lib/jul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jul b/lib/jul index fae838b7a8..9636399ba0 160000 --- a/lib/jul +++ b/lib/jul @@ -1 +1 @@ -Subproject commit fae838b7a818d5d4461b47e83c268b270c79b2a2 +Subproject commit 9636399ba0a789c9155e9cac6b62123b24702098 From c2599613c66e25d504ba7ae418d107c528aa97e9 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Thu, 9 Apr 2026 22:48:46 +0200 Subject: [PATCH 23/41] upgrade jul in gradle to latest version --- .../layer/service/AbstractServiceRemote.java | 10 +++++-- .../layer/unit/scene/SceneRemoteTest.java | 4 +-- versions.properties | 28 +++++++++---------- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/layer/service/AbstractServiceRemote.java b/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/layer/service/AbstractServiceRemote.java index e43815ed42..1c453620e2 100644 --- a/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/layer/service/AbstractServiceRemote.java +++ b/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/layer/service/AbstractServiceRemote.java @@ -75,6 +75,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.ReentrantLock; import static org.openbase.bco.dal.lib.layer.service.ServiceStateProcessor.*; @@ -107,7 +108,7 @@ public abstract class AbstractServiceRemote, ST> serviceStateObservable = new ObservableImpl<>(); private final ObservableImpl, ST> serviceStateProviderObservable = new ObservableImpl<>(); - private final SyncObject syncObject = new SyncObject("ServiceStateComputationLock"); + private final ReentrantLock lock = new ReentrantLock(); private final SyncObject maintainerLock = new SyncObject("MaintainerLock"); private final SyncObject connectionStateLock = new SyncObject("ConnectionStateLock"); protected Object maintainer; @@ -181,8 +182,11 @@ public AbstractServiceRemote(final ServiceType serviceType, final Class serv */ private void updateServiceState() throws CouldNotPerformException { final ST serviceState; - synchronized (syncObject) { + lock.lock(); + try { serviceState = computeServiceState(); + } finally { + lock.unlock(); } serviceStateObservable.notifyObservers(serviceState); serviceStateProviderObservable.notifyObservers(serviceState); @@ -197,7 +201,7 @@ private void updateServiceState() throws CouldNotPerformException { */ @Override public ST getData() throws NotAvailableException { -// synchronized (syncObject) { +// synchronized (syncObject) { ??? if (!serviceStateObservable.isValueAvailable()) { throw new NotAvailableException("Data"); } diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java index 838c2acb46..06505bccb5 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java @@ -419,7 +419,7 @@ public void testTriggerScenePerRemote() throws Exception { * @throws Exception */ @Test - @Timeout(10) + //@Timeout(10) public void testTriggerSceneWithLocationActionPerRemote() throws Exception { System.out.println("testTriggerSceneWithLocationActionPerRemote"); @@ -444,7 +444,7 @@ public void testTriggerSceneWithLocationActionPerRemote() throws Exception { * @throws Exception */ @Test - @Timeout(10) + //@Timeout(10) public void testTriggerUnitGroupByScene() throws Exception { System.out.println("testTriggerUnitGroupByScene"); diff --git a/versions.properties b/versions.properties index 8ee47093b1..6ce233f561 100644 --- a/versions.properties +++ b/versions.properties @@ -98,32 +98,32 @@ version.org.springframework.boot..spring-boot-starter-actuator=3.1.2 version.kotlin=2.0.0 -version.org.openbase..jul.communication.controller=3.7.3 +version.org.openbase..jul.communication.controller=3.7.4 -version.org.openbase..jul.communication.mqtt=3.7.3 +version.org.openbase..jul.communication.mqtt=3.7.4 -version.org.openbase..jul.exception=3.7.3 +version.org.openbase..jul.exception=3.7.4 -version.org.openbase..jul.extension.protobuf=3.7.3 +version.org.openbase..jul.extension.protobuf=3.7.4 -version.org.openbase..jul.extension.type.processing=3.7.3 +version.org.openbase..jul.extension.type.processing=3.7.4 -version.org.openbase..jul.extension.type.storage=3.7.3 +version.org.openbase..jul.extension.type.storage=3.7.4 -version.org.openbase..jul.extension.type.transform=3.7.3 +version.org.openbase..jul.extension.type.transform=3.7.4 -version.org.openbase..jul.extension.type.util=3.7.3 +version.org.openbase..jul.extension.type.util=3.7.4 -version.org.openbase..jul.pattern.launch=3.7.3 +version.org.openbase..jul.pattern.launch=3.7.4 -version.org.openbase..jul.pattern.trigger=3.7.3 +version.org.openbase..jul.pattern.trigger=3.7.4 -version.org.openbase..jul.processing=3.7.3 +version.org.openbase..jul.processing=3.7.4 -version.org.openbase..jul.storage=3.7.3 +version.org.openbase..jul.storage=3.7.4 -version.org.openbase..jul.visual.javafx=3.7.3 +version.org.openbase..jul.visual.javafx=3.7.4 -version.org.openbase..jul.visual.swing=3.7.3 +version.org.openbase..jul.visual.swing=3.7.4 version.rxjava2.rxjava=2.2.21 From 0581c651db7adf988975034328b732e9cbd46874 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Thu, 9 Apr 2026 22:51:08 +0200 Subject: [PATCH 24/41] upgrade jul in gradle to latest version --- versions.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions.properties b/versions.properties index 6ce233f561..8a1d411984 100644 --- a/versions.properties +++ b/versions.properties @@ -72,9 +72,9 @@ version.com.google.guava..guava=28.0-jre ## # available=31.0.1-android ## # available=31.0.1-jre -version.org.openbase..jul.communication.mqtt.test=3.7.3 +version.org.openbase..jul.communication.mqtt.test=3.7.4 -version.org.openbase..jul.transformation=3.7.3 +version.org.openbase..jul.transformation=3.7.4 version.org.testcontainers..junit-jupiter=1.21.4 From 7d9c02cdc5dbe7cdd407830807ad8e751b433db6 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Thu, 9 Apr 2026 23:38:24 +0200 Subject: [PATCH 25/41] temporary disable all timeouts --- .../bco/dal/test/AbstractBCOTest.java | 4 ++-- .../bco/dal/test/action/RemoteActionTest.kt | 2 +- .../AbstractBCOLocationManagerTest.java | 6 +++--- .../layer/unit/location/LocationCrudTest.kt | 4 ++-- .../unit/location/LocationRemoteTest.java | 20 +++++++++---------- .../layer/unit/scene/SceneRemoteTest.java | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCOTest.java b/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCOTest.java index c379d499d2..fd633d561d 100644 --- a/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCOTest.java +++ b/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCOTest.java @@ -61,7 +61,7 @@ public abstract class AbstractBCOTest extends MqttIntegrationTest { private final List testActions = Collections.synchronizedList(new ArrayList<>()); @BeforeAll - @Timeout(30) +// @Timeout(30) public static void setupBCO() throws Throwable { try { mockRegistry = MockRegistryHolder.newMockRegistry(); @@ -72,7 +72,7 @@ public static void setupBCO() throws Throwable { } @AfterAll - @Timeout(30) +// @Timeout(30) public static void tearDownBCO() throws Throwable { try { Units.reset(AbstractBCOTest.class); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/RemoteActionTest.kt b/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/RemoteActionTest.kt index c5383f0d5b..c29dc06f55 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/RemoteActionTest.kt +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/RemoteActionTest.kt @@ -164,7 +164,7 @@ class RemoteActionTest : AbstractBCOLocationManagerTest() { } @Test - @Timeout(15) +// @Timeout(15) @Throws(Exception::class) fun testExtensionCancellation() { println("testExtensionCancellation") diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/location/AbstractBCOLocationManagerTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/location/AbstractBCOLocationManagerTest.java index 53fe30e2f1..62df355729 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/location/AbstractBCOLocationManagerTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/location/AbstractBCOLocationManagerTest.java @@ -47,7 +47,7 @@ public class AbstractBCOLocationManagerTest extends AbstractBCOTest { protected static UserManagerLauncher userManagerLauncher; @BeforeAll - @Timeout(30) +// @Timeout(30) public static void setupLocationManager() throws Throwable { try { deviceManagerLauncher = new DeviceManagerLauncher(); @@ -64,7 +64,7 @@ public static void setupLocationManager() throws Throwable { } @AfterAll - @Timeout(30) +// @Timeout(30) public static void tearDownLocationManager() throws Throwable { try { if (userManagerLauncher != null) { @@ -87,7 +87,7 @@ public static void tearDownLocationManager() throws Throwable { * @throws InterruptedException is thrown if the thread was externally interrupted */ @AfterEach - @Timeout(30) +// @Timeout(30) public void cancelAllOngoingActions() throws InterruptedException { log.info("Cancel all ongoing actions..."); try { diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/location/LocationCrudTest.kt b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/location/LocationCrudTest.kt index 85d97f96d0..9d74528436 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/location/LocationCrudTest.kt +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/location/LocationCrudTest.kt @@ -20,7 +20,7 @@ import java.util.concurrent.TimeUnit class LocationCrudTest : AbstractBCOLocationManagerTest() { @Test - @Timeout(10) +// @Timeout(10) @Throws(Exception::class) fun createTileTest() { println("createTileTest") @@ -39,7 +39,7 @@ class LocationCrudTest : AbstractBCOLocationManagerTest() { } @Test - @Timeout(10) +// @Timeout(10) @Throws(Exception::class) fun createZoneTest() { println("createZoneTest") diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/location/LocationRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/location/LocationRemoteTest.java index 2ccda3cfde..ca5140cad5 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/location/LocationRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/location/LocationRemoteTest.java @@ -98,7 +98,7 @@ public class LocationRemoteTest extends AbstractBCOLocationManagerTest { * @throws Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testLocationToUnitPipeline() throws Exception { System.out.println("testLocationToUnitPipeline"); @@ -150,7 +150,7 @@ private boolean unitHasService(UnitConfig unitConfig, ServiceType serviceType, S * @throws Exception */ @Test - @Timeout(15) +// @Timeout(15) public void testUnitToLocationPipeline() throws Exception { System.out.println("testUnitToLocationPipeline"); @@ -215,7 +215,7 @@ public void testUnitToLocationPipeline() throws Exception { } @Test - @Timeout(15) +// @Timeout(15) public void testRecordAndRestoreSnapshots() throws Exception { final LocationRemote rootLocationRemote = @@ -288,7 +288,7 @@ public void testRecordAndRestoreSnapshots() throws Exception { } @Test - @Timeout(5) +// @Timeout(5) public void testManipulatingByUnitType() throws Exception { System.out.println("testManipulatingByUnitType"); @@ -351,7 +351,7 @@ public void testManipulatingByUnitType() throws Exception { } @Test - @Timeout(15) +// @Timeout(15) public void testPresenceState() throws Exception { System.out.println("testPresenceState"); @@ -392,7 +392,7 @@ public void testPresenceState() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testColorableLightControlViaLocation() throws Exception { System.out.println("testColorableLightControlViaLocation"); @@ -471,7 +471,7 @@ public void testColorableLightControlViaLocation() throws Exception { } @Test - @Timeout(15) +// @Timeout(15) public void testIlluminanceState() throws Exception { System.out.println("testIlluminanceState"); @@ -525,7 +525,7 @@ public void testIlluminanceState() throws Exception { * @throws Exception if something fails. */ @Test - @Timeout(15) +// @Timeout(15) public void testApplyActionAuthenticated() throws Exception { System.out.println("testApplyActionAuthenticated"); @@ -556,7 +556,7 @@ public void testApplyActionAuthenticated() throws Exception { } @Test - @Timeout(20) +// @Timeout(20) public void testActionCancellation() throws Exception { System.out.println("testActionCancellation"); @@ -612,7 +612,7 @@ public void testActionCancellation() throws Exception { } @Test - @Timeout(5) +// @Timeout(5) public void testLocationModificationViaApplyAction() throws Exception { final UnitRemote unit = Units.getUnit(Registries.getUnitRegistry().getRootLocationConfig().getId(), true); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java index 06505bccb5..fd09d21e11 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java @@ -560,7 +560,7 @@ public void testTriggerSceneWithAllDevicesOfLocationActionPerRemoteAndVerifiesUn * @throws Exception */ @Test - @Timeout(60) +// @Timeout(60) public void testTriggerSceneWithLocationActionPerRemoteAndVerifiesUnitModification() throws Exception { System.out.println("testTriggerSceneWithLocationActionPerRemoteAndVerifiesUnitModification"); From f286ac3bbeb78e6bdd6ae9f60f56e54dd8f8fb39 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Thu, 9 Apr 2026 23:47:29 +0200 Subject: [PATCH 26/41] further disable timeouts --- .../ServiceStateTraitMapperFactoryTest.java | 6 ++-- .../mapping/unit/UnitTypeMappingTest.java | 2 +- .../agent/AbsenceEnergySavingAgentTest.java | 2 +- .../app/preset/agent/FireAlarmAgentTest.java | 2 +- .../agent/HeaterEnergySavingAgentTest.java | 2 +- .../IlluminationLightSavingAgentTest.java | 2 +- .../PowerStateSynchroniserAgentTest.java | 2 +- .../preset/agent/PresenceLightAgentTest.java | 2 +- .../agent/AbstractBCOAgentManagerTest.java | 4 +-- .../test/agent/AbstractBCOAppManagerTest.kt | 4 +-- .../openbase/app/test/agent/BCOAppTest.java | 6 ++-- .../bco/app/util/AbstractBCOManagerTest.java | 6 ++-- .../bco/app/util/UnitTransformationTest.java | 2 +- .../SynchronizationProcessorTest.java | 2 +- .../test/AuthenticatedCommunicationTest.java | 4 +-- .../test/AuthenticationFutureListTest.kt | 6 ++-- .../test/AuthenticationTest.java | 4 +-- .../test/AuthenticatorControllerTest.java | 14 ++++---- .../test/AuthorizationHelperTest.java | 12 +++---- .../test/CredentialStoreTest.java | 4 +-- .../test/EncryptionHelperTest.java | 12 +++---- .../test/InitialRegistrationTest.java | 2 +- .../test/ServiceServerManagerTest.java | 2 +- .../test/SessionManagerTest.java | 34 +++++++++---------- .../authentication/test/StayLoggedInTest.kt | 2 +- .../dal/lib/action/ActionComparatorTest.java | 2 +- .../action/ActionDescriptionProcessorTest.kt | 2 +- .../service/ServiceJSonProcessorTest.java | 6 ++-- .../service/ServiceStateProcessorTest.java | 2 +- .../dal/lib/layer/service/ServicesTest.java | 2 +- .../operation/OperationServiceTest.java | 6 ++-- .../provider/ColorStateProviderServiceTest.kt | 8 ++--- .../layer/service/provider/ServicesTest.kt | 2 +- .../test/AbstractBCODeviceManagerTest.java | 6 ++-- .../bco/dal/test/AbstractBCOTest.java | 8 ++--- .../remote/layer/unit/CustomUnitPoolTest.kt | 2 +- .../bco/dal/test/action/ActionChainTest.kt | 4 +-- .../bco/dal/test/action/RemoteActionTest.kt | 6 ++-- .../dal/test/layer/service/ServiceTest.java | 6 ++-- .../unit/AbstractUnitControllerTest.java | 18 +++++----- .../test/layer/unit/BatteryRemoteTest.java | 4 +-- .../dal/test/layer/unit/ButtonRemoteTest.java | 6 ++-- .../layer/unit/ColorableLightRemoteTest.java | 22 ++++++------ ...ableLightRemoteWithAuthenticationTest.java | 16 ++++----- .../layer/unit/DimmableLightRemoteTest.java | 10 +++--- .../dal/test/layer/unit/HandleRemoteTest.java | 4 +-- .../dal/test/layer/unit/LightRemoteTest.java | 6 ++-- .../layer/unit/LightSensorRemoteTest.java | 4 +-- .../layer/unit/MotionDetectorRemoteTest.java | 6 ++-- .../PowerConsumptionSensorRemoteTest.java | 4 +-- .../layer/unit/PowerSwitchRemoteTest.java | 10 +++--- .../layer/unit/ReedContactRemoteTest.java | 4 +-- .../layer/unit/RollerShutterRemoteTest.java | 6 ++-- .../layer/unit/SmokeDetectorRemoteTest.java | 6 ++-- .../layer/unit/TamperDetectorRemoteTest.java | 6 ++-- .../unit/TemperatureControllerRemoteTest.java | 8 ++--- .../unit/TemperatureSensorRemoteTest.java | 6 ++-- .../test/layer/unit/UnitAllocationTest.java | 18 +++++----- .../unit/connection/ConnectionRemoteTest.kt | 2 +- .../unit/device/DalRegisterDeviceTest.java | 4 +-- .../device/DeviceManagerLauncherTest.java | 2 +- .../layer/unit/scene/SceneRemoteTest.java | 18 +++++----- .../unit/unitgroup/UnitGroupRemoteTest.java | 10 +++--- .../unit/user/AbstractBCOUserManagerTest.java | 4 +-- .../test/layer/unit/user/UserRemoteTest.java | 12 +++---- .../unit/test/AbstractBCORegistryTest.java | 4 +-- .../unit/test/DeviceRegistryTest.java | 18 +++++----- .../unit/test/LocationRegistryTest.java | 14 ++++---- .../unit/test/LocationRemovalTest.java | 2 +- .../unit/test/RegistryFilteringTest.java | 8 ++--- .../registry/unit/test/RegistrySyncTest.java | 4 +-- .../unit/test/TestBoundToDeviceFlag.java | 10 +++--- .../unit/test/TestWaitUntilReady.java | 6 ++-- .../unit/test/UnitGroupRegistryTest.kt | 4 +-- .../bco/registry/mock/MockRegistryTest.java | 4 +-- .../bco/registry/mock/RemoteTest.java | 6 ++-- 76 files changed, 249 insertions(+), 249 deletions(-) diff --git a/module/app/cloudconnector/src/test/java/org/openbase/bco/app/cloudconnector/mapping/service/ServiceStateTraitMapperFactoryTest.java b/module/app/cloudconnector/src/test/java/org/openbase/bco/app/cloudconnector/mapping/service/ServiceStateTraitMapperFactoryTest.java index 94db0dc3b0..415e9eadec 100644 --- a/module/app/cloudconnector/src/test/java/org/openbase/bco/app/cloudconnector/mapping/service/ServiceStateTraitMapperFactoryTest.java +++ b/module/app/cloudconnector/src/test/java/org/openbase/bco/app/cloudconnector/mapping/service/ServiceStateTraitMapperFactoryTest.java @@ -50,7 +50,7 @@ public class ServiceStateTraitMapperFactoryTest extends MqttIntegrationTest { private static final Logger LOGGER = LoggerFactory.getLogger(ServiceStateTraitMapperFactoryTest.class); @BeforeEach - @Timeout(30) +// @Timeout(30) public void setupTest() throws Exception { MockRegistryHolder.newMockRegistry(); @@ -58,7 +58,7 @@ public void setupTest() throws Exception { } @AfterEach - @Timeout(30) +// @Timeout(30) public void tearDownTest() { MockRegistryHolder.shutdownMockRegistry(); } @@ -67,7 +67,7 @@ public void tearDownTest() { * Test if for all defined combinations of services and traits a mapper is available. */ @Test - @Timeout(value = 30) +// @Timeout(value = 30) public void testMapperAvailability() { LOGGER.info("testMapperAvailability"); diff --git a/module/app/cloudconnector/src/test/java/org/openbase/bco/app/cloudconnector/mapping/unit/UnitTypeMappingTest.java b/module/app/cloudconnector/src/test/java/org/openbase/bco/app/cloudconnector/mapping/unit/UnitTypeMappingTest.java index 74c9a181d6..f19c21f074 100644 --- a/module/app/cloudconnector/src/test/java/org/openbase/bco/app/cloudconnector/mapping/unit/UnitTypeMappingTest.java +++ b/module/app/cloudconnector/src/test/java/org/openbase/bco/app/cloudconnector/mapping/unit/UnitTypeMappingTest.java @@ -46,7 +46,7 @@ public class UnitTypeMappingTest { * @throws IllegalArgumentException if the name of a unitTypeMapping does not lead to the according unitType. */ @Test - @Timeout(10) +// @Timeout(10) public void testUnitTypeValidity() throws IllegalArgumentException { LOGGER.info("testUnitTypeValidity"); for (final UnitTypeMapping unitTypeMapping : UnitTypeMapping.values()) { diff --git a/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/AbsenceEnergySavingAgentTest.java b/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/AbsenceEnergySavingAgentTest.java index 7fdea2bde2..d6b45a85f0 100644 --- a/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/AbsenceEnergySavingAgentTest.java +++ b/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/AbsenceEnergySavingAgentTest.java @@ -74,7 +74,7 @@ public class AbsenceEnergySavingAgentTest extends AbstractBCOAgentManagerTest { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testAbsenceEnergySavingAgent() throws Exception { System.out.println("testAbsenceEnergySavingAgent"); diff --git a/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/FireAlarmAgentTest.java b/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/FireAlarmAgentTest.java index 2ff0267ecd..e8409a6635 100644 --- a/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/FireAlarmAgentTest.java +++ b/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/FireAlarmAgentTest.java @@ -64,7 +64,7 @@ public class FireAlarmAgentTest extends AbstractBCOAgentManagerTest { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testFireAlarmAgent() throws Exception { System.out.println("testFireAlarmAgent"); diff --git a/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/HeaterEnergySavingAgentTest.java b/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/HeaterEnergySavingAgentTest.java index 63552b9ac9..d89d53cf5b 100644 --- a/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/HeaterEnergySavingAgentTest.java +++ b/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/HeaterEnergySavingAgentTest.java @@ -69,7 +69,7 @@ public class HeaterEnergySavingAgentTest extends AbstractBCOAgentManagerTest { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testHeaterEnergySavingAgent() throws Exception { System.out.println("testHeaterEnergySavingAgent"); diff --git a/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/IlluminationLightSavingAgentTest.java b/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/IlluminationLightSavingAgentTest.java index 36a0ddbaac..54fc389993 100644 --- a/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/IlluminationLightSavingAgentTest.java +++ b/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/IlluminationLightSavingAgentTest.java @@ -70,7 +70,7 @@ public class IlluminationLightSavingAgentTest extends AbstractBCOAgentManagerTes * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testIlluminationLightSavingAgent() throws Exception { System.out.println("testIlluminationLightSavingAgent"); diff --git a/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/PowerStateSynchroniserAgentTest.java b/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/PowerStateSynchroniserAgentTest.java index 6230420a8e..dbd3d679a9 100644 --- a/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/PowerStateSynchroniserAgentTest.java +++ b/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/PowerStateSynchroniserAgentTest.java @@ -74,7 +74,7 @@ public class PowerStateSynchroniserAgentTest extends AbstractBCOAgentManagerTest * @throws java.lang.Exception */ @Test - @Timeout(15) +// @Timeout(15) public void testPowerStateSyncAgent() throws Exception { System.out.println("testPowerStateSyncAgent"); diff --git a/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/PresenceLightAgentTest.java b/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/PresenceLightAgentTest.java index cb88183305..d2401d9a80 100644 --- a/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/PresenceLightAgentTest.java +++ b/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/PresenceLightAgentTest.java @@ -134,7 +134,7 @@ public void prepareEnvironment() throws CouldNotPerformException, InterruptedExc * @throws java.lang.Exception */ @Test - @Timeout(30) +// @Timeout(30) public void testPresenceLightAgent() throws Exception { // test if on motion the lights are turned on diff --git a/module/app/test/src/main/java/org/openbase/app/test/agent/AbstractBCOAgentManagerTest.java b/module/app/test/src/main/java/org/openbase/app/test/agent/AbstractBCOAgentManagerTest.java index 082a756eea..2363968f2a 100644 --- a/module/app/test/src/main/java/org/openbase/app/test/agent/AbstractBCOAgentManagerTest.java +++ b/module/app/test/src/main/java/org/openbase/app/test/agent/AbstractBCOAgentManagerTest.java @@ -50,7 +50,7 @@ public abstract class AbstractBCOAgentManagerTest extends BCOAppTest { protected AgentRemote agentRemote = null; @BeforeEach - @Timeout(30) +// @Timeout(30) public void createAgent() throws Exception { prepareEnvironment(); try { @@ -72,7 +72,7 @@ public void createAgent() throws Exception { } @AfterEach - @Timeout(30) +// @Timeout(30) public void removeAgent() throws Exception { Registries.getUnitRegistry().removeUnitConfig(agentConfig); agentRemote.waitForConnectionState(ConnectionState.State.DISCONNECTED); diff --git a/module/app/test/src/main/java/org/openbase/app/test/agent/AbstractBCOAppManagerTest.kt b/module/app/test/src/main/java/org/openbase/app/test/agent/AbstractBCOAppManagerTest.kt index f7a057767e..e4cabe4f49 100644 --- a/module/app/test/src/main/java/org/openbase/app/test/agent/AbstractBCOAppManagerTest.kt +++ b/module/app/test/src/main/java/org/openbase/app/test/agent/AbstractBCOAppManagerTest.kt @@ -51,7 +51,7 @@ abstract class AbstractBCOAppManagerTest : B protected var appController: APP_CLASS? = null @BeforeEach - @Timeout(30) +// @Timeout(30) @Throws(Exception::class) fun prepareAppManager() { try { @@ -111,7 +111,7 @@ abstract class AbstractBCOAppManagerTest : B } @AfterEach - @Timeout(30) +// @Timeout(30) @Throws(Exception::class) fun removeAgent() { if (appConfig != null) { diff --git a/module/app/test/src/main/java/org/openbase/app/test/agent/BCOAppTest.java b/module/app/test/src/main/java/org/openbase/app/test/agent/BCOAppTest.java index 7968737e70..7cc4a5f080 100644 --- a/module/app/test/src/main/java/org/openbase/app/test/agent/BCOAppTest.java +++ b/module/app/test/src/main/java/org/openbase/app/test/agent/BCOAppTest.java @@ -50,7 +50,7 @@ public class BCOAppTest extends AbstractBCOTest { protected static MessageManagerLauncher messageManagerLauncher; @BeforeAll - @Timeout(30) +// @Timeout(30) public static void setupBcoApp() throws Throwable { try { LOGGER.trace("Start device manager..."); @@ -85,7 +85,7 @@ public static void setupBcoApp() throws Throwable { } @AfterAll - @Timeout(30) +// @Timeout(30) public static void tearDownBCOApp() throws Throwable { LOGGER.info("Tear down app tests..."); try { @@ -116,7 +116,7 @@ public static void tearDownBCOApp() throws Throwable { * @throws InterruptedException is thrown if the thread was externally interrupted */ @AfterEach - @Timeout(30) +// @Timeout(30) public void cancelAllOngoingActions() throws InterruptedException { LOGGER.info("Cancel all ongoing actions..."); try { diff --git a/module/app/util/src/test/java/org/openbase/bco/app/util/AbstractBCOManagerTest.java b/module/app/util/src/test/java/org/openbase/bco/app/util/AbstractBCOManagerTest.java index ad5b81616f..b2d243efa6 100644 --- a/module/app/util/src/test/java/org/openbase/bco/app/util/AbstractBCOManagerTest.java +++ b/module/app/util/src/test/java/org/openbase/bco/app/util/AbstractBCOManagerTest.java @@ -54,7 +54,7 @@ public class AbstractBCOManagerTest extends AbstractBCOTest { protected static UserManagerLauncher userManagerLauncher; @BeforeAll - @Timeout(30) +// @Timeout(30) public static void setupBCOManager() throws Throwable { try { agentManagerLauncher = new AgentManagerLauncher(); @@ -75,7 +75,7 @@ public static void setupBCOManager() throws Throwable { } @AfterAll - @Timeout(30) +// @Timeout(30) public static void tearDownBCOManager() throws Throwable { try { if (agentManagerLauncher != null) { @@ -107,7 +107,7 @@ public static void tearDownBCOManager() throws Throwable { * @throws InterruptedException is thrown if the thread was externally interrupted */ @AfterEach - @Timeout(30) +// @Timeout(30) public void cancelAllOngoingActions() throws InterruptedException { LOGGER.info("Cancel all ongoing actions..."); try { diff --git a/module/app/util/src/test/java/org/openbase/bco/app/util/UnitTransformationTest.java b/module/app/util/src/test/java/org/openbase/bco/app/util/UnitTransformationTest.java index 94bcb87625..ed2cabb28a 100644 --- a/module/app/util/src/test/java/org/openbase/bco/app/util/UnitTransformationTest.java +++ b/module/app/util/src/test/java/org/openbase/bco/app/util/UnitTransformationTest.java @@ -52,7 +52,7 @@ public UnitTransformationTest() { } @Test - @Timeout(30) +// @Timeout(30) public void testUnitTransformation() throws Exception { System.out.println("testUnitTransformation"); try { diff --git a/module/app/util/src/test/java/org/openbase/bco/device/openhab/registry/synchronizer/SynchronizationProcessorTest.java b/module/app/util/src/test/java/org/openbase/bco/device/openhab/registry/synchronizer/SynchronizationProcessorTest.java index fafd9540e0..97346cbb08 100644 --- a/module/app/util/src/test/java/org/openbase/bco/device/openhab/registry/synchronizer/SynchronizationProcessorTest.java +++ b/module/app/util/src/test/java/org/openbase/bco/device/openhab/registry/synchronizer/SynchronizationProcessorTest.java @@ -31,7 +31,7 @@ class SynchronizationProcessorTest { @Test - @Timeout(20) +// @Timeout(20) void getUniquePrefix() { assertNotEquals( SynchronizationProcessor.getUniquePrefix("00:17:88:01:08:0c:f4:60-02-fc00"), diff --git a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticatedCommunicationTest.java b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticatedCommunicationTest.java index 06b51756fb..c379c352a7 100644 --- a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticatedCommunicationTest.java +++ b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticatedCommunicationTest.java @@ -66,7 +66,7 @@ private static void registerUser() throws Exception { } @BeforeEach - @Timeout(30) +// @Timeout(30) public void setupUser() throws Throwable { // register a user from which a ticket can be validated registerUser(); @@ -78,7 +78,7 @@ public void setupUser() throws Throwable { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testCommunication() throws Exception { final UnitConfig.Builder otherAgentConfig = UnitConfig.newBuilder(); otherAgentConfig.setId("OtherAgent"); diff --git a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticationFutureListTest.kt b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticationFutureListTest.kt index 82917ab05c..69ebc7ddb5 100644 --- a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticationFutureListTest.kt +++ b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticationFutureListTest.kt @@ -19,13 +19,13 @@ class AuthenticationFutureListTest { companion object { @JvmStatic @BeforeAll - @Timeout(30) + // @Timeout(30) fun setup() { JPService.setupJUnitTestMode() } } - @Timeout(3) +// @Timeout(3) @Test fun testTakeIfTerminated() { val completedFuture = FutureProcessor.completedFuture() @@ -42,7 +42,7 @@ class AuthenticationFutureListTest { AuthenticationFutureList.takeIfTerminated(runningFuture) shouldBe null } - @Timeout(5) +// @Timeout(5) @Test fun testScheduledTask() { AuthenticationFutureList.reset() diff --git a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticationTest.java b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticationTest.java index e65bb8c9da..bc50e457d8 100644 --- a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticationTest.java +++ b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticationTest.java @@ -45,7 +45,7 @@ public class AuthenticationTest extends MqttIntegrationTest { public static byte[] serviceServerSecretKey = EncryptionHelper.generateKey(); @BeforeEach - @Timeout(30) +// @Timeout(30) public void setupAuthentication() throws Throwable { JPService.setupJUnitTestMode(); CachedAuthenticationRemote.prepare(); @@ -57,7 +57,7 @@ public void setupAuthentication() throws Throwable { } @AfterEach - @Timeout(30) +// @Timeout(30) public void tearDownAuthentication() { // reset credential store because it could have been changed in a test MockCredentialStore.getInstance().reset(); diff --git a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticatorControllerTest.java b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticatorControllerTest.java index 474b62cbb5..801865f13d 100644 --- a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticatorControllerTest.java +++ b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticatorControllerTest.java @@ -59,7 +59,7 @@ public class AuthenticatorControllerTest extends AuthenticationTest { * @throws java.lang.Exception */ @Test - @Timeout(15) +// @Timeout(15) public void testCommunication() throws Exception { System.out.println("testCommunication"); @@ -95,7 +95,7 @@ public void testCommunication() throws Exception { * @throws Exception */ @Test - @Timeout(5) +// @Timeout(5) public void testAuthenticationWithNonExistentUser() { System.out.println("testAuthenticationWithNonExistentUser"); Assertions.assertThrows(ExecutionException.class, () -> { @@ -117,7 +117,7 @@ public void testAuthenticationWithNonExistentUser() { * @throws Exception */ @Test - @Timeout(5) +// @Timeout(5) public void testAuthenticationWithIncorrectPassword() { System.out.println("testAuthenticationWithIncorrectPassword"); @@ -131,7 +131,7 @@ public void testAuthenticationWithIncorrectPassword() { } @Test - @Timeout(15) +// @Timeout(15) public void testChangeCredentials() throws Exception { System.out.println("testChangeCredentials"); @@ -173,7 +173,7 @@ public void testChangeCredentials() throws Exception { * @throws Exception */ @Test - @Timeout(15) +// @Timeout(15) public void testChangeOthersCredentials() throws Exception { System.out.println("testChangeOthersCredentials"); @@ -257,7 +257,7 @@ public void testChangeOthersCredentials() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(15) +// @Timeout(15) public void testAsyncCommunication() throws Exception { System.out.println("testAsyncCommunication"); @@ -304,7 +304,7 @@ public void testAsyncCommunication() throws Exception { } @Test - @Timeout(15) +// @Timeout(15) public void testLoginCombinations() throws Exception { final UserClientPair clientSymmetricUserSymmetric = UserClientPair.newBuilder() .setClientId(MockCredentialStore.CLIENT_SYMMETRIC_ID) diff --git a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthorizationHelperTest.java b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthorizationHelperTest.java index 3b6e1f3425..b90550813e 100644 --- a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthorizationHelperTest.java +++ b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthorizationHelperTest.java @@ -98,7 +98,7 @@ public AuthorizationHelperTest() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(20) +// @Timeout(20) public void testOwnerPermissions() throws Exception { System.out.println("testOwnerPermissions"); @@ -144,7 +144,7 @@ public void testOwnerPermissions() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testGroupPermissions() throws Exception { System.out.println("testGroupPermissions"); PermissionConfig.MapFieldEntry.Builder groupsBuilder = PermissionConfig.MapFieldEntry.newBuilder() @@ -209,7 +209,7 @@ public void testGroupPermissions() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(20) +// @Timeout(20) public void testOtherPermissions() throws Exception { System.out.println("testOtherPermissions"); @@ -254,7 +254,7 @@ public void testOtherPermissions() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(20) +// @Timeout(20) public void testUserClient() throws Exception { System.out.println("testOtherPermissions"); @@ -298,7 +298,7 @@ public void testUserClient() throws Exception { } @Test - @Timeout(20) +// @Timeout(20) public void testLocationPermission() throws Exception { LocationConfig location1 = LocationConfig.newBuilder().setRoot(false).build(); PermissionConfig.Builder permissionConfigLocation = PermissionConfig.newBuilder().setOtherPermission(NONE); @@ -353,7 +353,7 @@ public void testLocationPermission() throws Exception { * Validate that a user can also be a group with permissions. */ @Test - @Timeout(20) +// @Timeout(20) public void testUserAsGroupPermissions() { // create user id final String userId = "UserWhichIsAlsoAGroup"; diff --git a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/CredentialStoreTest.java b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/CredentialStoreTest.java index c9cb0cee4f..d77825f880 100644 --- a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/CredentialStoreTest.java +++ b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/CredentialStoreTest.java @@ -50,7 +50,7 @@ public CredentialStoreTest() { } @BeforeAll - @Timeout(30) +// @Timeout(30) public static void setUpClass() throws Exception { JPService.setupJUnitTestMode(); JPService.registerProperty(JPResetCredentials.class); @@ -61,7 +61,7 @@ public static void setUpClass() throws Exception { * @throws Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testSavingAndLoading() throws Exception { System.out.println("testSavingAndLoading"); diff --git a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/EncryptionHelperTest.java b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/EncryptionHelperTest.java index 4cc68e3d97..63d1e93c36 100644 --- a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/EncryptionHelperTest.java +++ b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/EncryptionHelperTest.java @@ -45,7 +45,7 @@ public EncryptionHelperTest() { } @Test - @Timeout(20) +// @Timeout(20) public void testGenerateKey() { LOGGER.info("test key generation"); int expLen = 16; @@ -54,7 +54,7 @@ public void testGenerateKey() { } @Test - @Timeout(10) +// @Timeout(10) public void testSymmetricHashing() { LOGGER.info("test if hashing method hashes symmetrically"); byte[] hash1 = EncryptionHelper.hash("test"); @@ -63,7 +63,7 @@ public void testSymmetricHashing() { } @Test - @Timeout(20) +// @Timeout(20) public void testSymmetricEncryptionDecryption() throws Exception { LOGGER.info("test symmetric encryption and decryption"); String str = "test"; @@ -74,7 +74,7 @@ public void testSymmetricEncryptionDecryption() throws Exception { } @Test - @Timeout(20) +// @Timeout(20) public void testAsymmetricEncryptionDecryption() throws Exception { LOGGER.info("test asymmetric encryption and decryption"); String str = "test"; @@ -85,7 +85,7 @@ public void testAsymmetricEncryptionDecryption() throws Exception { } @Test - @Timeout(10) +// @Timeout(10) public void testExceptionsWithWrongKeySymmetric() { LOGGER.info("testExceptionsWithWrongKey"); @@ -101,7 +101,7 @@ public void testExceptionsWithWrongKeySymmetric() { } @Test - @Timeout(10) +// @Timeout(10) public void testExceptionsWithWrongKeyAsymmetric() { LOGGER.info("testExceptionsWithWrongKeyAsymmetric"); diff --git a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/InitialRegistrationTest.java b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/InitialRegistrationTest.java index d1aeea79d3..ac6440a1a0 100644 --- a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/InitialRegistrationTest.java +++ b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/InitialRegistrationTest.java @@ -48,7 +48,7 @@ public InitialRegistrationTest() { * @throws java.lang.Exception */ @Test - @Timeout(15) +// @Timeout(15) public void initialRegistrationTest() throws Exception { LOGGER.info("initialRegistrationTest"); diff --git a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/ServiceServerManagerTest.java b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/ServiceServerManagerTest.java index 3cfb9608c8..97d5beae9c 100644 --- a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/ServiceServerManagerTest.java +++ b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/ServiceServerManagerTest.java @@ -48,7 +48,7 @@ public ServiceServerManagerTest() { * @throws java.lang.Exception */ @Test - @Timeout(15) +// @Timeout(15) public void testServiceServerManagerValidation() throws Exception { System.out.println("testServiceServerManagerValidation"); diff --git a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/SessionManagerTest.java b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/SessionManagerTest.java index f4b911ebcb..5d1cd8a78f 100644 --- a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/SessionManagerTest.java +++ b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/SessionManagerTest.java @@ -59,7 +59,7 @@ public class SessionManagerTest extends AuthenticationTest { private int notificationCounter = 0; @BeforeEach - @Timeout(30) +// @Timeout(30) public void setupSessionManager() throws Throwable { clientStore = new MockClientStore(); @@ -82,7 +82,7 @@ public void setupSessionManager() throws Throwable { * @throws java.lang.Exception */ @Test - @Timeout(5) +// @Timeout(5) public void registerUser() throws Exception { System.out.println("registerUser"); SessionManager manager = new SessionManager(clientStore); @@ -102,7 +102,7 @@ public void registerUser() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(5) +// @Timeout(5) public void loginUser() throws Exception { System.out.println("loginUser"); SessionManager manager = new SessionManager(clientStore); @@ -115,7 +115,7 @@ public void loginUser() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(5) +// @Timeout(5) public void loginUserThenOtherUser() throws Exception { System.out.println("loginUserThenOtherUser"); SessionManager manager = new SessionManager(clientStore); @@ -129,7 +129,7 @@ public void loginUserThenOtherUser() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(5) +// @Timeout(5) public void loginUserAfterSystemLoginFailure() throws Exception { System.out.println("loginUserAfterSystemLoginFailure"); SessionManager manager = new SessionManager(clientStore); @@ -170,7 +170,7 @@ public void loginUserAfterSystemLoginFailure() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(5) +// @Timeout(5) public void isLoggedIn() throws Exception { System.out.println("isLoggedIn"); SessionManager manager = new SessionManager(clientStore); @@ -186,7 +186,7 @@ public void isLoggedIn() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(5) +// @Timeout(5) public void logout() throws Exception { System.out.println("logout"); SessionManager manager = new SessionManager(clientStore); @@ -203,7 +203,7 @@ public void logout() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(5) +// @Timeout(5) public void registerClientAndLogin() throws Exception { System.out.println("registerClientAndLogin"); SessionManager manager = new SessionManager(clientStore); @@ -238,7 +238,7 @@ public void registerClientAndLogin() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(5) +// @Timeout(5) public void registerClientAndLoginAndLoginUserAndLogout() throws Exception { System.out.println("registerClientAndLoginAndLoginUserAndLogout"); SessionManager manager = new SessionManager(clientStore); @@ -281,7 +281,7 @@ public void registerClientAndLoginAndLoginUserAndLogout() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(5) +// @Timeout(5) public void removeAdminHimself() { System.out.println("removeAdminHimself"); SessionManager manager = new SessionManager(clientStore); @@ -308,7 +308,7 @@ public void removeAdminHimself() { * @throws java.lang.Exception if something fails. */ @Test - @Timeout(5) +// @Timeout(5) public void removeAdminOther() throws Exception { System.out.println("removeAdminOther"); @@ -330,7 +330,7 @@ public void removeAdminOther() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(5) +// @Timeout(5) public void registerClientAsNonAdmin() { System.out.println("registerClientAsNonAdmin"); Assertions.assertThrows(ExecutionException.class, () -> { @@ -355,7 +355,7 @@ public void registerClientAsNonAdmin() { * @throws java.lang.Exception if an exception occurs. */ @Test - @Timeout(5) +// @Timeout(5) public void testChangingPassword() throws Exception { System.out.println("testChangingPassword"); @@ -392,7 +392,7 @@ public void testChangingPassword() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(15) +// @Timeout(15) public void setAdmin() throws Exception { System.out.println("setAdmin"); SessionManager manager = new SessionManager(clientStore); @@ -412,7 +412,7 @@ public void setAdmin() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(5) +// @Timeout(5) public void setAdminAsNonAdmin() throws Exception { System.out.println("setAdminAsNonAdmin"); Assertions.assertThrows(ExecutionException.class, () -> { @@ -437,7 +437,7 @@ public void setAdminAsNonAdmin() throws Exception { * @throws Exception */ @Test - @Timeout(5) +// @Timeout(5) public void isAdmin() throws Exception { System.out.println("isAdmin"); SessionManager manager = new SessionManager(clientStore); @@ -454,7 +454,7 @@ public void isAdmin() throws Exception { * @throws Exception */ @Test - @Timeout(5) +// @Timeout(5) public void loginObservableTest() throws Exception { System.out.println("loginObservableTest"); diff --git a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/StayLoggedInTest.kt b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/StayLoggedInTest.kt index d0437c236c..8547853696 100644 --- a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/StayLoggedInTest.kt +++ b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/StayLoggedInTest.kt @@ -55,7 +55,7 @@ class StayLoggedInTest : MqttIntegrationTest() { * @throws Exception if something does not work as expected */ @Test - @Timeout(30) +// @Timeout(30) @Throws(Exception::class) fun testStayingLoggedIn() { CachedAuthenticationRemote.prepare() diff --git a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/action/ActionComparatorTest.java b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/action/ActionComparatorTest.java index 2103b1c4e2..9b59ebc0dd 100644 --- a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/action/ActionComparatorTest.java +++ b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/action/ActionComparatorTest.java @@ -47,7 +47,7 @@ public class ActionComparatorTest { * Test the action ranking by creating a number of actions, adding them to a list and validating the order after sorting. */ @Test - @Timeout(10) +// @Timeout(10) public void testActionComparison() { final EmphasisState emphasisState = EmphasisState.newBuilder().setEconomy(0.6).setComfort(0.3).setSecurity(0.1).build(); final ActionComparator actionComparator = new ActionComparator(() -> emphasisState); diff --git a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/action/ActionDescriptionProcessorTest.kt b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/action/ActionDescriptionProcessorTest.kt index dda0b39a0d..abdd3bd572 100644 --- a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/action/ActionDescriptionProcessorTest.kt +++ b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/action/ActionDescriptionProcessorTest.kt @@ -34,7 +34,7 @@ import java.util.* class ActionDescriptionProcessorTest { - @Timeout(10) +// @Timeout(10) @Test fun unitChainSuffixForNonReplaceableAction() { val buttonActionDescription = ActionDescription.newBuilder() diff --git a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/ServiceJSonProcessorTest.java b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/ServiceJSonProcessorTest.java index e8cbdb1849..feae3e8b74 100644 --- a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/ServiceJSonProcessorTest.java +++ b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/ServiceJSonProcessorTest.java @@ -44,7 +44,7 @@ public ServiceJSonProcessorTest() { } @BeforeAll - @Timeout(30) +// @Timeout(30) public static void setUpClass() throws JPServiceException { JPService.setupJUnitTestMode(); } @@ -56,7 +56,7 @@ public static void setUpClass() throws JPServiceException { * @throws java.lang.Exception */ @Test - @Timeout(15) +// @Timeout(15) public void testGetServiceStateClassName() throws Exception { System.out.println("getServiceStateClassName"); Message serviceState; @@ -94,7 +94,7 @@ public void testGetServiceStateClassName() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(15) +// @Timeout(15) public void testSerializationPipeline() throws Exception { System.out.println("SerializationPipeline"); Message serviceState; diff --git a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/ServiceStateProcessorTest.java b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/ServiceStateProcessorTest.java index 2311be8a6b..26f703108b 100644 --- a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/ServiceStateProcessorTest.java +++ b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/ServiceStateProcessorTest.java @@ -48,7 +48,7 @@ public class ServiceStateProcessorTest { @Test - @Timeout(10) +// @Timeout(10) public void updateLatestValueOccurrence() throws Exception { PresenceState.Builder builder = PresenceState.newBuilder(); ServiceStateProcessor.updateLatestValueOccurrence(State.PRESENT, 2000, builder); diff --git a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/ServicesTest.java b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/ServicesTest.java index 74470be5a1..39b77112f1 100644 --- a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/ServicesTest.java +++ b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/ServicesTest.java @@ -50,7 +50,7 @@ public class ServicesTest { * @throws Exception if something fails. */ @Test - @Timeout(20) +// @Timeout(20) public void testSuperStateConversion() throws Exception { final BrightnessState brightnessState = BrightnessState.newBuilder().setBrightness(.5d).build(); final Message expectedPowerState = BrightnessStateProviderService.toPowerState(brightnessState); diff --git a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/operation/OperationServiceTest.java b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/operation/OperationServiceTest.java index 88e9b37b41..840ea86a28 100644 --- a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/operation/OperationServiceTest.java +++ b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/operation/OperationServiceTest.java @@ -31,7 +31,7 @@ class OperationServiceTest { @Test - @Timeout(20) +// @Timeout(20) void verifyValueRange() throws VerificationFailedException { OperationService.verifyValueRange("good", 10, 5, 15); OperationService.verifyValueRange("good", 0.10, 0.05, 0.15); @@ -60,7 +60,7 @@ void verifyValueRange() throws VerificationFailedException { } @Test - @Timeout(20) +// @Timeout(20) void verifyValue() throws VerificationFailedException { OperationService.verifyValue("good", 10, 11, 2); OperationService.verifyValue("good", 0.12, 0.11, 0.1); @@ -90,7 +90,7 @@ void verifyValue() throws VerificationFailedException { } @Test - @Timeout(20) +// @Timeout(20) void testEquals() { assertTrue(OperationService.equals(30d, 30d, 0d), "equals check result invalid"); assertTrue(OperationService.equals(30d, 33d, 4d), "equals check result invalid"); diff --git a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderServiceTest.kt b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderServiceTest.kt index 8dd28e294b..e7317491ed 100644 --- a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderServiceTest.kt +++ b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderServiceTest.kt @@ -34,7 +34,7 @@ import org.openbase.type.domotic.state.ColorStateType.ColorState class ColorStateProviderServiceTest { @Test - @Timeout(10) +// @Timeout(10) fun `should fix color values once they are defined out of range`() { JPService.setupJUnitTestMode() @@ -68,7 +68,7 @@ class ColorStateProviderServiceTest { } @Test - @Timeout(10) +// @Timeout(10) fun `should handle color state comparison with equal state`() { JPService.setupJUnitTestMode() @@ -108,7 +108,7 @@ class ColorStateProviderServiceTest { } @Test - @Timeout(10) +// @Timeout(10) fun `should handle color state comparison with non equal state`() { JPService.setupJUnitTestMode() @@ -217,7 +217,7 @@ class ColorStateProviderServiceTest { } @Test - @Timeout(10) +// @Timeout(10) fun `should handle color state comparison with neutral state`() { JPService.setupJUnitTestMode() diff --git a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ServicesTest.kt b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ServicesTest.kt index 36563ace82..2ba2bf6da0 100644 --- a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ServicesTest.kt +++ b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ServicesTest.kt @@ -36,7 +36,7 @@ import java.util.function.Consumer class ServicesTest : AbstractBCORegistryTest() { @Test - @Timeout(value = 30) +// @Timeout(value = 30) fun testComputeActionImpact() { val unitRegistry = Registries.getUnitRegistry(true) val serviceState = ServiceStateDescription.newBuilder().apply { diff --git a/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCODeviceManagerTest.java b/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCODeviceManagerTest.java index 369ea76748..7f27abf2e5 100644 --- a/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCODeviceManagerTest.java +++ b/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCODeviceManagerTest.java @@ -40,7 +40,7 @@ public abstract class AbstractBCODeviceManagerTest extends AbstractBCOTest { protected static DeviceManagerLauncher deviceManagerLauncher; @BeforeAll - @Timeout(30) +// @Timeout(30) public static void setupDeviceManager() throws Throwable { try { deviceManagerLauncher = new DeviceManagerLauncher(); @@ -51,7 +51,7 @@ public static void setupDeviceManager() throws Throwable { } @AfterAll - @Timeout(30) +// @Timeout(30) public static void tearDownDeviceManage() throws Throwable { try { if (deviceManagerLauncher != null) { @@ -68,7 +68,7 @@ public static void tearDownDeviceManage() throws Throwable { * @throws InterruptedException is thrown if the thread was externally interrupted */ @BeforeEach - @Timeout(30) +// @Timeout(30) @AfterEach public void cancelAllOngoingActions() throws InterruptedException { LOGGER.info("Cancel all ongoing actions..."); diff --git a/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCOTest.java b/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCOTest.java index fd633d561d..6cae9a30e8 100644 --- a/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCOTest.java +++ b/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCOTest.java @@ -61,7 +61,7 @@ public abstract class AbstractBCOTest extends MqttIntegrationTest { private final List testActions = Collections.synchronizedList(new ArrayList<>()); @BeforeAll -// @Timeout(30) +//// @Timeout(30) public static void setupBCO() throws Throwable { try { mockRegistry = MockRegistryHolder.newMockRegistry(); @@ -72,7 +72,7 @@ public static void setupBCO() throws Throwable { } @AfterAll -// @Timeout(30) +//// @Timeout(30) public static void tearDownBCO() throws Throwable { try { Units.reset(AbstractBCOTest.class); @@ -84,7 +84,7 @@ public static void tearDownBCO() throws Throwable { } @BeforeEach - @Timeout(30) +// @Timeout(30) public void notifyAboutTestStart() { LOGGER.info("===================================== Start BCO Test ====================================="); LOGGER.debug("Test class: " + getClass().getSimpleName()); @@ -96,7 +96,7 @@ public void notifyAboutTestStart() { * If you want to cancel all actions manually please use method {@code cancelAllTestActions()} to get feedback about the cancellation process. */ @AfterEach - @Timeout(30) +// @Timeout(30) public void autoCancelActionsAfterTestRun() { LOGGER.info("===================================== Finish BCO Test ====================================="); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/remote/layer/unit/CustomUnitPoolTest.kt b/module/dal/test/src/test/java/org/openbase/bco/dal/remote/layer/unit/CustomUnitPoolTest.kt index c9ec97278e..8a87b0ed7e 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/remote/layer/unit/CustomUnitPoolTest.kt +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/remote/layer/unit/CustomUnitPoolTest.kt @@ -39,7 +39,7 @@ class CustomUnitPoolTest : AbstractBCODeviceManagerTest() { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) @Throws(Exception::class) fun testUnitPool() { val customUnitPool: CustomUnitPool<*, *> = CustomUnitPool>() diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/ActionChainTest.kt b/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/ActionChainTest.kt index c3caec2523..4c5bc15768 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/ActionChainTest.kt +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/ActionChainTest.kt @@ -19,7 +19,7 @@ class ActionChainTest : AbstractBCOLocationManagerTest() { private val log = LoggerFactory.getLogger(javaClass) @Test - @Timeout(15) +// @Timeout(15) @Throws(Exception::class) fun `when a location is turned of its units that support the power service are registered as impact`() { val rootLocationRemote = @@ -46,7 +46,7 @@ class ActionChainTest : AbstractBCOLocationManagerTest() { } @Test - @Timeout(15) +// @Timeout(15) @Throws(Exception::class) fun `when a light is switched on the locations the light is a part of are registered as impact`() { val rootLocationRemote = diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/RemoteActionTest.kt b/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/RemoteActionTest.kt index c29dc06f55..d52c6d3bd2 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/RemoteActionTest.kt +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/RemoteActionTest.kt @@ -58,7 +58,7 @@ class RemoteActionTest : AbstractBCOLocationManagerTest() { } @BeforeAll - @Timeout(30) +// @Timeout(30) fun setupRemoteActionTest() { // create new user token for test try { @@ -96,7 +96,7 @@ class RemoteActionTest : AbstractBCOLocationManagerTest() { } @Test - @Timeout(10) +// @Timeout(10) @Throws(Exception::class) fun testExecutionAndCancellationWithToken() { println("testExecutionAndCancellationWithToken") @@ -164,7 +164,7 @@ class RemoteActionTest : AbstractBCOLocationManagerTest() { } @Test -// @Timeout(15) +//// @Timeout(15) @Throws(Exception::class) fun testExtensionCancellation() { println("testExtensionCancellation") diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/service/ServiceTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/service/ServiceTest.java index 3c369c0752..d3bddcce02 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/service/ServiceTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/service/ServiceTest.java @@ -54,7 +54,7 @@ public class ServiceTest extends AbstractBCOTest { * Test of getServiceStateClass method, of class Service. */ @Test - @Timeout(10) +// @Timeout(10) public void testDetectServiceDataClass() throws Exception { System.out.println("detectServiceDataClass"); try { @@ -71,7 +71,7 @@ public void testDetectServiceDataClass() throws Exception { * Test of getServiceStateEnumValues method, of class Service. */ @Test - @Timeout(10) +// @Timeout(10) public void testGetServiceStateValues() throws Exception { System.out.println("getServiceStateEnumValues"); try { @@ -89,7 +89,7 @@ public void testGetServiceStateValues() throws Exception { * Test of getServiceStateEnumValues method, of class Service. */ @Test - @Timeout(10) +// @Timeout(10) public void testGenerateServiceStateBuilder() throws Exception { System.out.println("getServiceStateEnumValues"); try { diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/AbstractUnitControllerTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/AbstractUnitControllerTest.java index 3594796974..6774588a8a 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/AbstractUnitControllerTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/AbstractUnitControllerTest.java @@ -76,7 +76,7 @@ public AbstractUnitControllerTest() { } @BeforeAll - @Timeout(30) +// @Timeout(30) public static void loginUser() throws Throwable { colorableLightRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.COLORABLE_LIGHT), true, Units.COLORABLE_LIGHT); colorableLightController = deviceManagerLauncher.getLaunchable().getUnitControllerRegistry().get(colorableLightRemote.getId()); @@ -89,13 +89,13 @@ public static void loginUser() throws Throwable { } @AfterAll - @Timeout(30) +// @Timeout(30) public static void logoutUser() throws Throwable { sessionManager.logout(); } @BeforeEach - @Timeout(30) +// @Timeout(30) public void setupUnitController() throws CouldNotPerformException, InterruptedException, TimeoutException, ExecutionException { for (ActionDescription actionDescription : colorableLightController.getActionList()) { @@ -110,14 +110,14 @@ public void setupUnitController() throws CouldNotPerformException, InterruptedEx } @AfterEach - @Timeout(30) +// @Timeout(30) public void tearDownUnitController() throws CouldNotPerformException, InterruptedException, TimeoutException, ExecutionException { // cleanup leftover actions which were manually submitted to the controller. colorableLightController.cancelAllActions(); } @Test - @Timeout(30) +// @Timeout(30) public void applyDataStateUpdateTest() { try { colorableLightController.applyServiceState(States.Power.ON, ServiceType.POWER_STATE_SERVICE); @@ -145,7 +145,7 @@ public void applyDataStateUpdateTest() { } @Test - @Timeout(30) +// @Timeout(30) public void applyCustomDataStateUpdateTest() { try { for (int i = 0; i < 10; i++) { @@ -182,7 +182,7 @@ public void applyCustomDataStateUpdateTest() { } @Test - @Timeout(30) +// @Timeout(30) public void applyCustomDataStateFeedbackLoopTest() { try { colorableLightController.applyServiceState(Power.OFF, ServiceType.POWER_STATE_SERVICE); @@ -227,7 +227,7 @@ public void applyCustomDataStateFeedbackLoopTest() { } @Test - @Timeout(30) +// @Timeout(30) public void rejectUpdateWhenStateIsCompatibleTest() { try { final RemoteAction mainAction = waitForExecution(colorableLightRemote.setColorState(Color.BLUE)); @@ -276,7 +276,7 @@ public void rejectUpdateWhenStateIsCompatibleTest() { } @Test - @Timeout(30) +// @Timeout(30) public void futureSyncTest() throws InterruptedException, ExecutionException, TimeoutException, CouldNotPerformException { String anotherColorableLightId = null; diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/BatteryRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/BatteryRemoteTest.java index 9ccaf784a4..8f114fa07c 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/BatteryRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/BatteryRemoteTest.java @@ -50,7 +50,7 @@ public BatteryRemoteTest() { } @BeforeAll - @Timeout(30) +// @Timeout(30) public static void loadUnits() throws Throwable { batteryRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.BATTERY), true, BatteryRemote.class); } @@ -68,7 +68,7 @@ public void testNotifyUpdated() { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testGetBatteryLevel() throws Exception { try { System.out.println("getBatteryLevel"); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ButtonRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ButtonRemoteTest.java index 388c89c572..f859b0dc8d 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ButtonRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ButtonRemoteTest.java @@ -50,7 +50,7 @@ public ButtonRemoteTest() { } @BeforeAll - @Timeout(30) +// @Timeout(30) public static void loadUnits() throws Throwable { buttonRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.BUTTON), true, ButtonRemote.class); } @@ -61,7 +61,7 @@ public static void loadUnits() throws Throwable { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testGetButtonState() throws Exception { System.out.println("getButtonState"); ButtonState buttonState = ButtonState.newBuilder().setValue(ButtonState.State.PRESSED).build(); @@ -81,7 +81,7 @@ public void testGetButtonState() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testGetButtonStateTimestamp() throws Exception { System.out.println("testGetButtonStateTimestamp"); long timestamp; diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ColorableLightRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ColorableLightRemoteTest.java index 0ba416d874..d78eef59ce 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ColorableLightRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ColorableLightRemoteTest.java @@ -59,7 +59,7 @@ public class ColorableLightRemoteTest extends AbstractBCODeviceManagerTest { private int powerStateObserverUpdateNumber = 0; @BeforeAll - @Timeout(30) +// @Timeout(30) public static void loadUnits() throws Throwable { colorableLightRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.COLORABLE_LIGHT), true, ColorableLightRemote.class); } @@ -70,7 +70,7 @@ public static void loadUnits() throws Throwable { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testSetColor_Color() throws Exception { System.out.println("setColor"); HSBColor color = HSBColor.newBuilder().setBrightness(0.50).setSaturation(0.70).setHue(150).build(); @@ -84,7 +84,7 @@ public void testSetColor_Color() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testSetColor_HSBColor() throws Exception { System.out.println("setColor"); HSBColor color = HSBColor.newBuilder().setHue(50).setSaturation(0.50).setBrightness(0.50).build(); @@ -98,7 +98,7 @@ public void testSetColor_HSBColor() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testSetColor_InvalidHSBColor() throws Exception { System.out.println("setColor"); @@ -134,7 +134,7 @@ public void testSetColor_InvalidHSBColor() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testRemoteGetColor() throws Exception { System.out.println("getColor"); HSBColor color = HSBColor.newBuilder().setHue(66).setSaturation(0.63).setBrightness(0.33).build(); @@ -148,7 +148,7 @@ public void testRemoteGetColor() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testSetPowerState() throws Exception { System.out.println("setPowerState"); PowerState state = PowerState.newBuilder().setValue(PowerState.State.ON).build(); @@ -162,7 +162,7 @@ public void testSetPowerState() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testGetPowerState() throws Exception { System.out.println("getPowerState"); PowerState state = PowerState.newBuilder().setValue(PowerState.State.OFF).build(); @@ -176,7 +176,7 @@ public void testGetPowerState() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testSetBrightness() throws Exception { System.out.println("setBrightness"); Double brightness = 0.75d; @@ -191,7 +191,7 @@ public void testSetBrightness() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testGetBrightness() throws Exception { System.out.println("getBrightness"); Double brightness = 0.25d; @@ -201,7 +201,7 @@ public void testGetBrightness() throws Exception { } @Test - @Timeout(10) +// @Timeout(10) public void testSetNeutralWhite() throws Exception { System.out.println("testSetNeutralWhite"); waitForExecution(colorableLightRemote.setNeutralWhite()); @@ -214,7 +214,7 @@ public void testSetNeutralWhite() throws Exception { * @throws Exception if something fails. */ @Test - @Timeout(15) +// @Timeout(15) public void testPowerStateObserver() throws Exception { System.out.println("testPowerStateObserver"); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ColorableLightRemoteWithAuthenticationTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ColorableLightRemoteWithAuthenticationTest.java index a5803167e8..51a80a7275 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ColorableLightRemoteWithAuthenticationTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ColorableLightRemoteWithAuthenticationTest.java @@ -90,13 +90,13 @@ public ColorableLightRemoteWithAuthenticationTest() { } @BeforeAll - @Timeout(30) +// @Timeout(30) public static void registerProperties() throws Throwable { JPService.registerProperty(JPAuthentication.class, true); } @BeforeEach - @Timeout(30) +// @Timeout(30) public void prepareTest() throws CouldNotPerformException, InterruptedException, ExecutionException { adminSessionManager.loginUser(Registries.getUnitRegistry().getUnitConfigByAlias(UnitRegistry.ADMIN_USER_ALIAS).getId(), UserCreationPlugin.ADMIN_PASSWORD, false); @@ -110,7 +110,7 @@ public void prepareTest() throws CouldNotPerformException, InterruptedException, } @AfterEach - @Timeout(30) +// @Timeout(30) public void tearDownTest() throws CouldNotPerformException, ExecutionException, InterruptedException { adminSessionManager.logout(); colorableLightRemote.setSessionManager(SessionManager.getInstance()); @@ -122,7 +122,7 @@ public void tearDownTest() throws CouldNotPerformException, ExecutionException, * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testSetColorWithAuthentication() throws Exception { System.out.println("testSetColorWithAuthentication"); @@ -138,7 +138,7 @@ public void testSetColorWithAuthentication() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testSetColorWithClientWithoutAuthentication() throws Exception { System.out.println("testSetColorWithClientWithoutAuthentication"); @@ -196,7 +196,7 @@ public void testSetColorWithClientWithoutAuthentication() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testSetColorWithUserWithoutAuthentication() throws Exception { System.out.println("testSetColorWithClientWithoutAuthentication"); @@ -227,7 +227,7 @@ public void testSetColorWithUserWithoutAuthentication() throws Exception { } @Test - @Timeout(15) +// @Timeout(15) public void testApplyActionWithToken() throws Exception { System.out.println("testApplyActionWithToken"); @@ -313,7 +313,7 @@ public void testApplyActionWithToken() throws Exception { } @Test - @Timeout(15) +// @Timeout(15) public void testApplyActionViaServiceRemoteWithToken() throws Exception { System.out.println("testApplyActionViaServiceRemoteWithToken"); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/DimmableLightRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/DimmableLightRemoteTest.java index 3fa6760c7a..4d6da29a4b 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/DimmableLightRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/DimmableLightRemoteTest.java @@ -48,7 +48,7 @@ public DimmableLightRemoteTest() { } @BeforeAll - @Timeout(30) +// @Timeout(30) public static void loadUnits() throws Throwable { dimmableLightRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.DIMMABLE_LIGHT), true, DimmableLightRemote.class); } @@ -59,7 +59,7 @@ public static void loadUnits() throws Throwable { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testSetPower() throws Exception { System.out.println("setPowerState"); PowerState state = PowerState.newBuilder().setValue(PowerState.State.ON).build(); @@ -73,7 +73,7 @@ public void testSetPower() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testGetPower() throws Exception { System.out.println("getPowerState"); deviceManagerLauncher.getLaunchable().getUnitControllerRegistry().get(dimmableLightRemote.getId()).applyServiceState(Power.ON, ServiceType.POWER_STATE_SERVICE); @@ -87,7 +87,7 @@ public void testGetPower() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testSetBrightness() throws Exception { System.out.println("setBrightness"); Double brightness = 0.66d; @@ -102,7 +102,7 @@ public void testSetBrightness() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testGetBrightness() throws Exception { System.out.println("getBrightness"); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/HandleRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/HandleRemoteTest.java index 76cf850a0f..1da0dec75f 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/HandleRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/HandleRemoteTest.java @@ -47,7 +47,7 @@ public HandleRemoteTest() { } @BeforeAll - @Timeout(30) +// @Timeout(30) public static void loadUnits() throws Throwable { handleRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.HANDLE), true, HandleRemote.class); } @@ -65,7 +65,7 @@ public void testNotifyUpdated() { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testGetRotaryHandleState() throws Exception { System.out.println("getRotaryHandleState"); HandleState handlestate = HandleState.newBuilder().setPosition(90).build(); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/LightRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/LightRemoteTest.java index 9c54698c1d..2c712a2c03 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/LightRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/LightRemoteTest.java @@ -46,7 +46,7 @@ public LightRemoteTest() { } @BeforeAll - @Timeout(30) +// @Timeout(30) public static void loadUnits() throws Throwable { lightRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.LIGHT), true, LightRemote.class); } @@ -57,7 +57,7 @@ public static void loadUnits() throws Throwable { * @throws java.lang.Exception */ @Test - @Timeout(15) +// @Timeout(15) public void testSetPowerState() throws Exception { System.out.println("setPowerState"); waitForExecution(lightRemote.setPowerState(Power.ON)); @@ -70,7 +70,7 @@ public void testSetPowerState() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testGetPowerState() throws Exception { System.out.println("getPowerState"); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/LightSensorRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/LightSensorRemoteTest.java index c2848f8e27..0f2fc88330 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/LightSensorRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/LightSensorRemoteTest.java @@ -46,7 +46,7 @@ public LightSensorRemoteTest() { } @BeforeAll - @Timeout(30) +// @Timeout(30) public static void loadUnits() throws Throwable { lightSensorRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.LIGHT_SENSOR), true, LightSensorRemote.class); } @@ -57,7 +57,7 @@ public static void loadUnits() throws Throwable { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testGetIlluminance() throws Exception { System.out.println("getIlluminance"); double illuminance = 0.5; diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/MotionDetectorRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/MotionDetectorRemoteTest.java index 40a66b14eb..421a1886a4 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/MotionDetectorRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/MotionDetectorRemoteTest.java @@ -53,7 +53,7 @@ public MotionDetectorRemoteTest() { } @BeforeAll - @Timeout(30) +// @Timeout(30) public static void loadUnits() throws Throwable { motionDetectorRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.MOTION_DETECTOR), true, MotionDetectorRemote.class); } @@ -64,7 +64,7 @@ public static void loadUnits() throws Throwable { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testGetMotionState() throws Exception { System.out.println("getMotionState"); @@ -80,7 +80,7 @@ public void testGetMotionState() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testGetMotionStateTimestamp() throws Exception { LOGGER.debug("testGetMotionStateTimestamp"); long timestamp; diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/PowerConsumptionSensorRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/PowerConsumptionSensorRemoteTest.java index 2f5b51d55f..4a2bbff244 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/PowerConsumptionSensorRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/PowerConsumptionSensorRemoteTest.java @@ -47,7 +47,7 @@ public PowerConsumptionSensorRemoteTest() { } @BeforeAll - @Timeout(30) +// @Timeout(30) public static void loadUnits() throws Throwable { powerConsumptionRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.POWER_CONSUMPTION_SENSOR), true, PowerConsumptionSensorRemote.class); } @@ -66,7 +66,7 @@ public void testNotifyUpdated() { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testGetPowerConsumption() throws Exception { System.out.println("getPowerConsumption"); double consumption = 200d; diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/PowerSwitchRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/PowerSwitchRemoteTest.java index 6936fdb5d4..a6e72363aa 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/PowerSwitchRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/PowerSwitchRemoteTest.java @@ -65,7 +65,7 @@ public PowerSwitchRemoteTest() { } @BeforeAll - @Timeout(30) +// @Timeout(30) public static void loadUnits() throws Throwable { powerSwitchRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.POWER_SWITCH), true, PowerSwitchRemote.class); } @@ -76,7 +76,7 @@ public static void loadUnits() throws Throwable { * @throws java.lang.Exception */ @Test - @Timeout(3) +// @Timeout(3) public void testSetPowerState() throws Exception { waitForExecution(powerSwitchRemote.setPowerState(Power.ON)); assertEquals(Power.ON.getValue(), powerSwitchRemote.getData().getPowerState().getValue(), "Power state has not been set in time!"); @@ -88,7 +88,7 @@ public void testSetPowerState() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(3) +// @Timeout(3) public void testGetPowerState() throws Exception { // apply service state final UnitController unitController = deviceManagerLauncher.getLaunchable().getUnitControllerRegistry().get(powerSwitchRemote.getId()); @@ -116,7 +116,7 @@ public void testGetPowerState() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(60) +// @Timeout(60) @RepeatedTest(5) public void testPowerStateServicePerformance() throws Exception { System.out.println("testPowerStateServicePerformance"); @@ -192,7 +192,7 @@ public void testPowerStateServicePerformance() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(60) +// @Timeout(60) public void testPowerStateServiceCancellationPerformance() throws Exception { final Random random = new Random(); final ActionParameter parameter = ActionParameter.newBuilder().setExecutionTimePeriod(100000000).build(); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ReedContactRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ReedContactRemoteTest.java index 7893879514..b04eb6a164 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ReedContactRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ReedContactRemoteTest.java @@ -46,7 +46,7 @@ public ReedContactRemoteTest() { } @BeforeAll - @Timeout(30) +// @Timeout(30) public static void loadUnits() throws Throwable { reedContactRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.REED_CONTACT), true, ReedContactRemote.class); } @@ -57,7 +57,7 @@ public static void loadUnits() throws Throwable { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testGetReedSwitchState() throws Exception { System.out.println("getReedSwitchState"); deviceManagerLauncher.getLaunchable().getUnitControllerRegistry().get(reedContactRemote.getId()).applyServiceState(Contact.OPEN, ServiceType.CONTACT_STATE_SERVICE); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/RollerShutterRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/RollerShutterRemoteTest.java index 060b5e493c..5623f12927 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/RollerShutterRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/RollerShutterRemoteTest.java @@ -48,7 +48,7 @@ public RollerShutterRemoteTest() { } @BeforeAll - @Timeout(30) +// @Timeout(30) public static void loadUnits() throws Throwable { rollerShutterRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.ROLLER_SHUTTER), true, RollerShutterRemote.class); } @@ -59,7 +59,7 @@ public static void loadUnits() throws Throwable { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testSetShutterState() throws Exception { System.out.println("setShutterState"); BlindState state = BlindState.newBuilder().setValue(BlindState.State.DOWN).build(); @@ -73,7 +73,7 @@ public void testSetShutterState() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testGetShutterState() throws Exception { System.out.println("getShutterState"); final BlindState blindState = BlindState.newBuilder().setValue(State.UP).build(); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/SmokeDetectorRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/SmokeDetectorRemoteTest.java index be640a62d1..4eb6b54312 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/SmokeDetectorRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/SmokeDetectorRemoteTest.java @@ -44,7 +44,7 @@ public class SmokeDetectorRemoteTest extends AbstractBCODeviceManagerTest { private static SmokeDetectorRemote smokeDetectorRemote; @BeforeAll - @Timeout(30) +// @Timeout(30) public static void setupTest() throws Throwable { smokeDetectorRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.SMOKE_DETECTOR), true, SmokeDetectorRemote.class); } @@ -55,7 +55,7 @@ public static void setupTest() throws Throwable { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testGetSmokeAlarmState() throws Exception { System.out.println("getSmokeAlarmState"); AlarmState alarmState = AlarmState.newBuilder().setValue(AlarmState.State.ALARM).build(); @@ -70,7 +70,7 @@ public void testGetSmokeAlarmState() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testGetSmokeState() throws Exception { System.out.println("getSmokeState"); SmokeState smokeState = SmokeState.newBuilder().setValue(SmokeState.State.SOME_SMOKE).setSmokeLevel(0.13d).build(); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/TamperDetectorRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/TamperDetectorRemoteTest.java index 858c25e5f6..b243e4900d 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/TamperDetectorRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/TamperDetectorRemoteTest.java @@ -51,7 +51,7 @@ public TamperDetectorRemoteTest() { } @BeforeAll - @Timeout(30) +// @Timeout(30) public static void setupTest() throws Throwable { tamperDetectorRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.TAMPER_DETECTOR), true, TamperDetectorRemote.class); } @@ -69,7 +69,7 @@ public void testNotifyUpdated() { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testGetTamperState() throws Exception { System.out.println("getTamperState"); TamperState tamperState = TamperState.newBuilder().setValue(TamperState.State.TAMPER).build(); @@ -84,7 +84,7 @@ public void testGetTamperState() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testGetTamperStateTimestamp() throws Exception { System.out.println("testGetTamperStateTimestamp"); long timestamp; diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/TemperatureControllerRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/TemperatureControllerRemoteTest.java index 77808686e6..8b9c6dcecb 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/TemperatureControllerRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/TemperatureControllerRemoteTest.java @@ -46,7 +46,7 @@ public TemperatureControllerRemoteTest() { } @BeforeAll - @Timeout(30) +// @Timeout(30) public static void setupTest() throws Throwable { temperatureControllerRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.TEMPERATURE_CONTROLLER), true, TemperatureControllerRemote.class); } @@ -57,7 +57,7 @@ public static void setupTest() throws Throwable { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testSetTargetTemperature() throws Exception { System.out.println("setTargetTemperature"); double temperature = 42.0F; @@ -73,7 +73,7 @@ public void testSetTargetTemperature() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testGetTargetTemperature() throws Exception { System.out.println("getTargetTemperature"); @@ -90,7 +90,7 @@ public void testGetTargetTemperature() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testGetTemperature() throws Exception { System.out.println("getTemperature"); double temperature = 37.0F; diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/TemperatureSensorRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/TemperatureSensorRemoteTest.java index b2a57f533c..14ed746cd6 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/TemperatureSensorRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/TemperatureSensorRemoteTest.java @@ -48,7 +48,7 @@ public TemperatureSensorRemoteTest() { } @BeforeAll - @Timeout(30) +// @Timeout(30) public static void setupTest() throws Throwable { temperatureSensorRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.TEMPERATURE_SENSOR), true, TemperatureSensorRemote.class); } @@ -66,7 +66,7 @@ public void testNotifyUpdated() { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testGetTemperature() throws Exception { System.out.println("getTemperature"); double temperature = 37.0F; @@ -82,7 +82,7 @@ public void testGetTemperature() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testGetTemperatureAlarmState() throws Exception { System.out.println("getTemperatureAlarmState"); AlarmState alarmState = AlarmState.newBuilder().setValue(AlarmState.State.ALARM).build(); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/UnitAllocationTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/UnitAllocationTest.java index 59b67aaae6..9224985d0e 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/UnitAllocationTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/UnitAllocationTest.java @@ -83,7 +83,7 @@ public UnitAllocationTest() { } @BeforeAll - @Timeout(30) +// @Timeout(30) public static void setUpClass() throws Throwable { // uncomment to enable debug mode @@ -99,7 +99,7 @@ public static void setUpClass() throws Throwable { } @BeforeEach - @Timeout(30) +// @Timeout(30) public void loginUser() throws Exception { sessionManager.loginUser(Registries.getUnitRegistry().getUnitConfigByAlias(UnitRegistry.ADMIN_USER_ALIAS).getId(), UserCreationPlugin.ADMIN_PASSWORD, false); @@ -109,7 +109,7 @@ public void loginUser() throws Exception { } @AfterEach - @Timeout(30) +// @Timeout(30) public void logoutUser() { sessionManager.logout(); } @@ -120,7 +120,7 @@ public void logoutUser() { * @throws Exception if an error occurs. */ @Test - @Timeout(5) +// @Timeout(5) public void testActionStateNotifications() throws Exception { LOGGER.info("testActionStateNotifications"); // expected order of action states @@ -178,7 +178,7 @@ public void testActionStateNotifications() throws Exception { * @throws Exception if an error occurs. */ @Test - @Timeout(5) +// @Timeout(5) public void testMultiActionsBySameInitiator() throws Exception { LOGGER.info("testMultiActionsBySameInitiator"); // set the power state of the colorable light @@ -213,7 +213,7 @@ public void testMultiActionsBySameInitiator() throws Exception { * @throws Exception if an error occurs. */ @Test - @Timeout(10) +// @Timeout(10) public void testRescheduling() throws Exception { LOGGER.info("testRescheduling"); @@ -266,7 +266,7 @@ public void testRescheduling() throws Exception { * @throws Exception if an error occurs. */ @Test - @Timeout(15) +// @Timeout(15) public void testPriorityHandling() throws Exception { LOGGER.info("testPriorityHandling"); @@ -346,7 +346,7 @@ public void testPriorityHandling() throws Exception { * @throws Exception if an error occurs. */ @Test - @Timeout(5) +// @Timeout(5) public void testFinalizationAfterExecutionTimePeriodPassed() throws Exception { LOGGER.info("testFinalizationAfterExecutionTimePeriodPassed"); @@ -414,7 +414,7 @@ public void testFinalizationAfterExecutionTimePeriodPassed() throws Exception { * @throws Exception if an error occurs. */ @Test - @Timeout(15) +// @Timeout(15) public void testActionExtension() throws Exception { LOGGER.info("testActionExtension"); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/connection/ConnectionRemoteTest.kt b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/connection/ConnectionRemoteTest.kt index 7397ef8a6a..714d19ca8a 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/connection/ConnectionRemoteTest.kt +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/connection/ConnectionRemoteTest.kt @@ -44,7 +44,7 @@ class ConnectionRemoteTest : AbstractBCOLocationManagerTest() { * @throws Exception */ @Test - @Timeout(5) +// @Timeout(5) fun testDoorStateUpdate() { println("testDoorStateUpdate") diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/device/DalRegisterDeviceTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/device/DalRegisterDeviceTest.java index 97356535b4..d025e41df6 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/device/DalRegisterDeviceTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/device/DalRegisterDeviceTest.java @@ -73,7 +73,7 @@ public DalRegisterDeviceTest() { * @throws Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testRegisterDeviceWhileRunning() throws Exception { System.out.println("testRegisterDeviceWhileRunning"); @@ -158,7 +158,7 @@ public void testRegisterDeviceWhileRunning() throws Exception { private boolean running = true; @Test - @Timeout(30) +// @Timeout(30) public void testRegisteringManyDevices() throws Exception { System.out.println("testRegisteringManyDevices"); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/device/DeviceManagerLauncherTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/device/DeviceManagerLauncherTest.java index 14b1e1cfba..56344e64dc 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/device/DeviceManagerLauncherTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/device/DeviceManagerLauncherTest.java @@ -45,7 +45,7 @@ public class DeviceManagerLauncherTest extends AbstractBCOTest { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testShutdown() throws Exception { DeviceManagerLauncher instance = new DeviceManagerLauncher(); try { diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java index fd09d21e11..9a547290ea 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java @@ -150,7 +150,7 @@ public SceneRemoteTest() { } @BeforeAll - @Timeout(30) +// @Timeout(30) public static void setupSceneTest() throws Throwable { try { //JPService.registerProperty(JPLogLevel.class, LogLevel.DEBUG); @@ -179,7 +179,7 @@ public static void setupSceneTest() throws Throwable { } @AfterAll - @Timeout(30) +// @Timeout(30) public static void tearDownSceneTest() throws Throwable { try { if (sceneManagerLauncher != null) { @@ -377,7 +377,7 @@ private static String registerUnitGroup() throws CouldNotPerformException { * @throws InterruptedException is thrown if the thread was externally interrupted */ @AfterEach - @Timeout(30) +// @Timeout(30) public void cancelAllOngoingActions() throws InterruptedException { LOGGER.info("Cancel all ongoing actions..."); try { @@ -395,7 +395,7 @@ public void cancelAllOngoingActions() throws InterruptedException { * @throws Exception */ @Test - @Timeout(30) +// @Timeout(30) public void testTriggerScenePerRemote() throws Exception { System.out.println("testTriggerScenePerRemote"); @@ -494,7 +494,7 @@ public void testTriggerUnitGroupByScene() throws Exception { * @throws Exception */ @Test - @Timeout(20) +// @Timeout(20) public void testTriggerSceneWithAllDevicesOfLocationActionPerRemoteAndVerifiesUnitModification() throws Exception { System.out.println("testTriggerSceneWithAllDevicesOfLocationActionPerRemoteAndVerifiesUnitModification"); @@ -560,7 +560,7 @@ public void testTriggerSceneWithAllDevicesOfLocationActionPerRemoteAndVerifiesUn * @throws Exception */ @Test -// @Timeout(60) +//// @Timeout(60) public void testTriggerSceneWithLocationActionPerRemoteAndVerifiesUnitModification() throws Exception { System.out.println("testTriggerSceneWithLocationActionPerRemoteAndVerifiesUnitModification"); @@ -631,7 +631,7 @@ public void testTriggerSceneWithLocationActionPerRemoteAndVerifiesUnitModificati * @throws Exception */ @Test - @Timeout(20) +// @Timeout(20) public void testIntermediaryActionCancellationOnSceneDeactivation() throws Exception { System.out.println("testTestIntermediaryActionCancellationOnSceneDeactivation"); @@ -702,7 +702,7 @@ public void testIntermediaryActionCancellationOnSceneDeactivation() throws Excep } @Test - @Timeout(30) +// @Timeout(30) public void testActionCancellationViaScene() throws Exception { final LocationRemote rootLocationRemote = Units.getUnit(Registries.getUnitRegistry().getRootLocationConfig(), true, Units.LOCATION); @@ -796,7 +796,7 @@ public void testActionCancellationViaScene() throws Exception { @Test - @Timeout(20) +// @Timeout(20) public void testThatScenesDoNotInterfereEachOther() throws Exception { final long AGGREGATION_TIME = 50; diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/unitgroup/UnitGroupRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/unitgroup/UnitGroupRemoteTest.java index 6e9c70a1df..a640fb41d4 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/unitgroup/UnitGroupRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/unitgroup/UnitGroupRemoteTest.java @@ -70,7 +70,7 @@ public class UnitGroupRemoteTest extends AbstractBCOLocationManagerTest { private static UnitGroupRemote unitGroupRemote; @BeforeAll - @Timeout(30) +// @Timeout(30) public static void loadUnits() throws Throwable { try { UnitConfig unitGroupConfig = registerUnitGroup(); @@ -130,7 +130,7 @@ private static boolean allServiceTemplatesImplementedByUnit(UnitGroupConfig.Buil * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testSetPowerState() throws Exception { System.out.println("setPowerState"); unitGroupRemote.waitForData(); @@ -154,7 +154,7 @@ public void testSetPowerState() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testGetPowerState() throws Exception { System.out.println("getPowerState"); unitGroupRemote.waitForData(); @@ -169,7 +169,7 @@ public void testGetPowerState() throws Exception { * @throws java.lang.Exception if something fails. */ @Test - @Timeout(10) +// @Timeout(10) public void testSetUnsupportedService() throws Exception { System.out.println("testSetUnsupportedService"); @@ -193,7 +193,7 @@ public void testSetUnsupportedService() throws Exception { * @throws Exception if something fails. */ @Test - @Timeout(5) +// @Timeout(5) public void testApplyActionAuthenticated() throws Exception { System.out.println("testApplyActionAuthenticated"); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/user/AbstractBCOUserManagerTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/user/AbstractBCOUserManagerTest.java index 9676f9edcd..312e8e316f 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/user/AbstractBCOUserManagerTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/user/AbstractBCOUserManagerTest.java @@ -42,7 +42,7 @@ public class AbstractBCOUserManagerTest extends AbstractBCOTest { protected static UserManagerLauncher userManagerLauncher; @BeforeAll - @Timeout(30) +// @Timeout(30) public static void setupUserManager() throws Throwable { try { userManagerLauncher = new UserManagerLauncher(); @@ -55,7 +55,7 @@ public static void setupUserManager() throws Throwable { } @AfterAll - @Timeout(30) +// @Timeout(30) public static void tearDownUserManager() throws Throwable { try { if (userManagerLauncher != null) { diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/user/UserRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/user/UserRemoteTest.java index 9a87a66d70..18ebd18bb2 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/user/UserRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/user/UserRemoteTest.java @@ -52,7 +52,7 @@ public class UserRemoteTest extends AbstractBCOUserManagerTest { private static UserRemote userRemote; @BeforeAll - @Timeout(30) +// @Timeout(30) public static void loadUnits() throws Throwable { try { userRemote = Units.getUnit(MockRegistry.testUser, true, UserRemote.class); @@ -65,7 +65,7 @@ public static void loadUnits() throws Throwable { * Test of getUsername method, of class UserRemote. */ @Test - @Timeout(10) +// @Timeout(10) public void testGetUserName() throws Exception { System.out.println("testGetUserName"); userRemote.requestData().get(); @@ -78,7 +78,7 @@ public void testGetUserName() throws Exception { * @throws Exception if an error occurs */ @Test - @Timeout(10) +// @Timeout(10) public void testSetPresenceState() throws Exception { System.out.println("testSetPresenceState"); @@ -98,7 +98,7 @@ public void testSetPresenceState() throws Exception { * @throws Exception if an error occurs */ @Test - @Timeout(10) +// @Timeout(10) public void testSetMultiActivityState() throws Exception { System.out.println("testSetMultiActivityState"); @@ -127,7 +127,7 @@ public void testSetMultiActivityState() throws Exception { * @throws Exception if an error occurs */ @Test - @Timeout(10) +// @Timeout(10) public void testUserTransitState() throws Exception { System.out.println("testUserTransitState"); @@ -149,7 +149,7 @@ public void testUserTransitState() throws Exception { * @throws Exception if an error occurs */ @Test - @Timeout(10) +// @Timeout(10) public void testLocalPositionState() throws Exception { System.out.println("testLocalPositionState"); diff --git a/module/registry/unit-registry/test/src/main/java/org/openbase/bco/registry/unit/test/AbstractBCORegistryTest.java b/module/registry/unit-registry/test/src/main/java/org/openbase/bco/registry/unit/test/AbstractBCORegistryTest.java index b994902c44..65a2cf8e5b 100644 --- a/module/registry/unit-registry/test/src/main/java/org/openbase/bco/registry/unit/test/AbstractBCORegistryTest.java +++ b/module/registry/unit-registry/test/src/main/java/org/openbase/bco/registry/unit/test/AbstractBCORegistryTest.java @@ -57,7 +57,7 @@ public abstract class AbstractBCORegistryTest extends MqttIntegrationTest { final Logger logger = LoggerFactory.getLogger(getClass()); @BeforeEach - @Timeout(30) +// @Timeout(30) public void setupMockRegistry() throws Exception { try { MockRegistryHolder.newMockRegistry(); @@ -68,7 +68,7 @@ public void setupMockRegistry() throws Exception { } @AfterEach - @Timeout(30) +// @Timeout(30) public void tearDownMockRegistry() throws Exception { try { MockRegistryHolder.shutdownMockRegistry(); diff --git a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/DeviceRegistryTest.java b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/DeviceRegistryTest.java index c6507f7372..cd49456d32 100644 --- a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/DeviceRegistryTest.java +++ b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/DeviceRegistryTest.java @@ -71,7 +71,7 @@ public class DeviceRegistryTest extends AbstractBCORegistryTest { * @throws java.lang.Exception */ @Test - @Timeout(5) +// @Timeout(5) public void testRegisterUnitConfigWithUnits() throws Exception { System.out.println("testRegisterUnitConfigWithUnits"); String productNumber = "ABCD-4321"; @@ -111,7 +111,7 @@ public void testRegisterUnitConfigWithUnits() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(5) +// @Timeout(5) public void testRegisteredDeviceConfigWithoutLabel() throws Exception { System.out.println("testRegisteredDeviceConfigWithoutLabel"); String productNumber = "KNHD-4321"; @@ -128,7 +128,7 @@ public void testRegisteredDeviceConfigWithoutLabel() throws Exception { } @Test - @Timeout(15) +// @Timeout(15) public void testUnitConfigUnitTemplateConsistencyHandler() throws Exception { System.out.println("testUnitConfigUnitTemplateConsistencyHandler"); @@ -179,7 +179,7 @@ public void testUnitConfigUnitTemplateConsistencyHandler() throws Exception { } @Test - @Timeout(10) +// @Timeout(10) public void testDeviceClassDeviceConfigUnitConsistencyHandler() throws Exception { System.out.println("testDeviceClassDeviceConfigUnitConsistencyHandler"); @@ -273,7 +273,7 @@ public void testDeviceClassDeviceConfigUnitConsistencyHandler() throws Exception } @Test - @Timeout(5) +// @Timeout(5) public void testBoundingBoxConsistencyHandler() throws Exception { // request a unit @@ -306,7 +306,7 @@ public void testBoundingBoxConsistencyHandler() throws Exception { * @throws java.lang.Exception if anything fails */ @Test - @Timeout(15) +// @Timeout(15) public void testOwnerRemoval() throws Exception { System.out.println("testOwnerRemoval"); @@ -342,7 +342,7 @@ public void testOwnerRemoval() throws Exception { } @Test - @Timeout(15) +// @Timeout(15) public void testInventoryEnablingStateConnection() throws Exception { System.out.println("testInventoryEnablingStateConnection"); ServiceTemplateConfig serviceTemplate1 = ServiceTemplateConfig.newBuilder().setServiceType(ServiceType.POWER_STATE_SERVICE).build(); @@ -399,7 +399,7 @@ public void testInventoryEnablingStateConnection() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(5) +// @Timeout(5) public void testLocationIdInInventoryState() throws Exception { System.out.println("testLocationIdInInventoryState"); DeviceClass clazz = Registries.getClassRegistry().registerDeviceClass(generateDeviceClass("testLocationIdInInventoryState", "103721ggbdk12", "ServiceGMBH")).get(); @@ -419,7 +419,7 @@ public void testLocationIdInInventoryState() throws Exception { * @throws java.lang.Exception */ @Test - @Timeout(5) +// @Timeout(5) public void testRegistrationErrorHandling() throws Exception { System.out.println("testRegistrationErrorHandling"); diff --git a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/LocationRegistryTest.java b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/LocationRegistryTest.java index e854c29b85..f114571fc6 100644 --- a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/LocationRegistryTest.java +++ b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/LocationRegistryTest.java @@ -75,7 +75,7 @@ private static UnitConfig.Builder getConnectionUnitBuilder(final String label) { * @throws Exception if any error occurs */ @Test - @Timeout(15) +// @Timeout(15) public void testRootLocationConsistency() throws Exception { System.out.println("testChildConsistency"); @@ -119,7 +119,7 @@ public void testRootLocationConsistency() throws Exception { * @throws Exception if any error occurs */ @Test - @Timeout(15) +// @Timeout(15) public void testParentChildConsistency() throws Exception { System.out.println("testParentChildConsistency"); @@ -161,7 +161,7 @@ public void testParentChildConsistency() throws Exception { * @throws Exception if any error occurs */ @Test - @Timeout(5) +// @Timeout(5) public void testLoopConsistency() throws Exception { System.out.println("testLoopConsistency"); @@ -197,7 +197,7 @@ public void testLoopConsistency() throws Exception { * @throws Exception if any error occurs */ @Test - @Timeout(5) +// @Timeout(5) public void testConnectionTilesConsistency() throws Exception { System.out.println("testConnectionTilesConsistency"); @@ -243,7 +243,7 @@ public void testConnectionTilesConsistency() throws Exception { * @throws Exception if any error occurs */ @Test - @Timeout(10) +// @Timeout(10) public void testLocationTypeConsistency() throws Exception { System.out.println("testLocationTypeConsistency"); @@ -279,7 +279,7 @@ public void testLocationTypeConsistency() throws Exception { * @throws Exception if any error occurs */ @Test - @Timeout(5) +// @Timeout(5) public void testGetLocationUnitConfigByScope() throws Exception { System.out.println("testGetLocationUnitConfigByScope"); @@ -295,7 +295,7 @@ public void testGetLocationUnitConfigByScope() throws Exception { * @throws Exception if an error occurs */ @Test - @Timeout(5) +// @Timeout(5) public void testRootLocationUnitIds() throws Exception { final UnitConfig rootLocation = Registries.getUnitRegistry().getRootLocationConfig(); assertFalse(rootLocation.getLocationConfig().getUnitIdList().contains(rootLocation.getId()), "The root location contains itself in its unit id list!"); diff --git a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/LocationRemovalTest.java b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/LocationRemovalTest.java index 5cba128d1e..a94d9c8a3d 100644 --- a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/LocationRemovalTest.java +++ b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/LocationRemovalTest.java @@ -51,7 +51,7 @@ public class LocationRemovalTest extends AbstractBCORegistryTest { * @throws Exception */ @Test - @Timeout(15) +// @Timeout(15) public void removeAllLocationsTest() throws Exception { logger.info("RemoveAllLocationsTest"); try { diff --git a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/RegistryFilteringTest.java b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/RegistryFilteringTest.java index daae94c18e..ca51a7c8d9 100644 --- a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/RegistryFilteringTest.java +++ b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/RegistryFilteringTest.java @@ -53,13 +53,13 @@ public class RegistryFilteringTest extends AbstractBCORegistryTest { @AfterEach - @Timeout(30) +// @Timeout(30) public void tearDown() throws Exception { SessionManager.getInstance().completeLogout(); } @Test - @Timeout(10) +// @Timeout(10) public void testRegisteringWhileLoggedIn() throws Exception { System.out.println("testRegisteringWhileLoggedIn"); @@ -86,7 +86,7 @@ public void testRegisteringWhileLoggedIn() throws Exception { * @throws Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testUnitFiltering() throws Exception { System.out.println("testUnitFiltering"); @@ -167,7 +167,7 @@ public void testUnitFiltering() throws Exception { } @Test - @Timeout(10) +// @Timeout(10) public void testRequestingAuthorizationToken() throws Exception { final String adminUserId = Registries.getUnitRegistry().getUnitConfigByAlias(UnitRegistry.ADMIN_USER_ALIAS).getId(); SessionManager.getInstance().loginUser(adminUserId, UserCreationPlugin.ADMIN_PASSWORD, false); diff --git a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/RegistrySyncTest.java b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/RegistrySyncTest.java index bd029e6cdf..ccb0d2e3dd 100644 --- a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/RegistrySyncTest.java +++ b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/RegistrySyncTest.java @@ -33,7 +33,7 @@ public class RegistrySyncTest extends AbstractBCORegistryTest { @Test - @Timeout(5) +// @Timeout(5) public void testRemoteRegistrySync() throws Exception { System.out.println("testRegisterUnitConfigWithUnits"); @@ -44,7 +44,7 @@ public void testRemoteRegistrySync() throws Exception { } @Test - @Timeout(15) +// @Timeout(15) public void testUnitRemoteRegistrySync() throws Exception { System.out.println("testRegisterUnitConfigWithUnits"); diff --git a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/TestBoundToDeviceFlag.java b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/TestBoundToDeviceFlag.java index fde29a9dca..29f16535ed 100644 --- a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/TestBoundToDeviceFlag.java +++ b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/TestBoundToDeviceFlag.java @@ -59,7 +59,7 @@ public class TestBoundToDeviceFlag extends AbstractBCORegistryTest { private Pose poseLightThree; @BeforeEach - @Timeout(30) +// @Timeout(30) public void setupTest() throws Exception { try { deviceClass = Registries.getClassRegistry().registerDeviceClass(generateDeviceClass("Label", "Product Number", "Company", unitTypes)).get(); @@ -114,7 +114,7 @@ private void getUpdatedConfigs() throws CouldNotPerformException { * @throws Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testDeviceNotBoundAndUnitsNotBound() throws Exception { logger.info("testDeviceNotBoundAndUnitsNotBound"); @@ -142,7 +142,7 @@ public void testDeviceNotBoundAndUnitsNotBound() throws Exception { * @throws Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testDeviceBoundAndUnitsNotBound() throws Exception { logger.info("testDeviceBoundAndUnitsNotBound"); @@ -178,7 +178,7 @@ public void testDeviceBoundAndUnitsNotBound() throws Exception { * @throws Exception */ @Test - @Timeout(10) +// @Timeout(10) public void testDeviceNotBoundAndUnitsBound() throws Exception { logger.info("testDeviceBoundAndUnitsNotBound"); @@ -209,7 +209,7 @@ public void testDeviceNotBoundAndUnitsBound() throws Exception { * its unit. */ @Test - @Timeout(10) +// @Timeout(10) public void testDeviceBoundAndUnitsBound() throws Exception { logger.info("testDeviceBoundAndUnitsBound"); diff --git a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/TestWaitUntilReady.java b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/TestWaitUntilReady.java index c03ce28aa6..35ae295580 100644 --- a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/TestWaitUntilReady.java +++ b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/TestWaitUntilReady.java @@ -69,7 +69,7 @@ public TestWaitUntilReady() { } @BeforeAll - @Timeout(30) +// @Timeout(30) public static void setUpClass() throws Throwable { try { MockRegistryHolder.newMockRegistry(); @@ -104,7 +104,7 @@ public void shutdown() { } @AfterAll - @Timeout(30) +// @Timeout(30) public static void tearDownClass() throws Throwable { try { MockRegistryHolder.shutdownMockRegistry(); @@ -114,7 +114,7 @@ public static void tearDownClass() throws Throwable { } @Test - @Timeout(30) +// @Timeout(30) public void testWaitUntilReady() throws Exception { System.out.println("testWaitUntilReady"); diff --git a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/UnitGroupRegistryTest.kt b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/UnitGroupRegistryTest.kt index 0076b73d9a..74b862a949 100644 --- a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/UnitGroupRegistryTest.kt +++ b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/UnitGroupRegistryTest.kt @@ -42,7 +42,7 @@ class UnitGroupRegistryTest : AbstractBCORegistryTest() { * Test if changing the placement of a unit group works. */ @Test - @Timeout(10) +// @Timeout(10) fun testPlacementChange() { val unitConfig = UnitConfig.newBuilder() LabelProcessor.addLabel(unitConfig.labelBuilder, Locale.ENGLISH, "PlacementChangeGroup") @@ -63,7 +63,7 @@ class UnitGroupRegistryTest : AbstractBCORegistryTest() { * Test if it is possible to register unit groups with recursive references. */ @Test - @Timeout(5) +// @Timeout(5) fun `test unit group recursion`() { val colorableLightIds = Registries.getUnitRegistry().getUnitConfigsByUnitType(UnitType.COLORABLE_LIGHT) .map { unitConfig -> unitConfig.id } diff --git a/module/registry/util/src/test/java/org/openbase/bco/registry/mock/MockRegistryTest.java b/module/registry/util/src/test/java/org/openbase/bco/registry/mock/MockRegistryTest.java index 4a8ac5d984..ddbda6b74a 100644 --- a/module/registry/util/src/test/java/org/openbase/bco/registry/mock/MockRegistryTest.java +++ b/module/registry/util/src/test/java/org/openbase/bco/registry/mock/MockRegistryTest.java @@ -43,7 +43,7 @@ public MockRegistryTest() { } @BeforeAll - @Timeout(30) +// @Timeout(30) public static void setUpClass() throws JPServiceException { JPService.setupJUnitTestMode(); } @@ -54,7 +54,7 @@ public static void setUpClass() throws JPServiceException { * @throws org.openbase.jul.exception.InstantiationException */ @Test - @Timeout(120) +// @Timeout(120) public void testMockRegistryCreation() throws Exception { Stopwatch stopwatch = new Stopwatch(); List times = new ArrayList<>(); diff --git a/module/registry/util/src/test/java/org/openbase/bco/registry/mock/RemoteTest.java b/module/registry/util/src/test/java/org/openbase/bco/registry/mock/RemoteTest.java index 2ded31d9e7..2999cf0359 100644 --- a/module/registry/util/src/test/java/org/openbase/bco/registry/mock/RemoteTest.java +++ b/module/registry/util/src/test/java/org/openbase/bco/registry/mock/RemoteTest.java @@ -44,7 +44,7 @@ public class RemoteTest extends MqttIntegrationTest { private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(RemoteTest.class); @BeforeAll - @Timeout(30) +// @Timeout(30) public static void setUpClass() throws Throwable { try { JPService.setupJUnitTestMode(); @@ -55,7 +55,7 @@ public static void setUpClass() throws Throwable { } @AfterAll - @Timeout(30) +// @Timeout(30) public static void tearDownClass() { try { MockRegistryHolder.shutdownMockRegistry(); @@ -71,7 +71,7 @@ public static void tearDownClass() { * @throws java.lang.Exception */ @Test - @Timeout(15) +// @Timeout(15) public void testRestartingDeviceRegistryRemotes() throws Exception { System.out.println("testRestartingDeviceRegistryRemotes"); ClassRegistryRemote deviceRemoteAlwaysOn = new ClassRegistryRemote(); From 90b2b3cdec0a85eed29f6b2ce90be5f3e11a100a Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Sat, 11 Apr 2026 00:38:58 +0200 Subject: [PATCH 27/41] fix ci action and address requested changes of the review. --- .github/workflows/deploy-docker.yml | 2 +- .../bco/dal/remote/action/RemoteAction.java | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/deploy-docker.yml b/.github/workflows/deploy-docker.yml index f87104fd2a..6182b3226e 100644 --- a/.github/workflows/deploy-docker.yml +++ b/.github/workflows/deploy-docker.yml @@ -16,7 +16,7 @@ on: jobs: docker: - # if: ${{ github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'preview') }} + if: ${{ github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'preview') }} runs-on: ubuntu-latest outputs: bco-tags: ${{ steps.bco-meta.outputs.tags }} diff --git a/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/action/RemoteAction.java b/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/action/RemoteAction.java index f107fa08eb..5bf89348da 100644 --- a/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/action/RemoteAction.java +++ b/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/action/RemoteAction.java @@ -619,7 +619,7 @@ public boolean isRunning() { try { if (getActionDescription().getIntermediary()) { - for (final RemoteAction impactedRemoteAction : impactedRemoteActions.stream().toList()) { + for (final RemoteAction impactedRemoteAction : new ArrayList<>(impactedRemoteActions)) { if (impactedRemoteAction.isRunning()) { return true; } @@ -650,7 +650,7 @@ public boolean isDone() { try { if (getActionDescription().getIntermediary()) { - for (final RemoteAction impactedRemoteAction : impactedRemoteActions.stream().toList()) { + for (final RemoteAction impactedRemoteAction : new ArrayList<>(impactedRemoteActions)) { if (!impactedRemoteAction.isDone()) { return false; } @@ -854,7 +854,7 @@ private void cleanup() { // cleanup synchronisation and observation tasks actionDescriptionObservable.reset(); - for (RemoteAction impactedRemoteAction : impactedRemoteActions.stream().toList()) { + for (RemoteAction impactedRemoteAction : new ArrayList<>(impactedRemoteActions)) { impactedRemoteAction.removeActionDescriptionObserver(impactActionObserver); } impactedRemoteActions.clear(); @@ -955,7 +955,7 @@ public void waitUntilDone() throws CouldNotPerformException, InterruptedExceptio try { if (getActionDescription().getIntermediary()) { - for (final RemoteAction impactedRemoteAction : impactedRemoteActions.stream().toList()) { + for (final RemoteAction impactedRemoteAction : new ArrayList<>(impactedRemoteActions)) { impactedRemoteAction.waitUntilDone(); } return; @@ -1006,7 +1006,7 @@ public void waitForActionState(final ActionState.State actionState, final long t try { if (actionDescription.getIntermediary()) { - for (final RemoteAction impactedRemoteAction : impactedRemoteActions.stream().toList()) { + for (final RemoteAction impactedRemoteAction : new ArrayList<>(impactedRemoteActions)) { impactedRemoteAction.waitForActionState(actionState, timeSplit.getTime(), timeSplit.getTimeUnit()); } return; @@ -1093,7 +1093,7 @@ public void waitForRegistration() throws CouldNotPerformException, InterruptedEx } if (getActionDescription().getIntermediary()) { - for (final RemoteAction impactedRemoteAction : impactedRemoteActions.stream().toList()) { + for (final RemoteAction impactedRemoteAction : new ArrayList<>(impactedRemoteActions)) { impactedRemoteAction.waitForRegistration(); } } @@ -1132,7 +1132,7 @@ public void waitForRegistration(final long timeout, final TimeUnit timeUnit) thr } if (getActionDescription().getIntermediary()) { - for (final RemoteAction impactedRemoteAction : impactedRemoteActions.stream().toList()) { + for (final RemoteAction impactedRemoteAction : new ArrayList<>(impactedRemoteActions)) { impactedRemoteAction.waitForRegistration(timeSplit.getTime(), timeSplit.getTimeUnit()); } } @@ -1149,7 +1149,7 @@ public boolean isRegistrationDone() { } if (actionDescription.getIntermediary()) { - for (final RemoteAction impactedRemoteAction : impactedRemoteActions.stream().toList()) { + for (final RemoteAction impactedRemoteAction : new ArrayList<>(impactedRemoteActions)) { if (!impactedRemoteAction.isRegistrationDone()) { return false; } From 48d1e31a0beb25006663661a3a35419bf4931dd0 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Sat, 11 Apr 2026 03:27:49 +0200 Subject: [PATCH 28/41] improve label and id performance by introducing caches. --- .../layer/unit/AbstractUnitController.java | 18 ++++++++++++++++-- .../layer/service/AbstractServiceRemote.java | 2 -- .../remote/layer/unit/AbstractUnitRemote.java | 15 +++++++++++++-- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/module/dal/control/src/main/java/org/openbase/bco/dal/control/layer/unit/AbstractUnitController.java b/module/dal/control/src/main/java/org/openbase/bco/dal/control/layer/unit/AbstractUnitController.java index dfb263371e..0d6313a538 100644 --- a/module/dal/control/src/main/java/org/openbase/bco/dal/control/layer/unit/AbstractUnitController.java +++ b/module/dal/control/src/main/java/org/openbase/bco/dal/control/layer/unit/AbstractUnitController.java @@ -157,6 +157,8 @@ public abstract class AbstractUnitController scheduledActionList; private final Timeout scheduleTimeout; private boolean infrastructure = false; + private String cachedId; + private String cachedLabel; public AbstractUnitController(final DB builder) throws InstantiationException { super(builder); @@ -377,6 +379,10 @@ public UnitConfig applyConfigUpdate(final UnitConfig config) throws CouldNotPerf logger.trace("Unit config change check failed because config is not available yet."); } + // clear caches + cachedId = null; + cachedLabel = null; + try { classDescription = getClass().getSimpleName() + "[" + config.getUnitType() + "[" + LabelProcessor.getBestMatch(config.getLabel()) + "]]"; } catch (NullPointerException | NotAvailableException ex) { @@ -439,6 +445,9 @@ public UnitConfig applyConfigUpdate(final UnitConfig config) throws CouldNotPerf @Override public final String getId() throws NotAvailableException { + if (cachedId != null) { + return cachedId; + } try { UnitConfig tmpConfig = getConfig(); if (!tmpConfig.hasId()) { @@ -449,7 +458,8 @@ public final String getId() throws NotAvailableException { throw new InvalidStateException("unitconfig.id is empty"); } - return tmpConfig.getId(); + cachedId = tmpConfig.getId(); + return cachedId; } catch (CouldNotPerformException ex) { throw new NotAvailableException("Unit", "id", ex); } @@ -457,6 +467,9 @@ public final String getId() throws NotAvailableException { @Override public String getLabel() throws NotAvailableException { + if (cachedLabel != null) { + return cachedLabel; + } try { UnitConfig tmpConfig = getConfig(); if (!tmpConfig.hasLabel()) { @@ -466,7 +479,8 @@ public String getLabel() throws NotAvailableException { if (LabelProcessor.isEmpty(tmpConfig.getLabel())) { throw new InvalidStateException("unitconfig.label is empty"); } - return LabelProcessor.getBestMatch(getConfig().getLabel()); + cachedLabel = LabelProcessor.getBestMatch(getConfig().getLabel()); + return cachedLabel; } catch (CouldNotPerformException ex) { throw new NotAvailableException("Unit", "label", ex); } diff --git a/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/layer/service/AbstractServiceRemote.java b/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/layer/service/AbstractServiceRemote.java index 1c453620e2..c617344ebb 100644 --- a/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/layer/service/AbstractServiceRemote.java +++ b/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/layer/service/AbstractServiceRemote.java @@ -201,12 +201,10 @@ private void updateServiceState() throws CouldNotPerformException { */ @Override public ST getData() throws NotAvailableException { -// synchronized (syncObject) { ??? if (!serviceStateObservable.isValueAvailable()) { throw new NotAvailableException("Data"); } return serviceStateObservable.getValue(); -// } } @Override diff --git a/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/layer/unit/AbstractUnitRemote.java b/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/layer/unit/AbstractUnitRemote.java index e0801800b8..acfaa93ae3 100644 --- a/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/layer/unit/AbstractUnitRemote.java +++ b/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/layer/unit/AbstractUnitRemote.java @@ -99,6 +99,8 @@ public abstract class AbstractUnitRemote extends AbstractAuth private boolean initialized = false; private SessionManager sessionManager; private boolean infrastructure = false; + private volatile String cachedId = null; + private volatile String cachedLabel = null; public AbstractUnitRemote(final Class dataClass) { super(dataClass, UnitConfig.class); @@ -329,6 +331,10 @@ public UnitConfig applyConfigUpdate(final UnitConfig unitConfig) throws CouldNot logger.trace("Unit config change check failed because config is not available yet."); } + // clear caches + invalidateIdCache(); + invalidateLabelCache(); + // update unit templates unitTemplate = Registries.getTemplateRegistry(true).getUnitTemplateByType(Units.getUnitTypeByRemoteClass((Class>) getClass())); @@ -494,17 +500,22 @@ public UnitTemplate getUnitTemplate() throws NotAvailableException { */ @Override public String getLabel() throws NotAvailableException { + if (cachedLabel != null) { + return cachedLabel; + } try { if (getSessionManager().isLoggedIn()) { try { UnitConfig user = Registries.getUnitRegistry().getUnitConfigById(getSessionManager().getUserClientPair().getUserId()); - return LabelProcessor.getLabelByLanguage(user.getUserConfig().getLanguage(), getConfig().getLabel()); + this.cachedLabel = LabelProcessor.getLabelByLanguage(user.getUserConfig().getLanguage(), getConfig().getLabel()); + return cachedLabel; } catch (CouldNotPerformException ex) { // as a backup use the best match result //TODO: this should parse a value from the root location meta config that defines a default label lang for this smart environment. } } - return LabelProcessor.getBestMatch(getConfig().getLabel()); + this.cachedLabel = LabelProcessor.getBestMatch(getConfig().getLabel()); + return cachedLabel; } catch (NullPointerException | NotAvailableException ex) { throw new NotAvailableException("unit label", ex); } From d1c47d732d8bad72e9b22a18c24ede72d5a0ac61 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Sat, 11 Apr 2026 03:33:21 +0200 Subject: [PATCH 29/41] bump jul to latest --- lib/jul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jul b/lib/jul index 9636399ba0..846e43250b 160000 --- a/lib/jul +++ b/lib/jul @@ -1 +1 @@ -Subproject commit 9636399ba0a789c9155e9cac6b62123b24702098 +Subproject commit 846e43250b0e9768d0ad4e1b9dd3c64f444fa628 From e837746dc404f52ef9444b39f8c1d3f9940809fa Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Sat, 11 Apr 2026 03:36:01 +0200 Subject: [PATCH 30/41] fix compile isue --- .../bco/dal/remote/layer/unit/AbstractUnitRemote.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/layer/unit/AbstractUnitRemote.java b/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/layer/unit/AbstractUnitRemote.java index acfaa93ae3..90a328cc26 100644 --- a/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/layer/unit/AbstractUnitRemote.java +++ b/module/dal/remote/src/main/java/org/openbase/bco/dal/remote/layer/unit/AbstractUnitRemote.java @@ -332,8 +332,8 @@ public UnitConfig applyConfigUpdate(final UnitConfig unitConfig) throws CouldNot } // clear caches - invalidateIdCache(); - invalidateLabelCache(); + cachedId = null; + cachedLabel = null; // update unit templates unitTemplate = Registries.getTemplateRegistry(true).getUnitTemplateByType(Units.getUnitTypeByRemoteClass((Class>) getClass())); From 7c3dcc31f8e3130fef545a545d7289c3016d8889 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Sun, 12 Apr 2026 01:57:41 +0200 Subject: [PATCH 31/41] Revert "further disable timeouts" This reverts commit f286ac3bbeb78e6bdd6ae9f60f56e54dd8f8fb39. --- .../ServiceStateTraitMapperFactoryTest.java | 6 ++-- .../mapping/unit/UnitTypeMappingTest.java | 2 +- .../agent/AbsenceEnergySavingAgentTest.java | 2 +- .../app/preset/agent/FireAlarmAgentTest.java | 2 +- .../agent/HeaterEnergySavingAgentTest.java | 2 +- .../IlluminationLightSavingAgentTest.java | 2 +- .../PowerStateSynchroniserAgentTest.java | 2 +- .../preset/agent/PresenceLightAgentTest.java | 2 +- .../agent/AbstractBCOAgentManagerTest.java | 4 +-- .../test/agent/AbstractBCOAppManagerTest.kt | 4 +-- .../openbase/app/test/agent/BCOAppTest.java | 6 ++-- .../bco/app/util/AbstractBCOManagerTest.java | 6 ++-- .../bco/app/util/UnitTransformationTest.java | 2 +- .../SynchronizationProcessorTest.java | 2 +- .../test/AuthenticatedCommunicationTest.java | 4 +-- .../test/AuthenticationFutureListTest.kt | 6 ++-- .../test/AuthenticationTest.java | 4 +-- .../test/AuthenticatorControllerTest.java | 14 ++++---- .../test/AuthorizationHelperTest.java | 12 +++---- .../test/CredentialStoreTest.java | 4 +-- .../test/EncryptionHelperTest.java | 12 +++---- .../test/InitialRegistrationTest.java | 2 +- .../test/ServiceServerManagerTest.java | 2 +- .../test/SessionManagerTest.java | 34 +++++++++---------- .../authentication/test/StayLoggedInTest.kt | 2 +- .../dal/lib/action/ActionComparatorTest.java | 2 +- .../action/ActionDescriptionProcessorTest.kt | 2 +- .../service/ServiceJSonProcessorTest.java | 6 ++-- .../service/ServiceStateProcessorTest.java | 2 +- .../dal/lib/layer/service/ServicesTest.java | 2 +- .../operation/OperationServiceTest.java | 6 ++-- .../provider/ColorStateProviderServiceTest.kt | 8 ++--- .../layer/service/provider/ServicesTest.kt | 2 +- .../test/AbstractBCODeviceManagerTest.java | 6 ++-- .../bco/dal/test/AbstractBCOTest.java | 8 ++--- .../remote/layer/unit/CustomUnitPoolTest.kt | 2 +- .../bco/dal/test/action/ActionChainTest.kt | 4 +-- .../bco/dal/test/action/RemoteActionTest.kt | 6 ++-- .../dal/test/layer/service/ServiceTest.java | 6 ++-- .../unit/AbstractUnitControllerTest.java | 18 +++++----- .../test/layer/unit/BatteryRemoteTest.java | 4 +-- .../dal/test/layer/unit/ButtonRemoteTest.java | 6 ++-- .../layer/unit/ColorableLightRemoteTest.java | 22 ++++++------ ...ableLightRemoteWithAuthenticationTest.java | 16 ++++----- .../layer/unit/DimmableLightRemoteTest.java | 10 +++--- .../dal/test/layer/unit/HandleRemoteTest.java | 4 +-- .../dal/test/layer/unit/LightRemoteTest.java | 6 ++-- .../layer/unit/LightSensorRemoteTest.java | 4 +-- .../layer/unit/MotionDetectorRemoteTest.java | 6 ++-- .../PowerConsumptionSensorRemoteTest.java | 4 +-- .../layer/unit/PowerSwitchRemoteTest.java | 10 +++--- .../layer/unit/ReedContactRemoteTest.java | 4 +-- .../layer/unit/RollerShutterRemoteTest.java | 6 ++-- .../layer/unit/SmokeDetectorRemoteTest.java | 6 ++-- .../layer/unit/TamperDetectorRemoteTest.java | 6 ++-- .../unit/TemperatureControllerRemoteTest.java | 8 ++--- .../unit/TemperatureSensorRemoteTest.java | 6 ++-- .../test/layer/unit/UnitAllocationTest.java | 18 +++++----- .../unit/connection/ConnectionRemoteTest.kt | 2 +- .../unit/device/DalRegisterDeviceTest.java | 4 +-- .../device/DeviceManagerLauncherTest.java | 2 +- .../layer/unit/scene/SceneRemoteTest.java | 18 +++++----- .../unit/unitgroup/UnitGroupRemoteTest.java | 10 +++--- .../unit/user/AbstractBCOUserManagerTest.java | 4 +-- .../test/layer/unit/user/UserRemoteTest.java | 12 +++---- .../unit/test/AbstractBCORegistryTest.java | 4 +-- .../unit/test/DeviceRegistryTest.java | 18 +++++----- .../unit/test/LocationRegistryTest.java | 14 ++++---- .../unit/test/LocationRemovalTest.java | 2 +- .../unit/test/RegistryFilteringTest.java | 8 ++--- .../registry/unit/test/RegistrySyncTest.java | 4 +-- .../unit/test/TestBoundToDeviceFlag.java | 10 +++--- .../unit/test/TestWaitUntilReady.java | 6 ++-- .../unit/test/UnitGroupRegistryTest.kt | 4 +-- .../bco/registry/mock/MockRegistryTest.java | 4 +-- .../bco/registry/mock/RemoteTest.java | 6 ++-- 76 files changed, 249 insertions(+), 249 deletions(-) diff --git a/module/app/cloudconnector/src/test/java/org/openbase/bco/app/cloudconnector/mapping/service/ServiceStateTraitMapperFactoryTest.java b/module/app/cloudconnector/src/test/java/org/openbase/bco/app/cloudconnector/mapping/service/ServiceStateTraitMapperFactoryTest.java index 415e9eadec..94db0dc3b0 100644 --- a/module/app/cloudconnector/src/test/java/org/openbase/bco/app/cloudconnector/mapping/service/ServiceStateTraitMapperFactoryTest.java +++ b/module/app/cloudconnector/src/test/java/org/openbase/bco/app/cloudconnector/mapping/service/ServiceStateTraitMapperFactoryTest.java @@ -50,7 +50,7 @@ public class ServiceStateTraitMapperFactoryTest extends MqttIntegrationTest { private static final Logger LOGGER = LoggerFactory.getLogger(ServiceStateTraitMapperFactoryTest.class); @BeforeEach -// @Timeout(30) + @Timeout(30) public void setupTest() throws Exception { MockRegistryHolder.newMockRegistry(); @@ -58,7 +58,7 @@ public void setupTest() throws Exception { } @AfterEach -// @Timeout(30) + @Timeout(30) public void tearDownTest() { MockRegistryHolder.shutdownMockRegistry(); } @@ -67,7 +67,7 @@ public void tearDownTest() { * Test if for all defined combinations of services and traits a mapper is available. */ @Test -// @Timeout(value = 30) + @Timeout(value = 30) public void testMapperAvailability() { LOGGER.info("testMapperAvailability"); diff --git a/module/app/cloudconnector/src/test/java/org/openbase/bco/app/cloudconnector/mapping/unit/UnitTypeMappingTest.java b/module/app/cloudconnector/src/test/java/org/openbase/bco/app/cloudconnector/mapping/unit/UnitTypeMappingTest.java index f19c21f074..74c9a181d6 100644 --- a/module/app/cloudconnector/src/test/java/org/openbase/bco/app/cloudconnector/mapping/unit/UnitTypeMappingTest.java +++ b/module/app/cloudconnector/src/test/java/org/openbase/bco/app/cloudconnector/mapping/unit/UnitTypeMappingTest.java @@ -46,7 +46,7 @@ public class UnitTypeMappingTest { * @throws IllegalArgumentException if the name of a unitTypeMapping does not lead to the according unitType. */ @Test -// @Timeout(10) + @Timeout(10) public void testUnitTypeValidity() throws IllegalArgumentException { LOGGER.info("testUnitTypeValidity"); for (final UnitTypeMapping unitTypeMapping : UnitTypeMapping.values()) { diff --git a/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/AbsenceEnergySavingAgentTest.java b/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/AbsenceEnergySavingAgentTest.java index d6b45a85f0..7fdea2bde2 100644 --- a/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/AbsenceEnergySavingAgentTest.java +++ b/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/AbsenceEnergySavingAgentTest.java @@ -74,7 +74,7 @@ public class AbsenceEnergySavingAgentTest extends AbstractBCOAgentManagerTest { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testAbsenceEnergySavingAgent() throws Exception { System.out.println("testAbsenceEnergySavingAgent"); diff --git a/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/FireAlarmAgentTest.java b/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/FireAlarmAgentTest.java index e8409a6635..2ff0267ecd 100644 --- a/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/FireAlarmAgentTest.java +++ b/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/FireAlarmAgentTest.java @@ -64,7 +64,7 @@ public class FireAlarmAgentTest extends AbstractBCOAgentManagerTest { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testFireAlarmAgent() throws Exception { System.out.println("testFireAlarmAgent"); diff --git a/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/HeaterEnergySavingAgentTest.java b/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/HeaterEnergySavingAgentTest.java index d89d53cf5b..63552b9ac9 100644 --- a/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/HeaterEnergySavingAgentTest.java +++ b/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/HeaterEnergySavingAgentTest.java @@ -69,7 +69,7 @@ public class HeaterEnergySavingAgentTest extends AbstractBCOAgentManagerTest { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testHeaterEnergySavingAgent() throws Exception { System.out.println("testHeaterEnergySavingAgent"); diff --git a/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/IlluminationLightSavingAgentTest.java b/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/IlluminationLightSavingAgentTest.java index 54fc389993..36a0ddbaac 100644 --- a/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/IlluminationLightSavingAgentTest.java +++ b/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/IlluminationLightSavingAgentTest.java @@ -70,7 +70,7 @@ public class IlluminationLightSavingAgentTest extends AbstractBCOAgentManagerTes * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testIlluminationLightSavingAgent() throws Exception { System.out.println("testIlluminationLightSavingAgent"); diff --git a/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/PowerStateSynchroniserAgentTest.java b/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/PowerStateSynchroniserAgentTest.java index dbd3d679a9..6230420a8e 100644 --- a/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/PowerStateSynchroniserAgentTest.java +++ b/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/PowerStateSynchroniserAgentTest.java @@ -74,7 +74,7 @@ public class PowerStateSynchroniserAgentTest extends AbstractBCOAgentManagerTest * @throws java.lang.Exception */ @Test -// @Timeout(15) + @Timeout(15) public void testPowerStateSyncAgent() throws Exception { System.out.println("testPowerStateSyncAgent"); diff --git a/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/PresenceLightAgentTest.java b/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/PresenceLightAgentTest.java index d2401d9a80..cb88183305 100644 --- a/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/PresenceLightAgentTest.java +++ b/module/app/preset/src/test/java/org/openbase/bco/app/preset/agent/PresenceLightAgentTest.java @@ -134,7 +134,7 @@ public void prepareEnvironment() throws CouldNotPerformException, InterruptedExc * @throws java.lang.Exception */ @Test -// @Timeout(30) + @Timeout(30) public void testPresenceLightAgent() throws Exception { // test if on motion the lights are turned on diff --git a/module/app/test/src/main/java/org/openbase/app/test/agent/AbstractBCOAgentManagerTest.java b/module/app/test/src/main/java/org/openbase/app/test/agent/AbstractBCOAgentManagerTest.java index 2363968f2a..082a756eea 100644 --- a/module/app/test/src/main/java/org/openbase/app/test/agent/AbstractBCOAgentManagerTest.java +++ b/module/app/test/src/main/java/org/openbase/app/test/agent/AbstractBCOAgentManagerTest.java @@ -50,7 +50,7 @@ public abstract class AbstractBCOAgentManagerTest extends BCOAppTest { protected AgentRemote agentRemote = null; @BeforeEach -// @Timeout(30) + @Timeout(30) public void createAgent() throws Exception { prepareEnvironment(); try { @@ -72,7 +72,7 @@ public void createAgent() throws Exception { } @AfterEach -// @Timeout(30) + @Timeout(30) public void removeAgent() throws Exception { Registries.getUnitRegistry().removeUnitConfig(agentConfig); agentRemote.waitForConnectionState(ConnectionState.State.DISCONNECTED); diff --git a/module/app/test/src/main/java/org/openbase/app/test/agent/AbstractBCOAppManagerTest.kt b/module/app/test/src/main/java/org/openbase/app/test/agent/AbstractBCOAppManagerTest.kt index e4cabe4f49..f7a057767e 100644 --- a/module/app/test/src/main/java/org/openbase/app/test/agent/AbstractBCOAppManagerTest.kt +++ b/module/app/test/src/main/java/org/openbase/app/test/agent/AbstractBCOAppManagerTest.kt @@ -51,7 +51,7 @@ abstract class AbstractBCOAppManagerTest : B protected var appController: APP_CLASS? = null @BeforeEach -// @Timeout(30) + @Timeout(30) @Throws(Exception::class) fun prepareAppManager() { try { @@ -111,7 +111,7 @@ abstract class AbstractBCOAppManagerTest : B } @AfterEach -// @Timeout(30) + @Timeout(30) @Throws(Exception::class) fun removeAgent() { if (appConfig != null) { diff --git a/module/app/test/src/main/java/org/openbase/app/test/agent/BCOAppTest.java b/module/app/test/src/main/java/org/openbase/app/test/agent/BCOAppTest.java index 7cc4a5f080..7968737e70 100644 --- a/module/app/test/src/main/java/org/openbase/app/test/agent/BCOAppTest.java +++ b/module/app/test/src/main/java/org/openbase/app/test/agent/BCOAppTest.java @@ -50,7 +50,7 @@ public class BCOAppTest extends AbstractBCOTest { protected static MessageManagerLauncher messageManagerLauncher; @BeforeAll -// @Timeout(30) + @Timeout(30) public static void setupBcoApp() throws Throwable { try { LOGGER.trace("Start device manager..."); @@ -85,7 +85,7 @@ public static void setupBcoApp() throws Throwable { } @AfterAll -// @Timeout(30) + @Timeout(30) public static void tearDownBCOApp() throws Throwable { LOGGER.info("Tear down app tests..."); try { @@ -116,7 +116,7 @@ public static void tearDownBCOApp() throws Throwable { * @throws InterruptedException is thrown if the thread was externally interrupted */ @AfterEach -// @Timeout(30) + @Timeout(30) public void cancelAllOngoingActions() throws InterruptedException { LOGGER.info("Cancel all ongoing actions..."); try { diff --git a/module/app/util/src/test/java/org/openbase/bco/app/util/AbstractBCOManagerTest.java b/module/app/util/src/test/java/org/openbase/bco/app/util/AbstractBCOManagerTest.java index b2d243efa6..ad5b81616f 100644 --- a/module/app/util/src/test/java/org/openbase/bco/app/util/AbstractBCOManagerTest.java +++ b/module/app/util/src/test/java/org/openbase/bco/app/util/AbstractBCOManagerTest.java @@ -54,7 +54,7 @@ public class AbstractBCOManagerTest extends AbstractBCOTest { protected static UserManagerLauncher userManagerLauncher; @BeforeAll -// @Timeout(30) + @Timeout(30) public static void setupBCOManager() throws Throwable { try { agentManagerLauncher = new AgentManagerLauncher(); @@ -75,7 +75,7 @@ public static void setupBCOManager() throws Throwable { } @AfterAll -// @Timeout(30) + @Timeout(30) public static void tearDownBCOManager() throws Throwable { try { if (agentManagerLauncher != null) { @@ -107,7 +107,7 @@ public static void tearDownBCOManager() throws Throwable { * @throws InterruptedException is thrown if the thread was externally interrupted */ @AfterEach -// @Timeout(30) + @Timeout(30) public void cancelAllOngoingActions() throws InterruptedException { LOGGER.info("Cancel all ongoing actions..."); try { diff --git a/module/app/util/src/test/java/org/openbase/bco/app/util/UnitTransformationTest.java b/module/app/util/src/test/java/org/openbase/bco/app/util/UnitTransformationTest.java index ed2cabb28a..94bcb87625 100644 --- a/module/app/util/src/test/java/org/openbase/bco/app/util/UnitTransformationTest.java +++ b/module/app/util/src/test/java/org/openbase/bco/app/util/UnitTransformationTest.java @@ -52,7 +52,7 @@ public UnitTransformationTest() { } @Test -// @Timeout(30) + @Timeout(30) public void testUnitTransformation() throws Exception { System.out.println("testUnitTransformation"); try { diff --git a/module/app/util/src/test/java/org/openbase/bco/device/openhab/registry/synchronizer/SynchronizationProcessorTest.java b/module/app/util/src/test/java/org/openbase/bco/device/openhab/registry/synchronizer/SynchronizationProcessorTest.java index 97346cbb08..fafd9540e0 100644 --- a/module/app/util/src/test/java/org/openbase/bco/device/openhab/registry/synchronizer/SynchronizationProcessorTest.java +++ b/module/app/util/src/test/java/org/openbase/bco/device/openhab/registry/synchronizer/SynchronizationProcessorTest.java @@ -31,7 +31,7 @@ class SynchronizationProcessorTest { @Test -// @Timeout(20) + @Timeout(20) void getUniquePrefix() { assertNotEquals( SynchronizationProcessor.getUniquePrefix("00:17:88:01:08:0c:f4:60-02-fc00"), diff --git a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticatedCommunicationTest.java b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticatedCommunicationTest.java index c379c352a7..06b51756fb 100644 --- a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticatedCommunicationTest.java +++ b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticatedCommunicationTest.java @@ -66,7 +66,7 @@ private static void registerUser() throws Exception { } @BeforeEach -// @Timeout(30) + @Timeout(30) public void setupUser() throws Throwable { // register a user from which a ticket can be validated registerUser(); @@ -78,7 +78,7 @@ public void setupUser() throws Throwable { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testCommunication() throws Exception { final UnitConfig.Builder otherAgentConfig = UnitConfig.newBuilder(); otherAgentConfig.setId("OtherAgent"); diff --git a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticationFutureListTest.kt b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticationFutureListTest.kt index 69ebc7ddb5..82917ab05c 100644 --- a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticationFutureListTest.kt +++ b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticationFutureListTest.kt @@ -19,13 +19,13 @@ class AuthenticationFutureListTest { companion object { @JvmStatic @BeforeAll - // @Timeout(30) + @Timeout(30) fun setup() { JPService.setupJUnitTestMode() } } -// @Timeout(3) + @Timeout(3) @Test fun testTakeIfTerminated() { val completedFuture = FutureProcessor.completedFuture() @@ -42,7 +42,7 @@ class AuthenticationFutureListTest { AuthenticationFutureList.takeIfTerminated(runningFuture) shouldBe null } -// @Timeout(5) + @Timeout(5) @Test fun testScheduledTask() { AuthenticationFutureList.reset() diff --git a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticationTest.java b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticationTest.java index bc50e457d8..e65bb8c9da 100644 --- a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticationTest.java +++ b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticationTest.java @@ -45,7 +45,7 @@ public class AuthenticationTest extends MqttIntegrationTest { public static byte[] serviceServerSecretKey = EncryptionHelper.generateKey(); @BeforeEach -// @Timeout(30) + @Timeout(30) public void setupAuthentication() throws Throwable { JPService.setupJUnitTestMode(); CachedAuthenticationRemote.prepare(); @@ -57,7 +57,7 @@ public void setupAuthentication() throws Throwable { } @AfterEach -// @Timeout(30) + @Timeout(30) public void tearDownAuthentication() { // reset credential store because it could have been changed in a test MockCredentialStore.getInstance().reset(); diff --git a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticatorControllerTest.java b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticatorControllerTest.java index 801865f13d..474b62cbb5 100644 --- a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticatorControllerTest.java +++ b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthenticatorControllerTest.java @@ -59,7 +59,7 @@ public class AuthenticatorControllerTest extends AuthenticationTest { * @throws java.lang.Exception */ @Test -// @Timeout(15) + @Timeout(15) public void testCommunication() throws Exception { System.out.println("testCommunication"); @@ -95,7 +95,7 @@ public void testCommunication() throws Exception { * @throws Exception */ @Test -// @Timeout(5) + @Timeout(5) public void testAuthenticationWithNonExistentUser() { System.out.println("testAuthenticationWithNonExistentUser"); Assertions.assertThrows(ExecutionException.class, () -> { @@ -117,7 +117,7 @@ public void testAuthenticationWithNonExistentUser() { * @throws Exception */ @Test -// @Timeout(5) + @Timeout(5) public void testAuthenticationWithIncorrectPassword() { System.out.println("testAuthenticationWithIncorrectPassword"); @@ -131,7 +131,7 @@ public void testAuthenticationWithIncorrectPassword() { } @Test -// @Timeout(15) + @Timeout(15) public void testChangeCredentials() throws Exception { System.out.println("testChangeCredentials"); @@ -173,7 +173,7 @@ public void testChangeCredentials() throws Exception { * @throws Exception */ @Test -// @Timeout(15) + @Timeout(15) public void testChangeOthersCredentials() throws Exception { System.out.println("testChangeOthersCredentials"); @@ -257,7 +257,7 @@ public void testChangeOthersCredentials() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(15) + @Timeout(15) public void testAsyncCommunication() throws Exception { System.out.println("testAsyncCommunication"); @@ -304,7 +304,7 @@ public void testAsyncCommunication() throws Exception { } @Test -// @Timeout(15) + @Timeout(15) public void testLoginCombinations() throws Exception { final UserClientPair clientSymmetricUserSymmetric = UserClientPair.newBuilder() .setClientId(MockCredentialStore.CLIENT_SYMMETRIC_ID) diff --git a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthorizationHelperTest.java b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthorizationHelperTest.java index b90550813e..3b6e1f3425 100644 --- a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthorizationHelperTest.java +++ b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/AuthorizationHelperTest.java @@ -98,7 +98,7 @@ public AuthorizationHelperTest() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(20) + @Timeout(20) public void testOwnerPermissions() throws Exception { System.out.println("testOwnerPermissions"); @@ -144,7 +144,7 @@ public void testOwnerPermissions() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testGroupPermissions() throws Exception { System.out.println("testGroupPermissions"); PermissionConfig.MapFieldEntry.Builder groupsBuilder = PermissionConfig.MapFieldEntry.newBuilder() @@ -209,7 +209,7 @@ public void testGroupPermissions() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(20) + @Timeout(20) public void testOtherPermissions() throws Exception { System.out.println("testOtherPermissions"); @@ -254,7 +254,7 @@ public void testOtherPermissions() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(20) + @Timeout(20) public void testUserClient() throws Exception { System.out.println("testOtherPermissions"); @@ -298,7 +298,7 @@ public void testUserClient() throws Exception { } @Test -// @Timeout(20) + @Timeout(20) public void testLocationPermission() throws Exception { LocationConfig location1 = LocationConfig.newBuilder().setRoot(false).build(); PermissionConfig.Builder permissionConfigLocation = PermissionConfig.newBuilder().setOtherPermission(NONE); @@ -353,7 +353,7 @@ public void testLocationPermission() throws Exception { * Validate that a user can also be a group with permissions. */ @Test -// @Timeout(20) + @Timeout(20) public void testUserAsGroupPermissions() { // create user id final String userId = "UserWhichIsAlsoAGroup"; diff --git a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/CredentialStoreTest.java b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/CredentialStoreTest.java index d77825f880..c9cb0cee4f 100644 --- a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/CredentialStoreTest.java +++ b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/CredentialStoreTest.java @@ -50,7 +50,7 @@ public CredentialStoreTest() { } @BeforeAll -// @Timeout(30) + @Timeout(30) public static void setUpClass() throws Exception { JPService.setupJUnitTestMode(); JPService.registerProperty(JPResetCredentials.class); @@ -61,7 +61,7 @@ public static void setUpClass() throws Exception { * @throws Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testSavingAndLoading() throws Exception { System.out.println("testSavingAndLoading"); diff --git a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/EncryptionHelperTest.java b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/EncryptionHelperTest.java index 63d1e93c36..4cc68e3d97 100644 --- a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/EncryptionHelperTest.java +++ b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/EncryptionHelperTest.java @@ -45,7 +45,7 @@ public EncryptionHelperTest() { } @Test -// @Timeout(20) + @Timeout(20) public void testGenerateKey() { LOGGER.info("test key generation"); int expLen = 16; @@ -54,7 +54,7 @@ public void testGenerateKey() { } @Test -// @Timeout(10) + @Timeout(10) public void testSymmetricHashing() { LOGGER.info("test if hashing method hashes symmetrically"); byte[] hash1 = EncryptionHelper.hash("test"); @@ -63,7 +63,7 @@ public void testSymmetricHashing() { } @Test -// @Timeout(20) + @Timeout(20) public void testSymmetricEncryptionDecryption() throws Exception { LOGGER.info("test symmetric encryption and decryption"); String str = "test"; @@ -74,7 +74,7 @@ public void testSymmetricEncryptionDecryption() throws Exception { } @Test -// @Timeout(20) + @Timeout(20) public void testAsymmetricEncryptionDecryption() throws Exception { LOGGER.info("test asymmetric encryption and decryption"); String str = "test"; @@ -85,7 +85,7 @@ public void testAsymmetricEncryptionDecryption() throws Exception { } @Test -// @Timeout(10) + @Timeout(10) public void testExceptionsWithWrongKeySymmetric() { LOGGER.info("testExceptionsWithWrongKey"); @@ -101,7 +101,7 @@ public void testExceptionsWithWrongKeySymmetric() { } @Test -// @Timeout(10) + @Timeout(10) public void testExceptionsWithWrongKeyAsymmetric() { LOGGER.info("testExceptionsWithWrongKeyAsymmetric"); diff --git a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/InitialRegistrationTest.java b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/InitialRegistrationTest.java index ac6440a1a0..d1aeea79d3 100644 --- a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/InitialRegistrationTest.java +++ b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/InitialRegistrationTest.java @@ -48,7 +48,7 @@ public InitialRegistrationTest() { * @throws java.lang.Exception */ @Test -// @Timeout(15) + @Timeout(15) public void initialRegistrationTest() throws Exception { LOGGER.info("initialRegistrationTest"); diff --git a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/ServiceServerManagerTest.java b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/ServiceServerManagerTest.java index 97d5beae9c..3cfb9608c8 100644 --- a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/ServiceServerManagerTest.java +++ b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/ServiceServerManagerTest.java @@ -48,7 +48,7 @@ public ServiceServerManagerTest() { * @throws java.lang.Exception */ @Test -// @Timeout(15) + @Timeout(15) public void testServiceServerManagerValidation() throws Exception { System.out.println("testServiceServerManagerValidation"); diff --git a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/SessionManagerTest.java b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/SessionManagerTest.java index 5d1cd8a78f..f4b911ebcb 100644 --- a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/SessionManagerTest.java +++ b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/SessionManagerTest.java @@ -59,7 +59,7 @@ public class SessionManagerTest extends AuthenticationTest { private int notificationCounter = 0; @BeforeEach -// @Timeout(30) + @Timeout(30) public void setupSessionManager() throws Throwable { clientStore = new MockClientStore(); @@ -82,7 +82,7 @@ public void setupSessionManager() throws Throwable { * @throws java.lang.Exception */ @Test -// @Timeout(5) + @Timeout(5) public void registerUser() throws Exception { System.out.println("registerUser"); SessionManager manager = new SessionManager(clientStore); @@ -102,7 +102,7 @@ public void registerUser() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(5) + @Timeout(5) public void loginUser() throws Exception { System.out.println("loginUser"); SessionManager manager = new SessionManager(clientStore); @@ -115,7 +115,7 @@ public void loginUser() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(5) + @Timeout(5) public void loginUserThenOtherUser() throws Exception { System.out.println("loginUserThenOtherUser"); SessionManager manager = new SessionManager(clientStore); @@ -129,7 +129,7 @@ public void loginUserThenOtherUser() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(5) + @Timeout(5) public void loginUserAfterSystemLoginFailure() throws Exception { System.out.println("loginUserAfterSystemLoginFailure"); SessionManager manager = new SessionManager(clientStore); @@ -170,7 +170,7 @@ public void loginUserAfterSystemLoginFailure() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(5) + @Timeout(5) public void isLoggedIn() throws Exception { System.out.println("isLoggedIn"); SessionManager manager = new SessionManager(clientStore); @@ -186,7 +186,7 @@ public void isLoggedIn() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(5) + @Timeout(5) public void logout() throws Exception { System.out.println("logout"); SessionManager manager = new SessionManager(clientStore); @@ -203,7 +203,7 @@ public void logout() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(5) + @Timeout(5) public void registerClientAndLogin() throws Exception { System.out.println("registerClientAndLogin"); SessionManager manager = new SessionManager(clientStore); @@ -238,7 +238,7 @@ public void registerClientAndLogin() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(5) + @Timeout(5) public void registerClientAndLoginAndLoginUserAndLogout() throws Exception { System.out.println("registerClientAndLoginAndLoginUserAndLogout"); SessionManager manager = new SessionManager(clientStore); @@ -281,7 +281,7 @@ public void registerClientAndLoginAndLoginUserAndLogout() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(5) + @Timeout(5) public void removeAdminHimself() { System.out.println("removeAdminHimself"); SessionManager manager = new SessionManager(clientStore); @@ -308,7 +308,7 @@ public void removeAdminHimself() { * @throws java.lang.Exception if something fails. */ @Test -// @Timeout(5) + @Timeout(5) public void removeAdminOther() throws Exception { System.out.println("removeAdminOther"); @@ -330,7 +330,7 @@ public void removeAdminOther() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(5) + @Timeout(5) public void registerClientAsNonAdmin() { System.out.println("registerClientAsNonAdmin"); Assertions.assertThrows(ExecutionException.class, () -> { @@ -355,7 +355,7 @@ public void registerClientAsNonAdmin() { * @throws java.lang.Exception if an exception occurs. */ @Test -// @Timeout(5) + @Timeout(5) public void testChangingPassword() throws Exception { System.out.println("testChangingPassword"); @@ -392,7 +392,7 @@ public void testChangingPassword() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(15) + @Timeout(15) public void setAdmin() throws Exception { System.out.println("setAdmin"); SessionManager manager = new SessionManager(clientStore); @@ -412,7 +412,7 @@ public void setAdmin() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(5) + @Timeout(5) public void setAdminAsNonAdmin() throws Exception { System.out.println("setAdminAsNonAdmin"); Assertions.assertThrows(ExecutionException.class, () -> { @@ -437,7 +437,7 @@ public void setAdminAsNonAdmin() throws Exception { * @throws Exception */ @Test -// @Timeout(5) + @Timeout(5) public void isAdmin() throws Exception { System.out.println("isAdmin"); SessionManager manager = new SessionManager(clientStore); @@ -454,7 +454,7 @@ public void isAdmin() throws Exception { * @throws Exception */ @Test -// @Timeout(5) + @Timeout(5) public void loginObservableTest() throws Exception { System.out.println("loginObservableTest"); diff --git a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/StayLoggedInTest.kt b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/StayLoggedInTest.kt index 8547853696..d0437c236c 100644 --- a/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/StayLoggedInTest.kt +++ b/module/authentication/test/src/test/java/org/openbase/bco/authentication/test/StayLoggedInTest.kt @@ -55,7 +55,7 @@ class StayLoggedInTest : MqttIntegrationTest() { * @throws Exception if something does not work as expected */ @Test -// @Timeout(30) + @Timeout(30) @Throws(Exception::class) fun testStayingLoggedIn() { CachedAuthenticationRemote.prepare() diff --git a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/action/ActionComparatorTest.java b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/action/ActionComparatorTest.java index 9b59ebc0dd..2103b1c4e2 100644 --- a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/action/ActionComparatorTest.java +++ b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/action/ActionComparatorTest.java @@ -47,7 +47,7 @@ public class ActionComparatorTest { * Test the action ranking by creating a number of actions, adding them to a list and validating the order after sorting. */ @Test -// @Timeout(10) + @Timeout(10) public void testActionComparison() { final EmphasisState emphasisState = EmphasisState.newBuilder().setEconomy(0.6).setComfort(0.3).setSecurity(0.1).build(); final ActionComparator actionComparator = new ActionComparator(() -> emphasisState); diff --git a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/action/ActionDescriptionProcessorTest.kt b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/action/ActionDescriptionProcessorTest.kt index abdd3bd572..dda0b39a0d 100644 --- a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/action/ActionDescriptionProcessorTest.kt +++ b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/action/ActionDescriptionProcessorTest.kt @@ -34,7 +34,7 @@ import java.util.* class ActionDescriptionProcessorTest { -// @Timeout(10) + @Timeout(10) @Test fun unitChainSuffixForNonReplaceableAction() { val buttonActionDescription = ActionDescription.newBuilder() diff --git a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/ServiceJSonProcessorTest.java b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/ServiceJSonProcessorTest.java index feae3e8b74..e8cbdb1849 100644 --- a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/ServiceJSonProcessorTest.java +++ b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/ServiceJSonProcessorTest.java @@ -44,7 +44,7 @@ public ServiceJSonProcessorTest() { } @BeforeAll -// @Timeout(30) + @Timeout(30) public static void setUpClass() throws JPServiceException { JPService.setupJUnitTestMode(); } @@ -56,7 +56,7 @@ public static void setUpClass() throws JPServiceException { * @throws java.lang.Exception */ @Test -// @Timeout(15) + @Timeout(15) public void testGetServiceStateClassName() throws Exception { System.out.println("getServiceStateClassName"); Message serviceState; @@ -94,7 +94,7 @@ public void testGetServiceStateClassName() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(15) + @Timeout(15) public void testSerializationPipeline() throws Exception { System.out.println("SerializationPipeline"); Message serviceState; diff --git a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/ServiceStateProcessorTest.java b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/ServiceStateProcessorTest.java index 26f703108b..2311be8a6b 100644 --- a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/ServiceStateProcessorTest.java +++ b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/ServiceStateProcessorTest.java @@ -48,7 +48,7 @@ public class ServiceStateProcessorTest { @Test -// @Timeout(10) + @Timeout(10) public void updateLatestValueOccurrence() throws Exception { PresenceState.Builder builder = PresenceState.newBuilder(); ServiceStateProcessor.updateLatestValueOccurrence(State.PRESENT, 2000, builder); diff --git a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/ServicesTest.java b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/ServicesTest.java index 39b77112f1..74470be5a1 100644 --- a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/ServicesTest.java +++ b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/ServicesTest.java @@ -50,7 +50,7 @@ public class ServicesTest { * @throws Exception if something fails. */ @Test -// @Timeout(20) + @Timeout(20) public void testSuperStateConversion() throws Exception { final BrightnessState brightnessState = BrightnessState.newBuilder().setBrightness(.5d).build(); final Message expectedPowerState = BrightnessStateProviderService.toPowerState(brightnessState); diff --git a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/operation/OperationServiceTest.java b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/operation/OperationServiceTest.java index 840ea86a28..88e9b37b41 100644 --- a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/operation/OperationServiceTest.java +++ b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/operation/OperationServiceTest.java @@ -31,7 +31,7 @@ class OperationServiceTest { @Test -// @Timeout(20) + @Timeout(20) void verifyValueRange() throws VerificationFailedException { OperationService.verifyValueRange("good", 10, 5, 15); OperationService.verifyValueRange("good", 0.10, 0.05, 0.15); @@ -60,7 +60,7 @@ void verifyValueRange() throws VerificationFailedException { } @Test -// @Timeout(20) + @Timeout(20) void verifyValue() throws VerificationFailedException { OperationService.verifyValue("good", 10, 11, 2); OperationService.verifyValue("good", 0.12, 0.11, 0.1); @@ -90,7 +90,7 @@ void verifyValue() throws VerificationFailedException { } @Test -// @Timeout(20) + @Timeout(20) void testEquals() { assertTrue(OperationService.equals(30d, 30d, 0d), "equals check result invalid"); assertTrue(OperationService.equals(30d, 33d, 4d), "equals check result invalid"); diff --git a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderServiceTest.kt b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderServiceTest.kt index e7317491ed..8dd28e294b 100644 --- a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderServiceTest.kt +++ b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderServiceTest.kt @@ -34,7 +34,7 @@ import org.openbase.type.domotic.state.ColorStateType.ColorState class ColorStateProviderServiceTest { @Test -// @Timeout(10) + @Timeout(10) fun `should fix color values once they are defined out of range`() { JPService.setupJUnitTestMode() @@ -68,7 +68,7 @@ class ColorStateProviderServiceTest { } @Test -// @Timeout(10) + @Timeout(10) fun `should handle color state comparison with equal state`() { JPService.setupJUnitTestMode() @@ -108,7 +108,7 @@ class ColorStateProviderServiceTest { } @Test -// @Timeout(10) + @Timeout(10) fun `should handle color state comparison with non equal state`() { JPService.setupJUnitTestMode() @@ -217,7 +217,7 @@ class ColorStateProviderServiceTest { } @Test -// @Timeout(10) + @Timeout(10) fun `should handle color state comparison with neutral state`() { JPService.setupJUnitTestMode() diff --git a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ServicesTest.kt b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ServicesTest.kt index 2ba2bf6da0..36563ace82 100644 --- a/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ServicesTest.kt +++ b/module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ServicesTest.kt @@ -36,7 +36,7 @@ import java.util.function.Consumer class ServicesTest : AbstractBCORegistryTest() { @Test -// @Timeout(value = 30) + @Timeout(value = 30) fun testComputeActionImpact() { val unitRegistry = Registries.getUnitRegistry(true) val serviceState = ServiceStateDescription.newBuilder().apply { diff --git a/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCODeviceManagerTest.java b/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCODeviceManagerTest.java index 7f27abf2e5..369ea76748 100644 --- a/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCODeviceManagerTest.java +++ b/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCODeviceManagerTest.java @@ -40,7 +40,7 @@ public abstract class AbstractBCODeviceManagerTest extends AbstractBCOTest { protected static DeviceManagerLauncher deviceManagerLauncher; @BeforeAll -// @Timeout(30) + @Timeout(30) public static void setupDeviceManager() throws Throwable { try { deviceManagerLauncher = new DeviceManagerLauncher(); @@ -51,7 +51,7 @@ public static void setupDeviceManager() throws Throwable { } @AfterAll -// @Timeout(30) + @Timeout(30) public static void tearDownDeviceManage() throws Throwable { try { if (deviceManagerLauncher != null) { @@ -68,7 +68,7 @@ public static void tearDownDeviceManage() throws Throwable { * @throws InterruptedException is thrown if the thread was externally interrupted */ @BeforeEach -// @Timeout(30) + @Timeout(30) @AfterEach public void cancelAllOngoingActions() throws InterruptedException { LOGGER.info("Cancel all ongoing actions..."); diff --git a/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCOTest.java b/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCOTest.java index 6cae9a30e8..fd633d561d 100644 --- a/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCOTest.java +++ b/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCOTest.java @@ -61,7 +61,7 @@ public abstract class AbstractBCOTest extends MqttIntegrationTest { private final List testActions = Collections.synchronizedList(new ArrayList<>()); @BeforeAll -//// @Timeout(30) +// @Timeout(30) public static void setupBCO() throws Throwable { try { mockRegistry = MockRegistryHolder.newMockRegistry(); @@ -72,7 +72,7 @@ public static void setupBCO() throws Throwable { } @AfterAll -//// @Timeout(30) +// @Timeout(30) public static void tearDownBCO() throws Throwable { try { Units.reset(AbstractBCOTest.class); @@ -84,7 +84,7 @@ public static void tearDownBCO() throws Throwable { } @BeforeEach -// @Timeout(30) + @Timeout(30) public void notifyAboutTestStart() { LOGGER.info("===================================== Start BCO Test ====================================="); LOGGER.debug("Test class: " + getClass().getSimpleName()); @@ -96,7 +96,7 @@ public void notifyAboutTestStart() { * If you want to cancel all actions manually please use method {@code cancelAllTestActions()} to get feedback about the cancellation process. */ @AfterEach -// @Timeout(30) + @Timeout(30) public void autoCancelActionsAfterTestRun() { LOGGER.info("===================================== Finish BCO Test ====================================="); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/remote/layer/unit/CustomUnitPoolTest.kt b/module/dal/test/src/test/java/org/openbase/bco/dal/remote/layer/unit/CustomUnitPoolTest.kt index 8a87b0ed7e..c9ec97278e 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/remote/layer/unit/CustomUnitPoolTest.kt +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/remote/layer/unit/CustomUnitPoolTest.kt @@ -39,7 +39,7 @@ class CustomUnitPoolTest : AbstractBCODeviceManagerTest() { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) @Throws(Exception::class) fun testUnitPool() { val customUnitPool: CustomUnitPool<*, *> = CustomUnitPool>() diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/ActionChainTest.kt b/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/ActionChainTest.kt index 4c5bc15768..c3caec2523 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/ActionChainTest.kt +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/ActionChainTest.kt @@ -19,7 +19,7 @@ class ActionChainTest : AbstractBCOLocationManagerTest() { private val log = LoggerFactory.getLogger(javaClass) @Test -// @Timeout(15) + @Timeout(15) @Throws(Exception::class) fun `when a location is turned of its units that support the power service are registered as impact`() { val rootLocationRemote = @@ -46,7 +46,7 @@ class ActionChainTest : AbstractBCOLocationManagerTest() { } @Test -// @Timeout(15) + @Timeout(15) @Throws(Exception::class) fun `when a light is switched on the locations the light is a part of are registered as impact`() { val rootLocationRemote = diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/RemoteActionTest.kt b/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/RemoteActionTest.kt index d52c6d3bd2..c29dc06f55 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/RemoteActionTest.kt +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/RemoteActionTest.kt @@ -58,7 +58,7 @@ class RemoteActionTest : AbstractBCOLocationManagerTest() { } @BeforeAll -// @Timeout(30) + @Timeout(30) fun setupRemoteActionTest() { // create new user token for test try { @@ -96,7 +96,7 @@ class RemoteActionTest : AbstractBCOLocationManagerTest() { } @Test -// @Timeout(10) + @Timeout(10) @Throws(Exception::class) fun testExecutionAndCancellationWithToken() { println("testExecutionAndCancellationWithToken") @@ -164,7 +164,7 @@ class RemoteActionTest : AbstractBCOLocationManagerTest() { } @Test -//// @Timeout(15) +// @Timeout(15) @Throws(Exception::class) fun testExtensionCancellation() { println("testExtensionCancellation") diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/service/ServiceTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/service/ServiceTest.java index d3bddcce02..3c369c0752 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/service/ServiceTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/service/ServiceTest.java @@ -54,7 +54,7 @@ public class ServiceTest extends AbstractBCOTest { * Test of getServiceStateClass method, of class Service. */ @Test -// @Timeout(10) + @Timeout(10) public void testDetectServiceDataClass() throws Exception { System.out.println("detectServiceDataClass"); try { @@ -71,7 +71,7 @@ public void testDetectServiceDataClass() throws Exception { * Test of getServiceStateEnumValues method, of class Service. */ @Test -// @Timeout(10) + @Timeout(10) public void testGetServiceStateValues() throws Exception { System.out.println("getServiceStateEnumValues"); try { @@ -89,7 +89,7 @@ public void testGetServiceStateValues() throws Exception { * Test of getServiceStateEnumValues method, of class Service. */ @Test -// @Timeout(10) + @Timeout(10) public void testGenerateServiceStateBuilder() throws Exception { System.out.println("getServiceStateEnumValues"); try { diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/AbstractUnitControllerTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/AbstractUnitControllerTest.java index 6774588a8a..3594796974 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/AbstractUnitControllerTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/AbstractUnitControllerTest.java @@ -76,7 +76,7 @@ public AbstractUnitControllerTest() { } @BeforeAll -// @Timeout(30) + @Timeout(30) public static void loginUser() throws Throwable { colorableLightRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.COLORABLE_LIGHT), true, Units.COLORABLE_LIGHT); colorableLightController = deviceManagerLauncher.getLaunchable().getUnitControllerRegistry().get(colorableLightRemote.getId()); @@ -89,13 +89,13 @@ public static void loginUser() throws Throwable { } @AfterAll -// @Timeout(30) + @Timeout(30) public static void logoutUser() throws Throwable { sessionManager.logout(); } @BeforeEach -// @Timeout(30) + @Timeout(30) public void setupUnitController() throws CouldNotPerformException, InterruptedException, TimeoutException, ExecutionException { for (ActionDescription actionDescription : colorableLightController.getActionList()) { @@ -110,14 +110,14 @@ public void setupUnitController() throws CouldNotPerformException, InterruptedEx } @AfterEach -// @Timeout(30) + @Timeout(30) public void tearDownUnitController() throws CouldNotPerformException, InterruptedException, TimeoutException, ExecutionException { // cleanup leftover actions which were manually submitted to the controller. colorableLightController.cancelAllActions(); } @Test -// @Timeout(30) + @Timeout(30) public void applyDataStateUpdateTest() { try { colorableLightController.applyServiceState(States.Power.ON, ServiceType.POWER_STATE_SERVICE); @@ -145,7 +145,7 @@ public void applyDataStateUpdateTest() { } @Test -// @Timeout(30) + @Timeout(30) public void applyCustomDataStateUpdateTest() { try { for (int i = 0; i < 10; i++) { @@ -182,7 +182,7 @@ public void applyCustomDataStateUpdateTest() { } @Test -// @Timeout(30) + @Timeout(30) public void applyCustomDataStateFeedbackLoopTest() { try { colorableLightController.applyServiceState(Power.OFF, ServiceType.POWER_STATE_SERVICE); @@ -227,7 +227,7 @@ public void applyCustomDataStateFeedbackLoopTest() { } @Test -// @Timeout(30) + @Timeout(30) public void rejectUpdateWhenStateIsCompatibleTest() { try { final RemoteAction mainAction = waitForExecution(colorableLightRemote.setColorState(Color.BLUE)); @@ -276,7 +276,7 @@ public void rejectUpdateWhenStateIsCompatibleTest() { } @Test -// @Timeout(30) + @Timeout(30) public void futureSyncTest() throws InterruptedException, ExecutionException, TimeoutException, CouldNotPerformException { String anotherColorableLightId = null; diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/BatteryRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/BatteryRemoteTest.java index 8f114fa07c..9ccaf784a4 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/BatteryRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/BatteryRemoteTest.java @@ -50,7 +50,7 @@ public BatteryRemoteTest() { } @BeforeAll -// @Timeout(30) + @Timeout(30) public static void loadUnits() throws Throwable { batteryRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.BATTERY), true, BatteryRemote.class); } @@ -68,7 +68,7 @@ public void testNotifyUpdated() { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testGetBatteryLevel() throws Exception { try { System.out.println("getBatteryLevel"); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ButtonRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ButtonRemoteTest.java index f859b0dc8d..388c89c572 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ButtonRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ButtonRemoteTest.java @@ -50,7 +50,7 @@ public ButtonRemoteTest() { } @BeforeAll -// @Timeout(30) + @Timeout(30) public static void loadUnits() throws Throwable { buttonRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.BUTTON), true, ButtonRemote.class); } @@ -61,7 +61,7 @@ public static void loadUnits() throws Throwable { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testGetButtonState() throws Exception { System.out.println("getButtonState"); ButtonState buttonState = ButtonState.newBuilder().setValue(ButtonState.State.PRESSED).build(); @@ -81,7 +81,7 @@ public void testGetButtonState() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testGetButtonStateTimestamp() throws Exception { System.out.println("testGetButtonStateTimestamp"); long timestamp; diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ColorableLightRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ColorableLightRemoteTest.java index d78eef59ce..0ba416d874 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ColorableLightRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ColorableLightRemoteTest.java @@ -59,7 +59,7 @@ public class ColorableLightRemoteTest extends AbstractBCODeviceManagerTest { private int powerStateObserverUpdateNumber = 0; @BeforeAll -// @Timeout(30) + @Timeout(30) public static void loadUnits() throws Throwable { colorableLightRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.COLORABLE_LIGHT), true, ColorableLightRemote.class); } @@ -70,7 +70,7 @@ public static void loadUnits() throws Throwable { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testSetColor_Color() throws Exception { System.out.println("setColor"); HSBColor color = HSBColor.newBuilder().setBrightness(0.50).setSaturation(0.70).setHue(150).build(); @@ -84,7 +84,7 @@ public void testSetColor_Color() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testSetColor_HSBColor() throws Exception { System.out.println("setColor"); HSBColor color = HSBColor.newBuilder().setHue(50).setSaturation(0.50).setBrightness(0.50).build(); @@ -98,7 +98,7 @@ public void testSetColor_HSBColor() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testSetColor_InvalidHSBColor() throws Exception { System.out.println("setColor"); @@ -134,7 +134,7 @@ public void testSetColor_InvalidHSBColor() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testRemoteGetColor() throws Exception { System.out.println("getColor"); HSBColor color = HSBColor.newBuilder().setHue(66).setSaturation(0.63).setBrightness(0.33).build(); @@ -148,7 +148,7 @@ public void testRemoteGetColor() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testSetPowerState() throws Exception { System.out.println("setPowerState"); PowerState state = PowerState.newBuilder().setValue(PowerState.State.ON).build(); @@ -162,7 +162,7 @@ public void testSetPowerState() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testGetPowerState() throws Exception { System.out.println("getPowerState"); PowerState state = PowerState.newBuilder().setValue(PowerState.State.OFF).build(); @@ -176,7 +176,7 @@ public void testGetPowerState() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testSetBrightness() throws Exception { System.out.println("setBrightness"); Double brightness = 0.75d; @@ -191,7 +191,7 @@ public void testSetBrightness() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testGetBrightness() throws Exception { System.out.println("getBrightness"); Double brightness = 0.25d; @@ -201,7 +201,7 @@ public void testGetBrightness() throws Exception { } @Test -// @Timeout(10) + @Timeout(10) public void testSetNeutralWhite() throws Exception { System.out.println("testSetNeutralWhite"); waitForExecution(colorableLightRemote.setNeutralWhite()); @@ -214,7 +214,7 @@ public void testSetNeutralWhite() throws Exception { * @throws Exception if something fails. */ @Test -// @Timeout(15) + @Timeout(15) public void testPowerStateObserver() throws Exception { System.out.println("testPowerStateObserver"); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ColorableLightRemoteWithAuthenticationTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ColorableLightRemoteWithAuthenticationTest.java index 51a80a7275..a5803167e8 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ColorableLightRemoteWithAuthenticationTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ColorableLightRemoteWithAuthenticationTest.java @@ -90,13 +90,13 @@ public ColorableLightRemoteWithAuthenticationTest() { } @BeforeAll -// @Timeout(30) + @Timeout(30) public static void registerProperties() throws Throwable { JPService.registerProperty(JPAuthentication.class, true); } @BeforeEach -// @Timeout(30) + @Timeout(30) public void prepareTest() throws CouldNotPerformException, InterruptedException, ExecutionException { adminSessionManager.loginUser(Registries.getUnitRegistry().getUnitConfigByAlias(UnitRegistry.ADMIN_USER_ALIAS).getId(), UserCreationPlugin.ADMIN_PASSWORD, false); @@ -110,7 +110,7 @@ public void prepareTest() throws CouldNotPerformException, InterruptedException, } @AfterEach -// @Timeout(30) + @Timeout(30) public void tearDownTest() throws CouldNotPerformException, ExecutionException, InterruptedException { adminSessionManager.logout(); colorableLightRemote.setSessionManager(SessionManager.getInstance()); @@ -122,7 +122,7 @@ public void tearDownTest() throws CouldNotPerformException, ExecutionException, * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testSetColorWithAuthentication() throws Exception { System.out.println("testSetColorWithAuthentication"); @@ -138,7 +138,7 @@ public void testSetColorWithAuthentication() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testSetColorWithClientWithoutAuthentication() throws Exception { System.out.println("testSetColorWithClientWithoutAuthentication"); @@ -196,7 +196,7 @@ public void testSetColorWithClientWithoutAuthentication() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testSetColorWithUserWithoutAuthentication() throws Exception { System.out.println("testSetColorWithClientWithoutAuthentication"); @@ -227,7 +227,7 @@ public void testSetColorWithUserWithoutAuthentication() throws Exception { } @Test -// @Timeout(15) + @Timeout(15) public void testApplyActionWithToken() throws Exception { System.out.println("testApplyActionWithToken"); @@ -313,7 +313,7 @@ public void testApplyActionWithToken() throws Exception { } @Test -// @Timeout(15) + @Timeout(15) public void testApplyActionViaServiceRemoteWithToken() throws Exception { System.out.println("testApplyActionViaServiceRemoteWithToken"); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/DimmableLightRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/DimmableLightRemoteTest.java index 4d6da29a4b..3fa6760c7a 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/DimmableLightRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/DimmableLightRemoteTest.java @@ -48,7 +48,7 @@ public DimmableLightRemoteTest() { } @BeforeAll -// @Timeout(30) + @Timeout(30) public static void loadUnits() throws Throwable { dimmableLightRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.DIMMABLE_LIGHT), true, DimmableLightRemote.class); } @@ -59,7 +59,7 @@ public static void loadUnits() throws Throwable { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testSetPower() throws Exception { System.out.println("setPowerState"); PowerState state = PowerState.newBuilder().setValue(PowerState.State.ON).build(); @@ -73,7 +73,7 @@ public void testSetPower() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testGetPower() throws Exception { System.out.println("getPowerState"); deviceManagerLauncher.getLaunchable().getUnitControllerRegistry().get(dimmableLightRemote.getId()).applyServiceState(Power.ON, ServiceType.POWER_STATE_SERVICE); @@ -87,7 +87,7 @@ public void testGetPower() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testSetBrightness() throws Exception { System.out.println("setBrightness"); Double brightness = 0.66d; @@ -102,7 +102,7 @@ public void testSetBrightness() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testGetBrightness() throws Exception { System.out.println("getBrightness"); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/HandleRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/HandleRemoteTest.java index 1da0dec75f..76cf850a0f 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/HandleRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/HandleRemoteTest.java @@ -47,7 +47,7 @@ public HandleRemoteTest() { } @BeforeAll -// @Timeout(30) + @Timeout(30) public static void loadUnits() throws Throwable { handleRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.HANDLE), true, HandleRemote.class); } @@ -65,7 +65,7 @@ public void testNotifyUpdated() { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testGetRotaryHandleState() throws Exception { System.out.println("getRotaryHandleState"); HandleState handlestate = HandleState.newBuilder().setPosition(90).build(); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/LightRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/LightRemoteTest.java index 2c712a2c03..9c54698c1d 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/LightRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/LightRemoteTest.java @@ -46,7 +46,7 @@ public LightRemoteTest() { } @BeforeAll -// @Timeout(30) + @Timeout(30) public static void loadUnits() throws Throwable { lightRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.LIGHT), true, LightRemote.class); } @@ -57,7 +57,7 @@ public static void loadUnits() throws Throwable { * @throws java.lang.Exception */ @Test -// @Timeout(15) + @Timeout(15) public void testSetPowerState() throws Exception { System.out.println("setPowerState"); waitForExecution(lightRemote.setPowerState(Power.ON)); @@ -70,7 +70,7 @@ public void testSetPowerState() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testGetPowerState() throws Exception { System.out.println("getPowerState"); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/LightSensorRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/LightSensorRemoteTest.java index 0f2fc88330..c2848f8e27 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/LightSensorRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/LightSensorRemoteTest.java @@ -46,7 +46,7 @@ public LightSensorRemoteTest() { } @BeforeAll -// @Timeout(30) + @Timeout(30) public static void loadUnits() throws Throwable { lightSensorRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.LIGHT_SENSOR), true, LightSensorRemote.class); } @@ -57,7 +57,7 @@ public static void loadUnits() throws Throwable { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testGetIlluminance() throws Exception { System.out.println("getIlluminance"); double illuminance = 0.5; diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/MotionDetectorRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/MotionDetectorRemoteTest.java index 421a1886a4..40a66b14eb 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/MotionDetectorRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/MotionDetectorRemoteTest.java @@ -53,7 +53,7 @@ public MotionDetectorRemoteTest() { } @BeforeAll -// @Timeout(30) + @Timeout(30) public static void loadUnits() throws Throwable { motionDetectorRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.MOTION_DETECTOR), true, MotionDetectorRemote.class); } @@ -64,7 +64,7 @@ public static void loadUnits() throws Throwable { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testGetMotionState() throws Exception { System.out.println("getMotionState"); @@ -80,7 +80,7 @@ public void testGetMotionState() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testGetMotionStateTimestamp() throws Exception { LOGGER.debug("testGetMotionStateTimestamp"); long timestamp; diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/PowerConsumptionSensorRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/PowerConsumptionSensorRemoteTest.java index 4a2bbff244..2f5b51d55f 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/PowerConsumptionSensorRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/PowerConsumptionSensorRemoteTest.java @@ -47,7 +47,7 @@ public PowerConsumptionSensorRemoteTest() { } @BeforeAll -// @Timeout(30) + @Timeout(30) public static void loadUnits() throws Throwable { powerConsumptionRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.POWER_CONSUMPTION_SENSOR), true, PowerConsumptionSensorRemote.class); } @@ -66,7 +66,7 @@ public void testNotifyUpdated() { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testGetPowerConsumption() throws Exception { System.out.println("getPowerConsumption"); double consumption = 200d; diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/PowerSwitchRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/PowerSwitchRemoteTest.java index a6e72363aa..6936fdb5d4 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/PowerSwitchRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/PowerSwitchRemoteTest.java @@ -65,7 +65,7 @@ public PowerSwitchRemoteTest() { } @BeforeAll -// @Timeout(30) + @Timeout(30) public static void loadUnits() throws Throwable { powerSwitchRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.POWER_SWITCH), true, PowerSwitchRemote.class); } @@ -76,7 +76,7 @@ public static void loadUnits() throws Throwable { * @throws java.lang.Exception */ @Test -// @Timeout(3) + @Timeout(3) public void testSetPowerState() throws Exception { waitForExecution(powerSwitchRemote.setPowerState(Power.ON)); assertEquals(Power.ON.getValue(), powerSwitchRemote.getData().getPowerState().getValue(), "Power state has not been set in time!"); @@ -88,7 +88,7 @@ public void testSetPowerState() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(3) + @Timeout(3) public void testGetPowerState() throws Exception { // apply service state final UnitController unitController = deviceManagerLauncher.getLaunchable().getUnitControllerRegistry().get(powerSwitchRemote.getId()); @@ -116,7 +116,7 @@ public void testGetPowerState() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(60) + @Timeout(60) @RepeatedTest(5) public void testPowerStateServicePerformance() throws Exception { System.out.println("testPowerStateServicePerformance"); @@ -192,7 +192,7 @@ public void testPowerStateServicePerformance() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(60) + @Timeout(60) public void testPowerStateServiceCancellationPerformance() throws Exception { final Random random = new Random(); final ActionParameter parameter = ActionParameter.newBuilder().setExecutionTimePeriod(100000000).build(); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ReedContactRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ReedContactRemoteTest.java index b04eb6a164..7893879514 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ReedContactRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/ReedContactRemoteTest.java @@ -46,7 +46,7 @@ public ReedContactRemoteTest() { } @BeforeAll -// @Timeout(30) + @Timeout(30) public static void loadUnits() throws Throwable { reedContactRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.REED_CONTACT), true, ReedContactRemote.class); } @@ -57,7 +57,7 @@ public static void loadUnits() throws Throwable { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testGetReedSwitchState() throws Exception { System.out.println("getReedSwitchState"); deviceManagerLauncher.getLaunchable().getUnitControllerRegistry().get(reedContactRemote.getId()).applyServiceState(Contact.OPEN, ServiceType.CONTACT_STATE_SERVICE); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/RollerShutterRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/RollerShutterRemoteTest.java index 5623f12927..060b5e493c 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/RollerShutterRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/RollerShutterRemoteTest.java @@ -48,7 +48,7 @@ public RollerShutterRemoteTest() { } @BeforeAll -// @Timeout(30) + @Timeout(30) public static void loadUnits() throws Throwable { rollerShutterRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.ROLLER_SHUTTER), true, RollerShutterRemote.class); } @@ -59,7 +59,7 @@ public static void loadUnits() throws Throwable { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testSetShutterState() throws Exception { System.out.println("setShutterState"); BlindState state = BlindState.newBuilder().setValue(BlindState.State.DOWN).build(); @@ -73,7 +73,7 @@ public void testSetShutterState() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testGetShutterState() throws Exception { System.out.println("getShutterState"); final BlindState blindState = BlindState.newBuilder().setValue(State.UP).build(); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/SmokeDetectorRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/SmokeDetectorRemoteTest.java index 4eb6b54312..be640a62d1 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/SmokeDetectorRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/SmokeDetectorRemoteTest.java @@ -44,7 +44,7 @@ public class SmokeDetectorRemoteTest extends AbstractBCODeviceManagerTest { private static SmokeDetectorRemote smokeDetectorRemote; @BeforeAll -// @Timeout(30) + @Timeout(30) public static void setupTest() throws Throwable { smokeDetectorRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.SMOKE_DETECTOR), true, SmokeDetectorRemote.class); } @@ -55,7 +55,7 @@ public static void setupTest() throws Throwable { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testGetSmokeAlarmState() throws Exception { System.out.println("getSmokeAlarmState"); AlarmState alarmState = AlarmState.newBuilder().setValue(AlarmState.State.ALARM).build(); @@ -70,7 +70,7 @@ public void testGetSmokeAlarmState() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testGetSmokeState() throws Exception { System.out.println("getSmokeState"); SmokeState smokeState = SmokeState.newBuilder().setValue(SmokeState.State.SOME_SMOKE).setSmokeLevel(0.13d).build(); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/TamperDetectorRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/TamperDetectorRemoteTest.java index b243e4900d..858c25e5f6 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/TamperDetectorRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/TamperDetectorRemoteTest.java @@ -51,7 +51,7 @@ public TamperDetectorRemoteTest() { } @BeforeAll -// @Timeout(30) + @Timeout(30) public static void setupTest() throws Throwable { tamperDetectorRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.TAMPER_DETECTOR), true, TamperDetectorRemote.class); } @@ -69,7 +69,7 @@ public void testNotifyUpdated() { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testGetTamperState() throws Exception { System.out.println("getTamperState"); TamperState tamperState = TamperState.newBuilder().setValue(TamperState.State.TAMPER).build(); @@ -84,7 +84,7 @@ public void testGetTamperState() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testGetTamperStateTimestamp() throws Exception { System.out.println("testGetTamperStateTimestamp"); long timestamp; diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/TemperatureControllerRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/TemperatureControllerRemoteTest.java index 8b9c6dcecb..77808686e6 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/TemperatureControllerRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/TemperatureControllerRemoteTest.java @@ -46,7 +46,7 @@ public TemperatureControllerRemoteTest() { } @BeforeAll -// @Timeout(30) + @Timeout(30) public static void setupTest() throws Throwable { temperatureControllerRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.TEMPERATURE_CONTROLLER), true, TemperatureControllerRemote.class); } @@ -57,7 +57,7 @@ public static void setupTest() throws Throwable { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testSetTargetTemperature() throws Exception { System.out.println("setTargetTemperature"); double temperature = 42.0F; @@ -73,7 +73,7 @@ public void testSetTargetTemperature() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testGetTargetTemperature() throws Exception { System.out.println("getTargetTemperature"); @@ -90,7 +90,7 @@ public void testGetTargetTemperature() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testGetTemperature() throws Exception { System.out.println("getTemperature"); double temperature = 37.0F; diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/TemperatureSensorRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/TemperatureSensorRemoteTest.java index 14ed746cd6..b2a57f533c 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/TemperatureSensorRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/TemperatureSensorRemoteTest.java @@ -48,7 +48,7 @@ public TemperatureSensorRemoteTest() { } @BeforeAll -// @Timeout(30) + @Timeout(30) public static void setupTest() throws Throwable { temperatureSensorRemote = Units.getUnitByAlias(MockRegistry.getUnitAlias(UnitType.TEMPERATURE_SENSOR), true, TemperatureSensorRemote.class); } @@ -66,7 +66,7 @@ public void testNotifyUpdated() { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testGetTemperature() throws Exception { System.out.println("getTemperature"); double temperature = 37.0F; @@ -82,7 +82,7 @@ public void testGetTemperature() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testGetTemperatureAlarmState() throws Exception { System.out.println("getTemperatureAlarmState"); AlarmState alarmState = AlarmState.newBuilder().setValue(AlarmState.State.ALARM).build(); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/UnitAllocationTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/UnitAllocationTest.java index 9224985d0e..59b67aaae6 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/UnitAllocationTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/UnitAllocationTest.java @@ -83,7 +83,7 @@ public UnitAllocationTest() { } @BeforeAll -// @Timeout(30) + @Timeout(30) public static void setUpClass() throws Throwable { // uncomment to enable debug mode @@ -99,7 +99,7 @@ public static void setUpClass() throws Throwable { } @BeforeEach -// @Timeout(30) + @Timeout(30) public void loginUser() throws Exception { sessionManager.loginUser(Registries.getUnitRegistry().getUnitConfigByAlias(UnitRegistry.ADMIN_USER_ALIAS).getId(), UserCreationPlugin.ADMIN_PASSWORD, false); @@ -109,7 +109,7 @@ public void loginUser() throws Exception { } @AfterEach -// @Timeout(30) + @Timeout(30) public void logoutUser() { sessionManager.logout(); } @@ -120,7 +120,7 @@ public void logoutUser() { * @throws Exception if an error occurs. */ @Test -// @Timeout(5) + @Timeout(5) public void testActionStateNotifications() throws Exception { LOGGER.info("testActionStateNotifications"); // expected order of action states @@ -178,7 +178,7 @@ public void testActionStateNotifications() throws Exception { * @throws Exception if an error occurs. */ @Test -// @Timeout(5) + @Timeout(5) public void testMultiActionsBySameInitiator() throws Exception { LOGGER.info("testMultiActionsBySameInitiator"); // set the power state of the colorable light @@ -213,7 +213,7 @@ public void testMultiActionsBySameInitiator() throws Exception { * @throws Exception if an error occurs. */ @Test -// @Timeout(10) + @Timeout(10) public void testRescheduling() throws Exception { LOGGER.info("testRescheduling"); @@ -266,7 +266,7 @@ public void testRescheduling() throws Exception { * @throws Exception if an error occurs. */ @Test -// @Timeout(15) + @Timeout(15) public void testPriorityHandling() throws Exception { LOGGER.info("testPriorityHandling"); @@ -346,7 +346,7 @@ public void testPriorityHandling() throws Exception { * @throws Exception if an error occurs. */ @Test -// @Timeout(5) + @Timeout(5) public void testFinalizationAfterExecutionTimePeriodPassed() throws Exception { LOGGER.info("testFinalizationAfterExecutionTimePeriodPassed"); @@ -414,7 +414,7 @@ public void testFinalizationAfterExecutionTimePeriodPassed() throws Exception { * @throws Exception if an error occurs. */ @Test -// @Timeout(15) + @Timeout(15) public void testActionExtension() throws Exception { LOGGER.info("testActionExtension"); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/connection/ConnectionRemoteTest.kt b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/connection/ConnectionRemoteTest.kt index 714d19ca8a..7397ef8a6a 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/connection/ConnectionRemoteTest.kt +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/connection/ConnectionRemoteTest.kt @@ -44,7 +44,7 @@ class ConnectionRemoteTest : AbstractBCOLocationManagerTest() { * @throws Exception */ @Test -// @Timeout(5) + @Timeout(5) fun testDoorStateUpdate() { println("testDoorStateUpdate") diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/device/DalRegisterDeviceTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/device/DalRegisterDeviceTest.java index d025e41df6..97356535b4 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/device/DalRegisterDeviceTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/device/DalRegisterDeviceTest.java @@ -73,7 +73,7 @@ public DalRegisterDeviceTest() { * @throws Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testRegisterDeviceWhileRunning() throws Exception { System.out.println("testRegisterDeviceWhileRunning"); @@ -158,7 +158,7 @@ public void testRegisterDeviceWhileRunning() throws Exception { private boolean running = true; @Test -// @Timeout(30) + @Timeout(30) public void testRegisteringManyDevices() throws Exception { System.out.println("testRegisteringManyDevices"); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/device/DeviceManagerLauncherTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/device/DeviceManagerLauncherTest.java index 56344e64dc..14b1e1cfba 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/device/DeviceManagerLauncherTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/device/DeviceManagerLauncherTest.java @@ -45,7 +45,7 @@ public class DeviceManagerLauncherTest extends AbstractBCOTest { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testShutdown() throws Exception { DeviceManagerLauncher instance = new DeviceManagerLauncher(); try { diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java index 9a547290ea..fd09d21e11 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java @@ -150,7 +150,7 @@ public SceneRemoteTest() { } @BeforeAll -// @Timeout(30) + @Timeout(30) public static void setupSceneTest() throws Throwable { try { //JPService.registerProperty(JPLogLevel.class, LogLevel.DEBUG); @@ -179,7 +179,7 @@ public static void setupSceneTest() throws Throwable { } @AfterAll -// @Timeout(30) + @Timeout(30) public static void tearDownSceneTest() throws Throwable { try { if (sceneManagerLauncher != null) { @@ -377,7 +377,7 @@ private static String registerUnitGroup() throws CouldNotPerformException { * @throws InterruptedException is thrown if the thread was externally interrupted */ @AfterEach -// @Timeout(30) + @Timeout(30) public void cancelAllOngoingActions() throws InterruptedException { LOGGER.info("Cancel all ongoing actions..."); try { @@ -395,7 +395,7 @@ public void cancelAllOngoingActions() throws InterruptedException { * @throws Exception */ @Test -// @Timeout(30) + @Timeout(30) public void testTriggerScenePerRemote() throws Exception { System.out.println("testTriggerScenePerRemote"); @@ -494,7 +494,7 @@ public void testTriggerUnitGroupByScene() throws Exception { * @throws Exception */ @Test -// @Timeout(20) + @Timeout(20) public void testTriggerSceneWithAllDevicesOfLocationActionPerRemoteAndVerifiesUnitModification() throws Exception { System.out.println("testTriggerSceneWithAllDevicesOfLocationActionPerRemoteAndVerifiesUnitModification"); @@ -560,7 +560,7 @@ public void testTriggerSceneWithAllDevicesOfLocationActionPerRemoteAndVerifiesUn * @throws Exception */ @Test -//// @Timeout(60) +// @Timeout(60) public void testTriggerSceneWithLocationActionPerRemoteAndVerifiesUnitModification() throws Exception { System.out.println("testTriggerSceneWithLocationActionPerRemoteAndVerifiesUnitModification"); @@ -631,7 +631,7 @@ public void testTriggerSceneWithLocationActionPerRemoteAndVerifiesUnitModificati * @throws Exception */ @Test -// @Timeout(20) + @Timeout(20) public void testIntermediaryActionCancellationOnSceneDeactivation() throws Exception { System.out.println("testTestIntermediaryActionCancellationOnSceneDeactivation"); @@ -702,7 +702,7 @@ public void testIntermediaryActionCancellationOnSceneDeactivation() throws Excep } @Test -// @Timeout(30) + @Timeout(30) public void testActionCancellationViaScene() throws Exception { final LocationRemote rootLocationRemote = Units.getUnit(Registries.getUnitRegistry().getRootLocationConfig(), true, Units.LOCATION); @@ -796,7 +796,7 @@ public void testActionCancellationViaScene() throws Exception { @Test -// @Timeout(20) + @Timeout(20) public void testThatScenesDoNotInterfereEachOther() throws Exception { final long AGGREGATION_TIME = 50; diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/unitgroup/UnitGroupRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/unitgroup/UnitGroupRemoteTest.java index a640fb41d4..6e9c70a1df 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/unitgroup/UnitGroupRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/unitgroup/UnitGroupRemoteTest.java @@ -70,7 +70,7 @@ public class UnitGroupRemoteTest extends AbstractBCOLocationManagerTest { private static UnitGroupRemote unitGroupRemote; @BeforeAll -// @Timeout(30) + @Timeout(30) public static void loadUnits() throws Throwable { try { UnitConfig unitGroupConfig = registerUnitGroup(); @@ -130,7 +130,7 @@ private static boolean allServiceTemplatesImplementedByUnit(UnitGroupConfig.Buil * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testSetPowerState() throws Exception { System.out.println("setPowerState"); unitGroupRemote.waitForData(); @@ -154,7 +154,7 @@ public void testSetPowerState() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testGetPowerState() throws Exception { System.out.println("getPowerState"); unitGroupRemote.waitForData(); @@ -169,7 +169,7 @@ public void testGetPowerState() throws Exception { * @throws java.lang.Exception if something fails. */ @Test -// @Timeout(10) + @Timeout(10) public void testSetUnsupportedService() throws Exception { System.out.println("testSetUnsupportedService"); @@ -193,7 +193,7 @@ public void testSetUnsupportedService() throws Exception { * @throws Exception if something fails. */ @Test -// @Timeout(5) + @Timeout(5) public void testApplyActionAuthenticated() throws Exception { System.out.println("testApplyActionAuthenticated"); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/user/AbstractBCOUserManagerTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/user/AbstractBCOUserManagerTest.java index 312e8e316f..9676f9edcd 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/user/AbstractBCOUserManagerTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/user/AbstractBCOUserManagerTest.java @@ -42,7 +42,7 @@ public class AbstractBCOUserManagerTest extends AbstractBCOTest { protected static UserManagerLauncher userManagerLauncher; @BeforeAll -// @Timeout(30) + @Timeout(30) public static void setupUserManager() throws Throwable { try { userManagerLauncher = new UserManagerLauncher(); @@ -55,7 +55,7 @@ public static void setupUserManager() throws Throwable { } @AfterAll -// @Timeout(30) + @Timeout(30) public static void tearDownUserManager() throws Throwable { try { if (userManagerLauncher != null) { diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/user/UserRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/user/UserRemoteTest.java index 18ebd18bb2..9a87a66d70 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/user/UserRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/user/UserRemoteTest.java @@ -52,7 +52,7 @@ public class UserRemoteTest extends AbstractBCOUserManagerTest { private static UserRemote userRemote; @BeforeAll -// @Timeout(30) + @Timeout(30) public static void loadUnits() throws Throwable { try { userRemote = Units.getUnit(MockRegistry.testUser, true, UserRemote.class); @@ -65,7 +65,7 @@ public static void loadUnits() throws Throwable { * Test of getUsername method, of class UserRemote. */ @Test -// @Timeout(10) + @Timeout(10) public void testGetUserName() throws Exception { System.out.println("testGetUserName"); userRemote.requestData().get(); @@ -78,7 +78,7 @@ public void testGetUserName() throws Exception { * @throws Exception if an error occurs */ @Test -// @Timeout(10) + @Timeout(10) public void testSetPresenceState() throws Exception { System.out.println("testSetPresenceState"); @@ -98,7 +98,7 @@ public void testSetPresenceState() throws Exception { * @throws Exception if an error occurs */ @Test -// @Timeout(10) + @Timeout(10) public void testSetMultiActivityState() throws Exception { System.out.println("testSetMultiActivityState"); @@ -127,7 +127,7 @@ public void testSetMultiActivityState() throws Exception { * @throws Exception if an error occurs */ @Test -// @Timeout(10) + @Timeout(10) public void testUserTransitState() throws Exception { System.out.println("testUserTransitState"); @@ -149,7 +149,7 @@ public void testUserTransitState() throws Exception { * @throws Exception if an error occurs */ @Test -// @Timeout(10) + @Timeout(10) public void testLocalPositionState() throws Exception { System.out.println("testLocalPositionState"); diff --git a/module/registry/unit-registry/test/src/main/java/org/openbase/bco/registry/unit/test/AbstractBCORegistryTest.java b/module/registry/unit-registry/test/src/main/java/org/openbase/bco/registry/unit/test/AbstractBCORegistryTest.java index 65a2cf8e5b..b994902c44 100644 --- a/module/registry/unit-registry/test/src/main/java/org/openbase/bco/registry/unit/test/AbstractBCORegistryTest.java +++ b/module/registry/unit-registry/test/src/main/java/org/openbase/bco/registry/unit/test/AbstractBCORegistryTest.java @@ -57,7 +57,7 @@ public abstract class AbstractBCORegistryTest extends MqttIntegrationTest { final Logger logger = LoggerFactory.getLogger(getClass()); @BeforeEach -// @Timeout(30) + @Timeout(30) public void setupMockRegistry() throws Exception { try { MockRegistryHolder.newMockRegistry(); @@ -68,7 +68,7 @@ public void setupMockRegistry() throws Exception { } @AfterEach -// @Timeout(30) + @Timeout(30) public void tearDownMockRegistry() throws Exception { try { MockRegistryHolder.shutdownMockRegistry(); diff --git a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/DeviceRegistryTest.java b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/DeviceRegistryTest.java index cd49456d32..c6507f7372 100644 --- a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/DeviceRegistryTest.java +++ b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/DeviceRegistryTest.java @@ -71,7 +71,7 @@ public class DeviceRegistryTest extends AbstractBCORegistryTest { * @throws java.lang.Exception */ @Test -// @Timeout(5) + @Timeout(5) public void testRegisterUnitConfigWithUnits() throws Exception { System.out.println("testRegisterUnitConfigWithUnits"); String productNumber = "ABCD-4321"; @@ -111,7 +111,7 @@ public void testRegisterUnitConfigWithUnits() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(5) + @Timeout(5) public void testRegisteredDeviceConfigWithoutLabel() throws Exception { System.out.println("testRegisteredDeviceConfigWithoutLabel"); String productNumber = "KNHD-4321"; @@ -128,7 +128,7 @@ public void testRegisteredDeviceConfigWithoutLabel() throws Exception { } @Test -// @Timeout(15) + @Timeout(15) public void testUnitConfigUnitTemplateConsistencyHandler() throws Exception { System.out.println("testUnitConfigUnitTemplateConsistencyHandler"); @@ -179,7 +179,7 @@ public void testUnitConfigUnitTemplateConsistencyHandler() throws Exception { } @Test -// @Timeout(10) + @Timeout(10) public void testDeviceClassDeviceConfigUnitConsistencyHandler() throws Exception { System.out.println("testDeviceClassDeviceConfigUnitConsistencyHandler"); @@ -273,7 +273,7 @@ public void testDeviceClassDeviceConfigUnitConsistencyHandler() throws Exception } @Test -// @Timeout(5) + @Timeout(5) public void testBoundingBoxConsistencyHandler() throws Exception { // request a unit @@ -306,7 +306,7 @@ public void testBoundingBoxConsistencyHandler() throws Exception { * @throws java.lang.Exception if anything fails */ @Test -// @Timeout(15) + @Timeout(15) public void testOwnerRemoval() throws Exception { System.out.println("testOwnerRemoval"); @@ -342,7 +342,7 @@ public void testOwnerRemoval() throws Exception { } @Test -// @Timeout(15) + @Timeout(15) public void testInventoryEnablingStateConnection() throws Exception { System.out.println("testInventoryEnablingStateConnection"); ServiceTemplateConfig serviceTemplate1 = ServiceTemplateConfig.newBuilder().setServiceType(ServiceType.POWER_STATE_SERVICE).build(); @@ -399,7 +399,7 @@ public void testInventoryEnablingStateConnection() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(5) + @Timeout(5) public void testLocationIdInInventoryState() throws Exception { System.out.println("testLocationIdInInventoryState"); DeviceClass clazz = Registries.getClassRegistry().registerDeviceClass(generateDeviceClass("testLocationIdInInventoryState", "103721ggbdk12", "ServiceGMBH")).get(); @@ -419,7 +419,7 @@ public void testLocationIdInInventoryState() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(5) + @Timeout(5) public void testRegistrationErrorHandling() throws Exception { System.out.println("testRegistrationErrorHandling"); diff --git a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/LocationRegistryTest.java b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/LocationRegistryTest.java index f114571fc6..e854c29b85 100644 --- a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/LocationRegistryTest.java +++ b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/LocationRegistryTest.java @@ -75,7 +75,7 @@ private static UnitConfig.Builder getConnectionUnitBuilder(final String label) { * @throws Exception if any error occurs */ @Test -// @Timeout(15) + @Timeout(15) public void testRootLocationConsistency() throws Exception { System.out.println("testChildConsistency"); @@ -119,7 +119,7 @@ public void testRootLocationConsistency() throws Exception { * @throws Exception if any error occurs */ @Test -// @Timeout(15) + @Timeout(15) public void testParentChildConsistency() throws Exception { System.out.println("testParentChildConsistency"); @@ -161,7 +161,7 @@ public void testParentChildConsistency() throws Exception { * @throws Exception if any error occurs */ @Test -// @Timeout(5) + @Timeout(5) public void testLoopConsistency() throws Exception { System.out.println("testLoopConsistency"); @@ -197,7 +197,7 @@ public void testLoopConsistency() throws Exception { * @throws Exception if any error occurs */ @Test -// @Timeout(5) + @Timeout(5) public void testConnectionTilesConsistency() throws Exception { System.out.println("testConnectionTilesConsistency"); @@ -243,7 +243,7 @@ public void testConnectionTilesConsistency() throws Exception { * @throws Exception if any error occurs */ @Test -// @Timeout(10) + @Timeout(10) public void testLocationTypeConsistency() throws Exception { System.out.println("testLocationTypeConsistency"); @@ -279,7 +279,7 @@ public void testLocationTypeConsistency() throws Exception { * @throws Exception if any error occurs */ @Test -// @Timeout(5) + @Timeout(5) public void testGetLocationUnitConfigByScope() throws Exception { System.out.println("testGetLocationUnitConfigByScope"); @@ -295,7 +295,7 @@ public void testGetLocationUnitConfigByScope() throws Exception { * @throws Exception if an error occurs */ @Test -// @Timeout(5) + @Timeout(5) public void testRootLocationUnitIds() throws Exception { final UnitConfig rootLocation = Registries.getUnitRegistry().getRootLocationConfig(); assertFalse(rootLocation.getLocationConfig().getUnitIdList().contains(rootLocation.getId()), "The root location contains itself in its unit id list!"); diff --git a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/LocationRemovalTest.java b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/LocationRemovalTest.java index a94d9c8a3d..5cba128d1e 100644 --- a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/LocationRemovalTest.java +++ b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/LocationRemovalTest.java @@ -51,7 +51,7 @@ public class LocationRemovalTest extends AbstractBCORegistryTest { * @throws Exception */ @Test -// @Timeout(15) + @Timeout(15) public void removeAllLocationsTest() throws Exception { logger.info("RemoveAllLocationsTest"); try { diff --git a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/RegistryFilteringTest.java b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/RegistryFilteringTest.java index ca51a7c8d9..daae94c18e 100644 --- a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/RegistryFilteringTest.java +++ b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/RegistryFilteringTest.java @@ -53,13 +53,13 @@ public class RegistryFilteringTest extends AbstractBCORegistryTest { @AfterEach -// @Timeout(30) + @Timeout(30) public void tearDown() throws Exception { SessionManager.getInstance().completeLogout(); } @Test -// @Timeout(10) + @Timeout(10) public void testRegisteringWhileLoggedIn() throws Exception { System.out.println("testRegisteringWhileLoggedIn"); @@ -86,7 +86,7 @@ public void testRegisteringWhileLoggedIn() throws Exception { * @throws Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testUnitFiltering() throws Exception { System.out.println("testUnitFiltering"); @@ -167,7 +167,7 @@ public void testUnitFiltering() throws Exception { } @Test -// @Timeout(10) + @Timeout(10) public void testRequestingAuthorizationToken() throws Exception { final String adminUserId = Registries.getUnitRegistry().getUnitConfigByAlias(UnitRegistry.ADMIN_USER_ALIAS).getId(); SessionManager.getInstance().loginUser(adminUserId, UserCreationPlugin.ADMIN_PASSWORD, false); diff --git a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/RegistrySyncTest.java b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/RegistrySyncTest.java index ccb0d2e3dd..bd029e6cdf 100644 --- a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/RegistrySyncTest.java +++ b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/RegistrySyncTest.java @@ -33,7 +33,7 @@ public class RegistrySyncTest extends AbstractBCORegistryTest { @Test -// @Timeout(5) + @Timeout(5) public void testRemoteRegistrySync() throws Exception { System.out.println("testRegisterUnitConfigWithUnits"); @@ -44,7 +44,7 @@ public void testRemoteRegistrySync() throws Exception { } @Test -// @Timeout(15) + @Timeout(15) public void testUnitRemoteRegistrySync() throws Exception { System.out.println("testRegisterUnitConfigWithUnits"); diff --git a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/TestBoundToDeviceFlag.java b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/TestBoundToDeviceFlag.java index 29f16535ed..fde29a9dca 100644 --- a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/TestBoundToDeviceFlag.java +++ b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/TestBoundToDeviceFlag.java @@ -59,7 +59,7 @@ public class TestBoundToDeviceFlag extends AbstractBCORegistryTest { private Pose poseLightThree; @BeforeEach -// @Timeout(30) + @Timeout(30) public void setupTest() throws Exception { try { deviceClass = Registries.getClassRegistry().registerDeviceClass(generateDeviceClass("Label", "Product Number", "Company", unitTypes)).get(); @@ -114,7 +114,7 @@ private void getUpdatedConfigs() throws CouldNotPerformException { * @throws Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testDeviceNotBoundAndUnitsNotBound() throws Exception { logger.info("testDeviceNotBoundAndUnitsNotBound"); @@ -142,7 +142,7 @@ public void testDeviceNotBoundAndUnitsNotBound() throws Exception { * @throws Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testDeviceBoundAndUnitsNotBound() throws Exception { logger.info("testDeviceBoundAndUnitsNotBound"); @@ -178,7 +178,7 @@ public void testDeviceBoundAndUnitsNotBound() throws Exception { * @throws Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testDeviceNotBoundAndUnitsBound() throws Exception { logger.info("testDeviceBoundAndUnitsNotBound"); @@ -209,7 +209,7 @@ public void testDeviceNotBoundAndUnitsBound() throws Exception { * its unit. */ @Test -// @Timeout(10) + @Timeout(10) public void testDeviceBoundAndUnitsBound() throws Exception { logger.info("testDeviceBoundAndUnitsBound"); diff --git a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/TestWaitUntilReady.java b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/TestWaitUntilReady.java index 35ae295580..c03ce28aa6 100644 --- a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/TestWaitUntilReady.java +++ b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/TestWaitUntilReady.java @@ -69,7 +69,7 @@ public TestWaitUntilReady() { } @BeforeAll -// @Timeout(30) + @Timeout(30) public static void setUpClass() throws Throwable { try { MockRegistryHolder.newMockRegistry(); @@ -104,7 +104,7 @@ public void shutdown() { } @AfterAll -// @Timeout(30) + @Timeout(30) public static void tearDownClass() throws Throwable { try { MockRegistryHolder.shutdownMockRegistry(); @@ -114,7 +114,7 @@ public static void tearDownClass() throws Throwable { } @Test -// @Timeout(30) + @Timeout(30) public void testWaitUntilReady() throws Exception { System.out.println("testWaitUntilReady"); diff --git a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/UnitGroupRegistryTest.kt b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/UnitGroupRegistryTest.kt index 74b862a949..0076b73d9a 100644 --- a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/UnitGroupRegistryTest.kt +++ b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/UnitGroupRegistryTest.kt @@ -42,7 +42,7 @@ class UnitGroupRegistryTest : AbstractBCORegistryTest() { * Test if changing the placement of a unit group works. */ @Test -// @Timeout(10) + @Timeout(10) fun testPlacementChange() { val unitConfig = UnitConfig.newBuilder() LabelProcessor.addLabel(unitConfig.labelBuilder, Locale.ENGLISH, "PlacementChangeGroup") @@ -63,7 +63,7 @@ class UnitGroupRegistryTest : AbstractBCORegistryTest() { * Test if it is possible to register unit groups with recursive references. */ @Test -// @Timeout(5) + @Timeout(5) fun `test unit group recursion`() { val colorableLightIds = Registries.getUnitRegistry().getUnitConfigsByUnitType(UnitType.COLORABLE_LIGHT) .map { unitConfig -> unitConfig.id } diff --git a/module/registry/util/src/test/java/org/openbase/bco/registry/mock/MockRegistryTest.java b/module/registry/util/src/test/java/org/openbase/bco/registry/mock/MockRegistryTest.java index ddbda6b74a..4a8ac5d984 100644 --- a/module/registry/util/src/test/java/org/openbase/bco/registry/mock/MockRegistryTest.java +++ b/module/registry/util/src/test/java/org/openbase/bco/registry/mock/MockRegistryTest.java @@ -43,7 +43,7 @@ public MockRegistryTest() { } @BeforeAll -// @Timeout(30) + @Timeout(30) public static void setUpClass() throws JPServiceException { JPService.setupJUnitTestMode(); } @@ -54,7 +54,7 @@ public static void setUpClass() throws JPServiceException { * @throws org.openbase.jul.exception.InstantiationException */ @Test -// @Timeout(120) + @Timeout(120) public void testMockRegistryCreation() throws Exception { Stopwatch stopwatch = new Stopwatch(); List times = new ArrayList<>(); diff --git a/module/registry/util/src/test/java/org/openbase/bco/registry/mock/RemoteTest.java b/module/registry/util/src/test/java/org/openbase/bco/registry/mock/RemoteTest.java index 2999cf0359..2ded31d9e7 100644 --- a/module/registry/util/src/test/java/org/openbase/bco/registry/mock/RemoteTest.java +++ b/module/registry/util/src/test/java/org/openbase/bco/registry/mock/RemoteTest.java @@ -44,7 +44,7 @@ public class RemoteTest extends MqttIntegrationTest { private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(RemoteTest.class); @BeforeAll -// @Timeout(30) + @Timeout(30) public static void setUpClass() throws Throwable { try { JPService.setupJUnitTestMode(); @@ -55,7 +55,7 @@ public static void setUpClass() throws Throwable { } @AfterAll -// @Timeout(30) + @Timeout(30) public static void tearDownClass() { try { MockRegistryHolder.shutdownMockRegistry(); @@ -71,7 +71,7 @@ public static void tearDownClass() { * @throws java.lang.Exception */ @Test -// @Timeout(15) + @Timeout(15) public void testRestartingDeviceRegistryRemotes() throws Exception { System.out.println("testRestartingDeviceRegistryRemotes"); ClassRegistryRemote deviceRemoteAlwaysOn = new ClassRegistryRemote(); From a3655f2e3c08baca91db4b9947f3ff5a8a3e61f4 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Sun, 12 Apr 2026 01:57:45 +0200 Subject: [PATCH 32/41] Revert "temporary disable all timeouts" This reverts commit 7d9c02cdc5dbe7cdd407830807ad8e751b433db6. --- .../bco/dal/test/AbstractBCOTest.java | 4 ++-- .../bco/dal/test/action/RemoteActionTest.kt | 2 +- .../AbstractBCOLocationManagerTest.java | 6 +++--- .../layer/unit/location/LocationCrudTest.kt | 4 ++-- .../unit/location/LocationRemoteTest.java | 20 +++++++++---------- .../layer/unit/scene/SceneRemoteTest.java | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCOTest.java b/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCOTest.java index fd633d561d..c379d499d2 100644 --- a/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCOTest.java +++ b/module/dal/test/src/main/java/org/openbase/bco/dal/test/AbstractBCOTest.java @@ -61,7 +61,7 @@ public abstract class AbstractBCOTest extends MqttIntegrationTest { private final List testActions = Collections.synchronizedList(new ArrayList<>()); @BeforeAll -// @Timeout(30) + @Timeout(30) public static void setupBCO() throws Throwable { try { mockRegistry = MockRegistryHolder.newMockRegistry(); @@ -72,7 +72,7 @@ public static void setupBCO() throws Throwable { } @AfterAll -// @Timeout(30) + @Timeout(30) public static void tearDownBCO() throws Throwable { try { Units.reset(AbstractBCOTest.class); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/RemoteActionTest.kt b/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/RemoteActionTest.kt index c29dc06f55..c5383f0d5b 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/RemoteActionTest.kt +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/RemoteActionTest.kt @@ -164,7 +164,7 @@ class RemoteActionTest : AbstractBCOLocationManagerTest() { } @Test -// @Timeout(15) + @Timeout(15) @Throws(Exception::class) fun testExtensionCancellation() { println("testExtensionCancellation") diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/location/AbstractBCOLocationManagerTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/location/AbstractBCOLocationManagerTest.java index 62df355729..53fe30e2f1 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/location/AbstractBCOLocationManagerTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/location/AbstractBCOLocationManagerTest.java @@ -47,7 +47,7 @@ public class AbstractBCOLocationManagerTest extends AbstractBCOTest { protected static UserManagerLauncher userManagerLauncher; @BeforeAll -// @Timeout(30) + @Timeout(30) public static void setupLocationManager() throws Throwable { try { deviceManagerLauncher = new DeviceManagerLauncher(); @@ -64,7 +64,7 @@ public static void setupLocationManager() throws Throwable { } @AfterAll -// @Timeout(30) + @Timeout(30) public static void tearDownLocationManager() throws Throwable { try { if (userManagerLauncher != null) { @@ -87,7 +87,7 @@ public static void tearDownLocationManager() throws Throwable { * @throws InterruptedException is thrown if the thread was externally interrupted */ @AfterEach -// @Timeout(30) + @Timeout(30) public void cancelAllOngoingActions() throws InterruptedException { log.info("Cancel all ongoing actions..."); try { diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/location/LocationCrudTest.kt b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/location/LocationCrudTest.kt index 9d74528436..85d97f96d0 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/location/LocationCrudTest.kt +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/location/LocationCrudTest.kt @@ -20,7 +20,7 @@ import java.util.concurrent.TimeUnit class LocationCrudTest : AbstractBCOLocationManagerTest() { @Test -// @Timeout(10) + @Timeout(10) @Throws(Exception::class) fun createTileTest() { println("createTileTest") @@ -39,7 +39,7 @@ class LocationCrudTest : AbstractBCOLocationManagerTest() { } @Test -// @Timeout(10) + @Timeout(10) @Throws(Exception::class) fun createZoneTest() { println("createZoneTest") diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/location/LocationRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/location/LocationRemoteTest.java index ca5140cad5..2ccda3cfde 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/location/LocationRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/location/LocationRemoteTest.java @@ -98,7 +98,7 @@ public class LocationRemoteTest extends AbstractBCOLocationManagerTest { * @throws Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testLocationToUnitPipeline() throws Exception { System.out.println("testLocationToUnitPipeline"); @@ -150,7 +150,7 @@ private boolean unitHasService(UnitConfig unitConfig, ServiceType serviceType, S * @throws Exception */ @Test -// @Timeout(15) + @Timeout(15) public void testUnitToLocationPipeline() throws Exception { System.out.println("testUnitToLocationPipeline"); @@ -215,7 +215,7 @@ public void testUnitToLocationPipeline() throws Exception { } @Test -// @Timeout(15) + @Timeout(15) public void testRecordAndRestoreSnapshots() throws Exception { final LocationRemote rootLocationRemote = @@ -288,7 +288,7 @@ public void testRecordAndRestoreSnapshots() throws Exception { } @Test -// @Timeout(5) + @Timeout(5) public void testManipulatingByUnitType() throws Exception { System.out.println("testManipulatingByUnitType"); @@ -351,7 +351,7 @@ public void testManipulatingByUnitType() throws Exception { } @Test -// @Timeout(15) + @Timeout(15) public void testPresenceState() throws Exception { System.out.println("testPresenceState"); @@ -392,7 +392,7 @@ public void testPresenceState() throws Exception { * @throws java.lang.Exception */ @Test -// @Timeout(10) + @Timeout(10) public void testColorableLightControlViaLocation() throws Exception { System.out.println("testColorableLightControlViaLocation"); @@ -471,7 +471,7 @@ public void testColorableLightControlViaLocation() throws Exception { } @Test -// @Timeout(15) + @Timeout(15) public void testIlluminanceState() throws Exception { System.out.println("testIlluminanceState"); @@ -525,7 +525,7 @@ public void testIlluminanceState() throws Exception { * @throws Exception if something fails. */ @Test -// @Timeout(15) + @Timeout(15) public void testApplyActionAuthenticated() throws Exception { System.out.println("testApplyActionAuthenticated"); @@ -556,7 +556,7 @@ public void testApplyActionAuthenticated() throws Exception { } @Test -// @Timeout(20) + @Timeout(20) public void testActionCancellation() throws Exception { System.out.println("testActionCancellation"); @@ -612,7 +612,7 @@ public void testActionCancellation() throws Exception { } @Test -// @Timeout(5) + @Timeout(5) public void testLocationModificationViaApplyAction() throws Exception { final UnitRemote unit = Units.getUnit(Registries.getUnitRegistry().getRootLocationConfig().getId(), true); diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java index fd09d21e11..06505bccb5 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java @@ -560,7 +560,7 @@ public void testTriggerSceneWithAllDevicesOfLocationActionPerRemoteAndVerifiesUn * @throws Exception */ @Test -// @Timeout(60) + @Timeout(60) public void testTriggerSceneWithLocationActionPerRemoteAndVerifiesUnitModification() throws Exception { System.out.println("testTriggerSceneWithLocationActionPerRemoteAndVerifiesUnitModification"); From c779ab70706b5c67af79f645511a1d61f2ea20d6 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Sun, 12 Apr 2026 14:46:13 +0200 Subject: [PATCH 33/41] update jul --- lib/jul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jul b/lib/jul index 846e43250b..282b9ceee8 160000 --- a/lib/jul +++ b/lib/jul @@ -1 +1 @@ -Subproject commit 846e43250b0e9768d0ad4e1b9dd3c64f444fa628 +Subproject commit 282b9ceee8fd94eaed0a961550737d249ef61899 From 0cbffeb77407a0feb13f4df8fa98a1122ce6e5c2 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Sun, 12 Apr 2026 14:46:32 +0200 Subject: [PATCH 34/41] splitt tests into one test job per module --- .github/workflows/build-and-test.yml | 241 +++++++++++++++++++++++++++ 1 file changed, 241 insertions(+) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 3b2446a7a9..0781660c6f 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -130,3 +130,244 @@ jobs: with: name: Test Reports path: "**/build/reports" + + + test_api: + name: "Test API" + timeout-minutes: 120 + needs: build + if: | + (github.event.pull_request.draft == false) + && (needs.check.outputs.testing_needed == 'true') + + runs-on: ubuntu-latest + + steps: + - name: "Checkout Branch" + uses: actions/checkout@v4 + + - name: "Setup Java" + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 21 + cache: 'gradle' + + - name: Setup Gradle cache + uses: actions/cache@v4 + with: + path: ~/.gradle + key: ${{ runner.os }}-gradle-${{ hashFiles('versions.properties') }}-${{ github.sha }} + + - name: "prepare libs for tests" + run: ./prepare.sh + + - name: "test API module" + run: ./gradlew :module/api:check + + - name: Upload test reports + uses: actions/upload-artifact@v4 + if: ${{ failure() || contains(github.event.pull_request.labels.*.name, 'force reports') }} + with: + name: API Test Reports + path: "**/build/reports" + + test_app: + name: "Test App" + timeout-minutes: 120 + needs: build + if: | + (github.event.pull_request.draft == false) + && (needs.check.outputs.testing_needed == 'true') + + runs-on: ubuntu-latest + + steps: + - name: "Checkout Branch" + uses: actions/checkout@v4 + + - name: "Setup Java" + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 21 + cache: 'gradle' + + - name: Setup Gradle cache + uses: actions/cache@v4 + with: + path: ~/.gradle + key: ${{ runner.os }}-gradle-${{ hashFiles('versions.properties') }}-${{ github.sha }} + + - name: "prepare libs for tests" + run: ./prepare.sh + + - name: "test App module" + run: ./gradlew :module/app:check + + - name: Upload test reports + uses: actions/upload-artifact@v4 + if: ${{ failure() || contains(github.event.pull_request.labels.*.name, 'force reports') }} + with: + name: App Test Reports + path: "**/build/reports" + + test_authentication: + name: "Test Authentication" + timeout-minutes: 120 + needs: build + if: | + (github.event.pull_request.draft == false) + && (needs.check.outputs.testing_needed == 'true') + + runs-on: ubuntu-latest + + steps: + - name: "Checkout Branch" + uses: actions/checkout@v4 + + - name: "Setup Java" + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 21 + cache: 'gradle' + + - name: Setup Gradle cache + uses: actions/cache@v4 + with: + path: ~/.gradle + key: ${{ runner.os }}-gradle-${{ hashFiles('versions.properties') }}-${{ github.sha }} + + - name: "prepare libs for tests" + run: ./prepare.sh + + - name: "test Authentication module" + run: ./gradlew :module/authentication:check + + - name: Upload test reports + uses: actions/upload-artifact@v4 + if: ${{ failure() || contains(github.event.pull_request.labels.*.name, 'force reports') }} + with: + name: Authentication Test Reports + path: "**/build/reports" + + test_dal: + name: "Test DAL" + timeout-minutes: 120 + needs: build + if: | + (github.event.pull_request.draft == false) + && (needs.check.outputs.testing_needed == 'true') + + runs-on: ubuntu-latest + + steps: + - name: "Checkout Branch" + uses: actions/checkout@v4 + + - name: "Setup Java" + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 21 + cache: 'gradle' + + - name: Setup Gradle cache + uses: actions/cache@v4 + with: + path: ~/.gradle + key: ${{ runner.os }}-gradle-${{ hashFiles('versions.properties') }}-${{ github.sha }} + + - name: "prepare libs for tests" + run: ./prepare.sh + + - name: "test DAL module" + run: ./gradlew :module/dal:check + + - name: Upload test reports + uses: actions/upload-artifact@v4 + if: ${{ failure() || contains(github.event.pull_request.labels.*.name, 'force reports') }} + with: + name: DAL Test Reports + path: "**/build/reports" + + test_device: + name: "Test Device" + timeout-minutes: 120 + needs: build + if: | + (github.event.pull_request.draft == false) + && (needs.check.outputs.testing_needed == 'true') + + runs-on: ubuntu-latest + + steps: + - name: "Checkout Branch" + uses: actions/checkout@v4 + + - name: "Setup Java" + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 21 + cache: 'gradle' + + - name: Setup Gradle cache + uses: actions/cache@v4 + with: + path: ~/.gradle + key: ${{ runner.os }}-gradle-${{ hashFiles('versions.properties') }}-${{ github.sha }} + + - name: "prepare libs for tests" + run: ./prepare.sh + + - name: "test Device module" + run: ./gradlew :module/device:check + + - name: Upload test reports + uses: actions/upload-artifact@v4 + if: ${{ failure() || contains(github.event.pull_request.labels.*.name, 'force reports') }} + with: + name: Device Test Reports + path: "**/build/reports" + + test_registry: + name: "Test Registry" + timeout-minutes: 120 + needs: build + if: | + (github.event.pull_request.draft == false) + && (needs.check.outputs.testing_needed == 'true') + + runs-on: ubuntu-latest + + steps: + - name: "Checkout Branch" + uses: actions/checkout@v4 + + - name: "Setup Java" + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 21 + cache: 'gradle' + + - name: Setup Gradle cache + uses: actions/cache@v4 + with: + path: ~/.gradle + key: ${{ runner.os }}-gradle-${{ hashFiles('versions.properties') }}-${{ github.sha }} + + - name: "prepare libs for tests" + run: ./prepare.sh + + - name: "test Registry module" + run: ./gradlew :module/registry:check + + - name: Upload test reports + uses: actions/upload-artifact@v4 + if: ${{ failure() || contains(github.event.pull_request.labels.*.name, 'force reports') }} + with: + name: Registry Test Reports + path: "**/build/reports" From 7532ee92a089c612e6f214bd6ff6e07368ead6b1 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Sun, 12 Apr 2026 14:48:05 +0200 Subject: [PATCH 35/41] decrease test timeouts --- .github/workflows/build-and-test.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 0781660c6f..ae6f3f149e 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -93,7 +93,7 @@ jobs: test: name: "Test" - timeout-minutes: 120 + timeout-minutes: 15 needs: build if: | (github.event.pull_request.draft == false) @@ -134,7 +134,7 @@ jobs: test_api: name: "Test API" - timeout-minutes: 120 + timeout-minutes: 15 needs: build if: | (github.event.pull_request.draft == false) @@ -174,7 +174,7 @@ jobs: test_app: name: "Test App" - timeout-minutes: 120 + timeout-minutes: 15 needs: build if: | (github.event.pull_request.draft == false) @@ -214,7 +214,7 @@ jobs: test_authentication: name: "Test Authentication" - timeout-minutes: 120 + timeout-minutes: 15 needs: build if: | (github.event.pull_request.draft == false) @@ -254,7 +254,7 @@ jobs: test_dal: name: "Test DAL" - timeout-minutes: 120 + timeout-minutes: 15 needs: build if: | (github.event.pull_request.draft == false) @@ -294,7 +294,7 @@ jobs: test_device: name: "Test Device" - timeout-minutes: 120 + timeout-minutes: 15 needs: build if: | (github.event.pull_request.draft == false) @@ -334,7 +334,7 @@ jobs: test_registry: name: "Test Registry" - timeout-minutes: 120 + timeout-minutes: 15 needs: build if: | (github.event.pull_request.draft == false) From c6f07fcedfa3705b1c2481bc4cb12315f2118c8d Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Sun, 12 Apr 2026 15:38:52 +0200 Subject: [PATCH 36/41] fix test job declaration --- .github/workflows/build-and-test.yml | 148 ++++++--------------------- settings.gradle.kts | 5 - 2 files changed, 31 insertions(+), 122 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index ae6f3f149e..75f70f538d 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -91,16 +91,10 @@ jobs: path: "**/build/reports" - test: - name: "Test" - timeout-minutes: 15 + test_registry_unit: + name: "Test Registry Unit" needs: build - if: | - (github.event.pull_request.draft == false) - && (needs.check.outputs.testing_needed == 'true') - runs-on: ubuntu-latest - steps: - name: "Checkout Branch" uses: actions/checkout@v4 @@ -118,30 +112,17 @@ jobs: path: ~/.gradle key: ${{ runner.os }}-gradle-${{ hashFiles('versions.properties') }}-${{ github.sha }} - - name: "prepare libs for tests" + - name: "Prepare libs for tests" run: ./prepare.sh - - name: "test backend" - run: ./gradlew --build-cache --continue check - - - name: Upload test reports - uses: actions/upload-artifact@v4 - if: ${{ failure() || contains(github.event.pull_request.labels.*.name, 'force reports') }} - with: - name: Test Reports - path: "**/build/reports" + - name: "Run Tests" + run: ./gradlew --build-cache --continue --rerun-tasks :bco.registry.unit.test:check - test_api: - name: "Test API" - timeout-minutes: 15 + test_registry_message: + name: "Test Registry Message" needs: build - if: | - (github.event.pull_request.draft == false) - && (needs.check.outputs.testing_needed == 'true') - runs-on: ubuntu-latest - steps: - name: "Checkout Branch" uses: actions/checkout@v4 @@ -159,29 +140,17 @@ jobs: path: ~/.gradle key: ${{ runner.os }}-gradle-${{ hashFiles('versions.properties') }}-${{ github.sha }} - - name: "prepare libs for tests" + - name: "Prepare libs for tests" run: ./prepare.sh - - name: "test API module" - run: ./gradlew :module/api:check + - name: "Run Tests" + run: ./gradlew --build-cache --continue --rerun-tasks :bco.registry.message.test:check - - name: Upload test reports - uses: actions/upload-artifact@v4 - if: ${{ failure() || contains(github.event.pull_request.labels.*.name, 'force reports') }} - with: - name: API Test Reports - path: "**/build/reports" - test_app: - name: "Test App" - timeout-minutes: 15 + test_registry_class: + name: "Test Registry Class" needs: build - if: | - (github.event.pull_request.draft == false) - && (needs.check.outputs.testing_needed == 'true') - runs-on: ubuntu-latest - steps: - name: "Checkout Branch" uses: actions/checkout@v4 @@ -199,29 +168,17 @@ jobs: path: ~/.gradle key: ${{ runner.os }}-gradle-${{ hashFiles('versions.properties') }}-${{ github.sha }} - - name: "prepare libs for tests" + - name: "Prepare libs for tests" run: ./prepare.sh - - name: "test App module" - run: ./gradlew :module/app:check + - name: "Run Tests" + run: ./gradlew --build-cache --continue --rerun-tasks :bco.registry.class.test:check - - name: Upload test reports - uses: actions/upload-artifact@v4 - if: ${{ failure() || contains(github.event.pull_request.labels.*.name, 'force reports') }} - with: - name: App Test Reports - path: "**/build/reports" test_authentication: name: "Test Authentication" - timeout-minutes: 15 needs: build - if: | - (github.event.pull_request.draft == false) - && (needs.check.outputs.testing_needed == 'true') - runs-on: ubuntu-latest - steps: - name: "Checkout Branch" uses: actions/checkout@v4 @@ -239,29 +196,17 @@ jobs: path: ~/.gradle key: ${{ runner.os }}-gradle-${{ hashFiles('versions.properties') }}-${{ github.sha }} - - name: "prepare libs for tests" + - name: "Prepare libs for tests" run: ./prepare.sh - - name: "test Authentication module" - run: ./gradlew :module/authentication:check + - name: "Run Tests" + run: ./gradlew --build-cache --continue --rerun-tasks :bco.authentication.test:check - - name: Upload test reports - uses: actions/upload-artifact@v4 - if: ${{ failure() || contains(github.event.pull_request.labels.*.name, 'force reports') }} - with: - name: Authentication Test Reports - path: "**/build/reports" test_dal: name: "Test DAL" - timeout-minutes: 15 needs: build - if: | - (github.event.pull_request.draft == false) - && (needs.check.outputs.testing_needed == 'true') - runs-on: ubuntu-latest - steps: - name: "Checkout Branch" uses: actions/checkout@v4 @@ -279,29 +224,17 @@ jobs: path: ~/.gradle key: ${{ runner.os }}-gradle-${{ hashFiles('versions.properties') }}-${{ github.sha }} - - name: "prepare libs for tests" + - name: "Prepare libs for tests" run: ./prepare.sh - - name: "test DAL module" - run: ./gradlew :module/dal:check + - name: "Run Tests" + run: ./gradlew --build-cache --continue --rerun-tasks :bco.dal.test:check - - name: Upload test reports - uses: actions/upload-artifact@v4 - if: ${{ failure() || contains(github.event.pull_request.labels.*.name, 'force reports') }} - with: - name: DAL Test Reports - path: "**/build/reports" - test_device: - name: "Test Device" - timeout-minutes: 15 + test_app: + name: "Test App" needs: build - if: | - (github.event.pull_request.draft == false) - && (needs.check.outputs.testing_needed == 'true') - runs-on: ubuntu-latest - steps: - name: "Checkout Branch" uses: actions/checkout@v4 @@ -319,29 +252,17 @@ jobs: path: ~/.gradle key: ${{ runner.os }}-gradle-${{ hashFiles('versions.properties') }}-${{ github.sha }} - - name: "prepare libs for tests" + - name: "Prepare libs for tests" run: ./prepare.sh - - name: "test Device module" - run: ./gradlew :module/device:check + - name: "Run Tests" + run: ./gradlew --build-cache --continue --rerun-tasks :bco.app.test:check - - name: Upload test reports - uses: actions/upload-artifact@v4 - if: ${{ failure() || contains(github.event.pull_request.labels.*.name, 'force reports') }} - with: - name: Device Test Reports - path: "**/build/reports" - test_registry: - name: "Test Registry" - timeout-minutes: 15 + test_app_preset: + name: "Test App Preset" needs: build - if: | - (github.event.pull_request.draft == false) - && (needs.check.outputs.testing_needed == 'true') - runs-on: ubuntu-latest - steps: - name: "Checkout Branch" uses: actions/checkout@v4 @@ -359,15 +280,8 @@ jobs: path: ~/.gradle key: ${{ runner.os }}-gradle-${{ hashFiles('versions.properties') }}-${{ github.sha }} - - name: "prepare libs for tests" + - name: "Prepare libs for tests" run: ./prepare.sh - - name: "test Registry module" - run: ./gradlew :module/registry:check - - - name: Upload test reports - uses: actions/upload-artifact@v4 - if: ${{ failure() || contains(github.event.pull_request.labels.*.name, 'force reports') }} - with: - name: Registry Test Reports - path: "**/build/reports" + - name: "Run Tests" + run: ./gradlew --build-cache --continue --rerun-tasks :bco.app.preset:check diff --git a/settings.gradle.kts b/settings.gradle.kts index 1f08013f17..60654c2f2b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -10,11 +10,6 @@ plugins { id("de.fayard.refreshVersions") } -include("authentication") -include("registry") -include("dal") -include("device") - include(":bco.authentication.test") include(":bco.authentication.lib") include(":bco.authentication.core") From 874c12968ad4d88ab426ba273cdd8fa899e4532a Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Mon, 13 Apr 2026 13:25:32 +0200 Subject: [PATCH 37/41] fix unit registry deadlock were an unit config modification lead to an deadlock when the group permissions of an action was validated. --- .../unit/HighFrequentModificationTest.kt | 131 ++++++++++++++++++ .../unit/core/UnitRegistryController.java | 40 +++--- .../core/plugin/AliasMapUpdatePlugin.java | 4 +- .../unit/remote/UnitRegistryRemote.java | 28 ++-- 4 files changed, 174 insertions(+), 29 deletions(-) create mode 100644 module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/HighFrequentModificationTest.kt diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/HighFrequentModificationTest.kt b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/HighFrequentModificationTest.kt new file mode 100644 index 0000000000..ab901c7e2e --- /dev/null +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/HighFrequentModificationTest.kt @@ -0,0 +1,131 @@ +package org.openbase.bco.dal.test.layer.unit + +import org.junit.jupiter.api.BeforeAll +import org.junit.jupiter.api.RepeatedTest +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.Timeout +import org.openbase.bco.dal.lib.state.States +import org.openbase.bco.dal.remote.layer.unit.LightRemote +import org.openbase.bco.dal.remote.layer.unit.Units +import org.openbase.bco.dal.test.AbstractBCODeviceManagerTest +import org.openbase.bco.registry.mock.MockRegistry +import org.openbase.bco.registry.remote.Registries +import org.openbase.jul.extension.type.processing.LabelProcessor +import org.openbase.type.domotic.unit.UnitTemplateType.UnitTemplate +import java.util.logging.Level +import java.util.logging.Logger + +/** + * @author [Tamino Huxohl](mailto:pleminoq@openbase.org) + */ +class HighFrequentModificationTest : AbstractBCODeviceManagerTest() { + + var lightRemote: LightRemote? = null + + @BeforeAll + @Timeout(30) + @Throws(Throwable::class) + fun loadUnits() { + lightRemote = Units.getUnitByAlias( + MockRegistry.getUnitAlias(UnitTemplate.UnitType.LIGHT), + true, + LightRemote::class.java + ) + } + + /** + * Test to simulate race conditions by modifying the Light with 4 threads in parallel. + * + * This test creates four threads that perform concurrent modifications on the LightRemote instance: + * - Two threads toggle the PowerState randomly between ON and OFF. + * - Two threads modify the UnitConfig (label and location) of the light. + * + * This test aims to expose potential race conditions in the LightRemote implementation. + * + * @throws Exception if any thread encounters an error during execution. + */ + @RepeatedTest(10) + @Timeout(30) + @Throws(Exception::class) + fun `high frequent config and service modification should should be possible`() { + println("testRaceCondition") + + val numberOfInterations = 10 + + // Thread 1: Randomly toggle PowerState ON/OFF + val powerStateThread1 = Thread(Runnable { + try { + for (i in 0..numberOfInterations) { + lightRemote!!.setPowerState(if (Math.random() > 0.5) States.Power.ON else States.Power.OFF) + } + } catch (e: Exception) { + LOGGER.log(Level.SEVERE, "Error in powerStateThread1", e) + } + }) + + // Thread 2: Randomly toggle PowerState ON/OFF + val powerStateThread2 = Thread(Runnable { + try { + for (i in 0..numberOfInterations) { + lightRemote!!.setPowerState(if (Math.random() > 0.5) States.Power.ON else States.Power.OFF).get() + } + } catch (e: Exception) { + LOGGER.log(Level.SEVERE, "Error in powerStateThread2", e) + } + }) + + // Thread 3: Modify the label of the unit + val unitConfigThread1 = Thread(Runnable { + try { + for (i in 0..numberOfInterations) { + val newLabel = LabelProcessor.buildLabel("Label$i") + Registries.getUnitRegistry().getUnitConfigById(lightRemote!!.getId()) + .toBuilder() + .apply { setLabel(newLabel) } + .build() + .also { Registries.getUnitRegistry().updateUnitConfig(it) } + } + } catch (e: Exception) { + LOGGER.log(Level.SEVERE, "Error in unitConfigThread1", e) + } + }) + + // Thread 4: Modify the location of the unit + val unitConfigThread2 = Thread(Runnable { + try { + for (i in 0..numberOfInterations) { + val newLocationId = Registries.getUnitRegistry().getUnitConfigsByUnitType(UnitTemplate.UnitType.LOCATION) + .shuffled() + .first() + .id + + Registries.getUnitRegistry().getUnitConfigById(lightRemote!!.getId()) + .toBuilder() + .apply { placementConfigBuilder.setLocationId(newLocationId) } + .build() + .also { Registries.getUnitRegistry().updateUnitConfig(it) } + } + } catch (e: Exception) { + LOGGER.log(Level.SEVERE, "Error in unitConfigThread2", e) + } + }) + + // Start all threads + powerStateThread1.start() + powerStateThread2.start() + unitConfigThread1.start() + unitConfigThread2.start() + + // Wait for all threads to complete + powerStateThread1.join() + powerStateThread2.join() + unitConfigThread1.join() + unitConfigThread2.join() + + println("Race condition test completed.") + } + + companion object { + private val LOGGER: Logger = Logger.getLogger(HighFrequentModificationTest::class.java.getName()) + } +} diff --git a/module/registry/unit-registry/core/src/main/java/org/openbase/bco/registry/unit/core/UnitRegistryController.java b/module/registry/unit-registry/core/src/main/java/org/openbase/bco/registry/unit/core/UnitRegistryController.java index af83257003..0777b26595 100644 --- a/module/registry/unit-registry/core/src/main/java/org/openbase/bco/registry/unit/core/UnitRegistryController.java +++ b/module/registry/unit-registry/core/src/main/java/org/openbase/bco/registry/unit/core/UnitRegistryController.java @@ -115,15 +115,12 @@ public class UnitRegistryController extends AbstractRegistryController> unitConfigRegistryList, baseUnitConfigRegistryList; - private final SyncObject aliasIdMapLock; - private final TreeMap aliasIdMap; + private final SyncObject aliasIdMapLock = new SyncObject("AliasIdMapLock"); + private final TreeMap aliasIdMap = new TreeMap<>(); public UnitRegistryController() throws InstantiationException, InterruptedException { super(JPUnitRegistryScope.class, UnitRegistryData.newBuilder()); try { - this.aliasIdMap = new TreeMap<>(); - this.aliasIdMapLock = new SyncObject("AliasIdMapLock"); - this.unitConfigRegistryList = new ArrayList<>(); this.baseUnitConfigRegistryList = new ArrayList<>(); @@ -185,14 +182,19 @@ protected void postInit() throws InitializationException, InterruptedException { // initially fill the alias to id map afterwards // the {@code AliasMapUpdatePlugin} will manage changes on registering, removing or updating of units - synchronized (aliasIdMapLock) { - try { - for (ProtoBufFileSynchronizedRegistry registry : unitConfigRegistryList) { - registry.getMessages().forEach((unitConfig) -> unitConfig.getAliasList().forEach(alias -> aliasIdMap.put(alias.toLowerCase(), unitConfig.getId()))); - } - } catch (CouldNotPerformException ex) { - throw new InitializationException(this, ex); + + TreeMap tempAliasIdMap = new TreeMap<>(); + + try { + for (ProtoBufFileSynchronizedRegistry registry : unitConfigRegistryList) { + registry.getMessages().forEach((unitConfig) -> unitConfig.getAliasList().forEach(alias -> tempAliasIdMap.put(alias.toLowerCase(), unitConfig.getId()))); } + } catch (CouldNotPerformException ex) { + throw new InitializationException(this, ex); + } + + synchronized (aliasIdMapLock){ + aliasIdMap.putAll(tempAliasIdMap); } } @@ -585,12 +587,15 @@ public UnitConfig getUnitConfigById(final String unitConfigId) throws NotAvailab @Override public UnitConfig getUnitConfigByAlias(final String unitAlias) throws NotAvailableException { try { + String unitId; synchronized (aliasIdMapLock) { if (aliasIdMap.containsKey(unitAlias.toLowerCase())) { - return getUnitConfigById(aliasIdMap.get(unitAlias.toLowerCase())); + unitId = aliasIdMap.get(unitAlias.toLowerCase()); + } else { + throw new NotAvailableException("Alias", unitAlias); } } - throw new NotAvailableException("Alias", unitAlias); + return getUnitConfigById(unitId); } catch (CouldNotPerformException ex) { throw new NotAvailableException("UnitConfig with Alias", unitAlias, ex); } @@ -609,12 +614,15 @@ public UnitConfig getUnitConfigByAlias(final String unitAlias) throws NotAvailab @Override public UnitConfig getUnitConfigByAliasAndUnitType(final String unitAlias, final UnitType unitType) throws NotAvailableException { try { + String unitId; synchronized (aliasIdMapLock) { if (aliasIdMap.containsKey(unitAlias.toLowerCase())) { - return getUnitConfigByIdAndUnitType(aliasIdMap.get(unitAlias.toLowerCase()), unitType); + unitId = aliasIdMap.get(unitAlias.toLowerCase()); + } else { + throw new NotAvailableException("Alias", unitAlias); } } - throw new NotAvailableException("Alias", unitAlias); + return getUnitConfigByIdAndUnitType(unitId, unitType); } catch (CouldNotPerformException ex) { throw new NotAvailableException("UnitConfig of UnitType[" + unitType.name() + "] with Alias", unitAlias, ex); } diff --git a/module/registry/unit-registry/core/src/main/java/org/openbase/bco/registry/unit/core/plugin/AliasMapUpdatePlugin.java b/module/registry/unit-registry/core/src/main/java/org/openbase/bco/registry/unit/core/plugin/AliasMapUpdatePlugin.java index 709ab4cd9a..f19d5da47b 100644 --- a/module/registry/unit-registry/core/src/main/java/org/openbase/bco/registry/unit/core/plugin/AliasMapUpdatePlugin.java +++ b/module/registry/unit-registry/core/src/main/java/org/openbase/bco/registry/unit/core/plugin/AliasMapUpdatePlugin.java @@ -95,9 +95,7 @@ public void afterUpdate(IdentifiableMessage identif aliasIdMap.remove(alias.toLowerCase()); } }); + temporaryAliasList.clear(); } - - temporaryAliasList.clear(); } - } diff --git a/module/registry/unit-registry/remote/src/main/java/org/openbase/bco/registry/unit/remote/UnitRegistryRemote.java b/module/registry/unit-registry/remote/src/main/java/org/openbase/bco/registry/unit/remote/UnitRegistryRemote.java index 5ce54eb604..3dcf6029a4 100644 --- a/module/registry/unit-registry/remote/src/main/java/org/openbase/bco/registry/unit/remote/UnitRegistryRemote.java +++ b/module/registry/unit-registry/remote/src/main/java/org/openbase/bco/registry/unit/remote/UnitRegistryRemote.java @@ -129,14 +129,16 @@ public UnitRegistryRemote() throws InstantiationException { ); aliasMapUpdateObserver = (source, data) -> { + TreeMap tempAliasIdMap = new TreeMap<>(); + for (IdentifiableMessage identifiableMessage : data.values()) { + final UnitConfig unitConfig = identifiableMessage.getMessage(); + for (String alias : unitConfig.getAliasList()) { + tempAliasIdMap.put(alias.toLowerCase(), unitConfig.getId()); + } + } synchronized (aliasIdMapLock) { aliasIdMap.clear(); - for (IdentifiableMessage identifiableMessage : data.values()) { - final UnitConfig unitConfig = identifiableMessage.getMessage(); - for (String alias : unitConfig.getAliasList()) { - aliasIdMap.put(alias.toLowerCase(), unitConfig.getId()); - } - } + aliasIdMap.putAll(tempAliasIdMap); } }; } catch (CouldNotPerformException ex) { @@ -388,12 +390,15 @@ public UnitConfig getUnitConfigById(final String unitConfigId) throws NotAvailab @Override public UnitConfig getUnitConfigByAlias(final String unitAlias) throws NotAvailableException { try { + String unitId; synchronized (aliasIdMapLock) { if (aliasIdMap.containsKey(unitAlias.toLowerCase())) { - return getUnitConfigById(aliasIdMap.get(unitAlias.toLowerCase())); + unitId = aliasIdMap.get(unitAlias.toLowerCase()); + } else { + throw new NotAvailableException("Alias", unitAlias); } } - throw new NotAvailableException("Alias", unitAlias); + return getUnitConfigById(unitId); } catch (CouldNotPerformException ex) { throw new NotAvailableException("UnitConfig with Alias", unitAlias, ex); } @@ -412,12 +417,15 @@ public UnitConfig getUnitConfigByAlias(final String unitAlias) throws NotAvailab @Override public UnitConfig getUnitConfigByAliasAndUnitType(String unitAlias, final UnitType unitType) throws NotAvailableException { try { + String unitId; synchronized (aliasIdMapLock) { if (aliasIdMap.containsKey(unitAlias.toLowerCase())) { - return getUnitConfigByIdAndUnitType(aliasIdMap.get(unitAlias.toLowerCase()), unitType); + unitId = aliasIdMap.get(unitAlias.toLowerCase()); + } else { + throw new NotAvailableException("Alias", unitAlias); } } - throw new NotAvailableException("Alias", unitAlias); + return getUnitConfigByIdAndUnitType(unitId, unitType); } catch (CouldNotPerformException ex) { throw new NotAvailableException("UnitConfig of UnitType[" + unitType.name() + "] with Alias", unitAlias, ex); } From 02e7dc04ea8a7517d62db4979214c9f351607f13 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Mon, 13 Apr 2026 13:43:49 +0200 Subject: [PATCH 38/41] increase ci critical timeouts --- .../openbase/bco/registry/unit/test/TestBoundToDeviceFlag.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/TestBoundToDeviceFlag.java b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/TestBoundToDeviceFlag.java index fde29a9dca..b43fb804b3 100644 --- a/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/TestBoundToDeviceFlag.java +++ b/module/registry/unit-registry/test/src/test/java/org/openbase/bco/registry/unit/test/TestBoundToDeviceFlag.java @@ -59,7 +59,7 @@ public class TestBoundToDeviceFlag extends AbstractBCORegistryTest { private Pose poseLightThree; @BeforeEach - @Timeout(30) + @Timeout(60) public void setupTest() throws Exception { try { deviceClass = Registries.getClassRegistry().registerDeviceClass(generateDeviceClass("Label", "Product Number", "Company", unitTypes)).get(); From cb2084dee40ee2a2358f0e1d409e7b63a8db4546 Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Mon, 13 Apr 2026 14:07:52 +0200 Subject: [PATCH 39/41] increase test timeout --- .../java/org/openbase/bco/dal/test/action/RemoteActionTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/RemoteActionTest.kt b/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/RemoteActionTest.kt index c5383f0d5b..deb4196592 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/RemoteActionTest.kt +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/action/RemoteActionTest.kt @@ -164,7 +164,7 @@ class RemoteActionTest : AbstractBCOLocationManagerTest() { } @Test - @Timeout(15) + @Timeout(60) @Throws(Exception::class) fun testExtensionCancellation() { println("testExtensionCancellation") From 219fc40293b457651faf1ad91ec3a1b2693e97e0 Mon Sep 17 00:00:00 2001 From: Marian Pohling Date: Tue, 14 Apr 2026 22:55:14 +0200 Subject: [PATCH 40/41] Update SceneRemoteTest.java --- .../bco/dal/test/layer/unit/scene/SceneRemoteTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java index 06505bccb5..838c2acb46 100644 --- a/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java +++ b/module/dal/test/src/test/java/org/openbase/bco/dal/test/layer/unit/scene/SceneRemoteTest.java @@ -419,7 +419,7 @@ public void testTriggerScenePerRemote() throws Exception { * @throws Exception */ @Test - //@Timeout(10) + @Timeout(10) public void testTriggerSceneWithLocationActionPerRemote() throws Exception { System.out.println("testTriggerSceneWithLocationActionPerRemote"); @@ -444,7 +444,7 @@ public void testTriggerSceneWithLocationActionPerRemote() throws Exception { * @throws Exception */ @Test - //@Timeout(10) + @Timeout(10) public void testTriggerUnitGroupByScene() throws Exception { System.out.println("testTriggerUnitGroupByScene"); From 356119ab9adbdc20f7301c70125808bbef51dc2c Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Tue, 14 Apr 2026 23:00:59 +0200 Subject: [PATCH 41/41] upgrade jul --- lib/jul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jul b/lib/jul index 282b9ceee8..e5d31bf136 160000 --- a/lib/jul +++ b/lib/jul @@ -1 +1 @@ -Subproject commit 282b9ceee8fd94eaed0a961550737d249ef61899 +Subproject commit e5d31bf1368a1aec5b6f00a3b4b70b30609dac19