100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Test cleanup
Rich Turner5990d8b0880f
diff --git a/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy b/test/src/main/groovy/org/openremote/test/ContainerTrait.groovyindex 270e086eb..76a005bcf 100644--- a/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy+++ b/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy@@ -54,12 +54,14 @@ import org.openremote.model.rules.AssetRulesetimport org.openremote.model.rules.GlobalRulesetimport org.openremote.model.rules.Rulesetimport org.openremote.model.rules.TenantRuleset+import spock.util.concurrent.PollingConditionsimport javax.websocket.ClientEndpointConfigimport javax.websocket.Endpointimport javax.websocket.Sessionimport javax.websocket.WebSocketContainerimport javax.ws.rs.core.UriBuilder+import java.util.concurrent.TimeUnitimport java.util.logging.Handlerimport java.util.stream.Collectorsimport java.util.stream.IntStream@@ -114,6 +116,14 @@ trait ContainerTrait {gatewayClientService.deleteConnections(gatewayConnections.stream().map { it.localRealm }.collect(Collectors.toList()))}+ // Reset and start clock in case previous test stopped it+ def timerService = container.getService(TimerService.class)+ if (timerService != null) {+ timerService.getClock().reset()+ timerService.getClock().advanceTime(-1, TimeUnit.MILLISECONDS) // Put time back so attribute events with the same timestamp don't get rejected+ timerService.getClock().start()+ }+// Reset rulesetsif (container.hasService(RulesetStorageService.class) && container.hasService(RulesService.class)) {def globalRulesets = getRulesets(GlobalRuleset.class)@@ -226,12 +236,6 @@ trait ContainerTrait {}}}-- // Start clock in case previous test stopped it- def timerService = container.getService(TimerService.class)- if (timerService != null) {- timerService.getClock().start();- }} catch (IllegalStateException e) {System.out.println("Failed to clean the existing container so creating a new one")stopContainer()@@ -310,7 +314,11 @@ trait ContainerTrait {if (assetProcessingService != null) {println("Waiting for the system to settle down")- noEventProcessedIn(assetProcessingService, 300)+ def j=0+ while (j < 100 && !noEventProcessedIn(assetProcessingService, 300)) {+ Thread.sleep(100)+ j+++ }}return containerdiff --git a/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy b/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovyindex 3a89f6b6f..8c2721414 100644--- a/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy+++ b/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy@@ -19,7 +19,6 @@ import static org.openremote.container.timer.TimerService.Clock.REALimport static org.openremote.container.timer.TimerService.TIMER_CLOCK_TYPEimport static org.openremote.container.web.WebService.WEBSERVER_LISTEN_PORTimport static org.openremote.manager.mqtt.MqttBrokerService.MQTT_SERVER_LISTEN_HOST-import static org.openremote.manager.setup.SetupTasks.*import static org.openremote.test.setup.TestSetupTasks.*trait ManagerContainerTrait extends ContainerTrait {diff --git a/test/src/main/groovy/org/openremote/test/TestFixture.java b/test/src/main/java/org/openremote/test/TestFixture.javasimilarity index 100%rename from test/src/main/groovy/org/openremote/test/TestFixture.javarename to test/src/main/java/org/openremote/test/TestFixture.javadiff --git a/test/src/main/groovy/org/openremote/test/model/TestAssetModelProvider.java b/test/src/main/java/org/openremote/test/model/TestAssetModelProvider.javasimilarity index 100%rename from test/src/main/groovy/org/openremote/test/model/TestAssetModelProvider.javarename to test/src/main/java/org/openremote/test/model/TestAssetModelProvider.javadiff --git a/test/src/main/groovy/org/openremote/test/protocol/KNXTestingNetworkLink.java b/test/src/main/java/org/openremote/test/protocol/KNXTestingNetworkLink.javasimilarity index 100%rename from test/src/main/groovy/org/openremote/test/protocol/KNXTestingNetworkLink.javarename to test/src/main/java/org/openremote/test/protocol/KNXTestingNetworkLink.javadiff --git a/test/src/main/groovy/org/openremote/test/protocol/MockAgent.java b/test/src/main/java/org/openremote/test/protocol/MockAgent.javasimilarity index 100%rename from test/src/main/groovy/org/openremote/test/protocol/MockAgent.javarename to test/src/main/java/org/openremote/test/protocol/MockAgent.javadiff --git a/test/src/main/groovy/org/openremote/test/protocol/MockProtocol.java b/test/src/main/java/org/openremote/test/protocol/MockProtocol.javasimilarity index 100%rename from test/src/main/groovy/org/openremote/test/protocol/MockProtocol.javarename to test/src/main/java/org/openremote/test/protocol/MockProtocol.javadiff --git a/test/src/main/groovy/org/openremote/test/protocol/http/HttpServerTestAgent.java b/test/src/main/java/org/openremote/test/protocol/http/HttpServerTestAgent.javasimilarity index 100%rename from test/src/main/groovy/org/openremote/test/protocol/http/HttpServerTestAgent.javarename to test/src/main/java/org/openremote/test/protocol/http/HttpServerTestAgent.javadiff --git a/test/src/main/groovy/org/openremote/test/protocol/http/TestHttpServerProtocol.java b/test/src/main/java/org/openremote/test/protocol/http/TestHttpServerProtocol.javasimilarity index 100%rename from test/src/main/groovy/org/openremote/test/protocol/http/TestHttpServerProtocol.javarename to test/src/main/java/org/openremote/test/protocol/http/TestHttpServerProtocol.javadiff --git a/test/src/main/groovy/org/openremote/test/protocol/http/TestResource.java b/test/src/main/java/org/openremote/test/protocol/http/TestResource.javasimilarity index 100%rename from test/src/main/groovy/org/openremote/test/protocol/http/TestResource.javarename to test/src/main/java/org/openremote/test/protocol/http/TestResource.javadiff --git a/test/src/main/groovy/org/openremote/test/protocol/http/TestResourceImpl.java b/test/src/main/java/org/openremote/test/protocol/http/TestResourceImpl.javasimilarity index 100%rename from test/src/main/groovy/org/openremote/test/protocol/http/TestResourceImpl.javarename to test/src/main/java/org/openremote/test/protocol/http/TestResourceImpl.javadiff --git a/test/src/main/groovy/org/openremote/test/protocol/velbus/MockVelbusAgent.java b/test/src/main/java/org/openremote/test/protocol/velbus/MockVelbusAgent.javasimilarity index 100%rename from test/src/main/groovy/org/openremote/test/protocol/velbus/MockVelbusAgent.javarename to test/src/main/java/org/openremote/test/protocol/velbus/MockVelbusAgent.javadiff --git a/test/src/main/groovy/org/openremote/test/protocol/velbus/MockVelbusClient.java b/test/src/main/java/org/openremote/test/protocol/velbus/MockVelbusClient.javasimilarity index 100%rename from test/src/main/groovy/org/openremote/test/protocol/velbus/MockVelbusClient.javarename to test/src/main/java/org/openremote/test/protocol/velbus/MockVelbusClient.javadiff --git a/test/src/main/groovy/org/openremote/test/protocol/velbus/MockVelbusProtocol.java b/test/src/main/java/org/openremote/test/protocol/velbus/MockVelbusProtocol.javasimilarity index 100%rename from test/src/main/groovy/org/openremote/test/protocol/velbus/MockVelbusProtocol.javarename to test/src/main/java/org/openremote/test/protocol/velbus/MockVelbusProtocol.javadiff --git a/test/src/main/groovy/org/openremote/test/setup/KeycloakTestSetup.java b/test/src/main/java/org/openremote/test/setup/KeycloakTestSetup.javasimilarity index 98%rename from test/src/main/groovy/org/openremote/test/setup/KeycloakTestSetup.javarename to test/src/main/java/org/openremote/test/setup/KeycloakTestSetup.javaindex ad5a75ca7..59beef8a4 100644--- a/test/src/main/groovy/org/openremote/test/setup/KeycloakTestSetup.java+++ b/test/src/main/java/org/openremote/test/setup/KeycloakTestSetup.java@@ -30,8 +30,11 @@ import org.openremote.model.security.Tenant;import org.openremote.model.security.User;import java.util.Arrays;+import java.util.List;import java.util.logging.Logger;+import java.util.stream.Collectors;+import static org.openremote.container.util.MapAccess.getString;import static org.openremote.model.Constants.KEYCLOAK_CLIENT_ID;import static org.openremote.model.Constants.MASTER_REALM;diff --git a/test/src/main/groovy/org/openremote/test/setup/ManagerTestAgentSetup.java b/test/src/main/java/org/openremote/test/setup/ManagerTestAgentSetup.javasimilarity index 100%rename from test/src/main/groovy/org/openremote/test/setup/ManagerTestAgentSetup.javarename to test/src/main/java/org/openremote/test/setup/ManagerTestAgentSetup.javadiff --git a/test/src/main/groovy/org/openremote/test/setup/ManagerTestSetup.java b/test/src/main/java/org/openremote/test/setup/ManagerTestSetup.javasimilarity index 99%rename from test/src/main/groovy/org/openremote/test/setup/ManagerTestSetup.javarename to test/src/main/java/org/openremote/test/setup/ManagerTestSetup.javaindex 436262c3e..7258bbc6e 100644--- a/test/src/main/groovy/org/openremote/test/setup/ManagerTestSetup.java+++ b/test/src/main/java/org/openremote/test/setup/ManagerTestSetup.java@@ -34,7 +34,6 @@ import org.openremote.model.attribute.Attribute;import org.openremote.model.attribute.MetaItem;import org.openremote.model.geo.GeoJSONPoint;import org.openremote.model.security.Tenant;-import org.openremote.model.value.MetaItemType;import org.openremote.model.value.ValueConstraint;import org.openremote.model.value.ValueType;import org.openremote.model.value.Values;diff --git a/test/src/main/groovy/org/openremote/test/setup/RulesTestSetup.java b/test/src/main/java/org/openremote/test/setup/RulesTestSetup.javasimilarity index 100%rename from test/src/main/groovy/org/openremote/test/setup/RulesTestSetup.javarename to test/src/main/java/org/openremote/test/setup/RulesTestSetup.javadiff --git a/test/src/main/groovy/org/openremote/test/setup/TestSetupTasks.java b/test/src/main/java/org/openremote/test/setup/TestSetupTasks.javasimilarity index 98%rename from test/src/main/groovy/org/openremote/test/setup/TestSetupTasks.javarename to test/src/main/java/org/openremote/test/setup/TestSetupTasks.javaindex d9a668f92..2d649261c 100644--- a/test/src/main/groovy/org/openremote/test/setup/TestSetupTasks.java+++ b/test/src/main/java/org/openremote/test/setup/TestSetupTasks.java@@ -27,7 +27,6 @@ import org.openremote.model.Container;import java.util.List;import static org.openremote.container.util.MapAccess.getBoolean;-import static org.openremote.manager.setup.SetupTasks.*;/*** Builtin setup tasks.diff --git a/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationAssetTest.groovy b/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationAssetTest.groovyindex ccf27a38b..c5098d841 100644--- a/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationAssetTest.groovy+++ b/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationAssetTest.groovy@@ -9,12 +9,14 @@ import org.openremote.manager.energy.EnergyOptimisationServiceimport org.openremote.manager.energy.EnergyOptimiserimport org.openremote.manager.setup.SetupServiceimport org.openremote.model.asset.impl.ElectricityAsset+import org.openremote.model.asset.impl.ElectricityConsumerAsset+import org.openremote.model.asset.impl.ElectricityProducerSolarAssetimport org.openremote.model.asset.impl.ElectricityStorageAsset+import org.openremote.model.asset.impl.ElectricitySupplierAssetimport org.openremote.model.attribute.AttributeEventimport org.openremote.model.attribute.AttributeRefimport org.openremote.test.ManagerContainerTraitimport org.openremote.test.setup.ManagerTestSetup-import spock.lang.Ignoreimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions@@ -22,10 +24,7 @@ import java.time.Instantimport java.time.LocalDateTimeimport java.time.ZoneIdimport java.time.temporal.ChronoUnit-import java.util.concurrent.Executors--import static org.spockframework.util.Assert.that-import static spock.util.matcher.HamcrestMatchers.closeTo+import java.util.concurrent.TimeUnit/** Copyright 2021, OpenRemote Inc.@@ -51,7 +50,6 @@ class EnergyOptimisationAssetTest extends Specification implements ManagerContaigiven: "the container environment is started"def conditions = new PollingConditions(timeout: 10, delay: 0.2)- def scheduler = Executors.newScheduledThreadPool(1);def services = Lists.newArrayList(defaultServices())def spyOptimisationService = Spy(EnergyOptimisationService) {scheduleOptimisation(_ as String, _ as EnergyOptimiser) >> {@@ -75,12 +73,17 @@ class EnergyOptimisationAssetTest extends Specification implements ManagerContaiassert optimisationService.assetEnergyOptimiserMap.get(managerTestSetup.electricityOptimisationAssetId) != null}- and: "the optimisation start time should be correctly calculated"- def optimiser = optimisationService.assetEnergyOptimiserMap.get(managerTestSetup.electricityOptimisationAssetId).key+ when: "the pseudo clock is stopped and the system time is set to midnight of next day"+ stopPseudoClock()def now = Instant.ofEpochMilli(timerService.getCurrentTimeMillis())+ now = now.truncatedTo(ChronoUnit.DAYS).plus(1, ChronoUnit.DAYS)+ advancePseudoClock(now.toEpochMilli()-timerService.getCurrentTimeMillis(), TimeUnit.MILLISECONDS, container)++ then: "the optimisation start time should be correctly calculated"+ def optimiser = optimisationService.assetEnergyOptimiserMap.get(managerTestSetup.electricityOptimisationAssetId).keydef optimisationTime = optimisationService.getOptimisationStartTime(now.toEpochMilli(), (long)optimiser.intervalSize * 60 * 60)assert optimisationTime.isBefore(now)- assert optimisationTime.plus((long)optimiser.intervalSize*60, ChronoUnit.MINUTES).isAfter(now)+ assert optimisationTime.plus((long)optimiser.intervalSize*60, ChronoUnit.MINUTES).equals(now)when: "supplier tariff values are set for the next 24hrs"def tariffExports = [-5, -2, -8, 2, 2, 5, -2, -2]@@ -105,7 +108,15 @@ class EnergyOptimisationAssetTest extends Specification implements ManagerContaiassetPredictedDatapointService.updateValue(new AttributeRef(managerTestSetup.electricitySolarAssetId, ElectricityAsset.POWER.name), producerPower.get(i), optimisationDateTime.plus((long)(optimiser.intervalSize * 60)*i, ChronoUnit.MINUTES))}- and: "the optimisation runs"+ then: "the current values of each attribute should have reached the DB"+ conditions.eventually {+ assert (assetStorageService.find(managerTestSetup.electricitySupplierAssetId) as ElectricitySupplierAsset).getTariffImport().orElse(0d) == tariffImports.get(0)+ assert (assetStorageService.find(managerTestSetup.electricitySupplierAssetId) as ElectricitySupplierAsset).getTariffExport().orElse(0d) == tariffExports.get(0)+ assert (assetStorageService.find(managerTestSetup.electricityConsumerAssetId) as ElectricityConsumerAsset).getPower().orElse(-1d) == consumerPower.get(0)+ assert (assetStorageService.find(managerTestSetup.electricitySolarAssetId) as ElectricityProducerSolarAsset).getPower().orElse(-1d) == producerPower.get(0)+ }++ when: "the optimisation runs"optimisationService.runOptimisation(managerTestSetup.electricityOptimisationAssetId, optimisationTime)then: "the setpoints of the storage asset for the next 24hrs should be correctly optimised [-20.0, 7.0, -20.0, 7.0, 0.0, 7.0, -14.0, 0.0]"diff --git a/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationTest.groovy b/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationTest.groovyindex 28c95f796..c8b918331 100644--- a/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationTest.groovy+++ b/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationTest.groovy@@ -199,7 +199,9 @@ class EnergyOptimisationTest extends Specification {double energyLevelMin = 40ddouble energyLevelMax = 160ddouble[] energyMinLevels = new double[intervalCount]+ double[] energyMaxLevels = new double[intervalCount]Arrays.fill(energyMinLevels, energyLevelMin)+ Arrays.fill(energyMaxLevels, energyLevelMax)when: "an energy schedule is defined and the energy min levels generated from this"int[] energyScheduleDay = [@@ -230,22 +232,26 @@ class EnergyOptimisationTest extends Specification {]int[][] energyScheduleWeek = new int[24][7]Arrays.fill(energyScheduleWeek, energyScheduleDay)- optimisation.applyEnergySchedule(energyMinLevels, energyCapacity, energyLevelMin, energyLevelMax, energyScheduleWeek, currentTime)+ optimisation.applyEnergySchedule(energyMinLevels, energyMaxLevels, energyCapacity, energyScheduleWeek, currentTime)then: "the energy min levels should be correct"energyMinLevels == [40d, 40d, 160d, 40d, 40d, 40d, 40d, 40d] as double[]when: "the energy min levels are regenerated for a different time"currentTime = currentTime.plus(7, ChronoUnit.HOURS)- optimisation.applyEnergySchedule(energyMinLevels, energyCapacity, energyLevelMin, energyLevelMax, energyScheduleWeek, currentTime)+ Arrays.fill(energyMinLevels, energyLevelMin)+ optimisation.applyEnergySchedule(energyMinLevels, energyMaxLevels, energyCapacity, energyScheduleWeek, currentTime)then: "the energy min levels should be correct"energyMinLevels == [160d, 40d, 40d, 40d, 40d, 40d, 40d, 40d] as double[]when: "the optimisation is changed to have an interval size less than 1 hour"energyMinLevels = new double[24*4]+ energyMaxLevels = new double[24*4]+ Arrays.fill(energyMinLevels, energyLevelMin)+ Arrays.fill(energyMaxLevels, energyLevelMax)optimisation = new EnergyOptimiser(0.25d, 1d)- optimisation.applyEnergySchedule(energyMinLevels, energyCapacity, energyLevelMin, energyLevelMax, energyScheduleWeek, currentTime)+ optimisation.applyEnergySchedule(energyMinLevels, energyMaxLevels, energyCapacity, energyScheduleWeek, currentTime)then: "the energy min levels should be correct"energyMinLevels[0] == 160d@@ -267,7 +273,9 @@ class EnergyOptimisationTest extends Specification {double currentEnergyLevel = 100ddouble[] powerSetpoints = new double[intervalCount]double[] energyMinLevels = new double[intervalCount]+ double[] energyMaxLevels = new double[intervalCount]Arrays.fill(energyMinLevels, energyLevelMin)+ Arrays.fill(energyMaxLevels, energyLevelMax)Function<Integer, Double> powerImportMaxCalculator = {interval -> 7d}Function<Integer, Double> powerExportMaxCalculator = {interval -> -20d}@@ -300,7 +308,7 @@ class EnergyOptimisationTest extends Specification {]int[][] energyScheduleWeek = new int[24][7]Arrays.fill(energyScheduleWeek, energyScheduleDay)- optimisation.applyEnergySchedule(energyMinLevels, energyCapacity, energyLevelMin, energyLevelMax, energyScheduleWeek, currentTime)+ optimisation.applyEnergySchedule(energyMinLevels, energyMaxLevels, energyCapacity, energyScheduleWeek, currentTime)then: "the energy min levels should be correct"energyMinLevels == [40d, 40d, 160d, 40d, 40d, 40d, 40d, 40d] as double[]@@ -312,7 +320,7 @@ class EnergyOptimisationTest extends Specification {energyMinLevels == [118d, 139d, 160d, 100d, 40d, 40d, 40d, 40d] as double[]when: "the energy min levels are modified to improve code coverage in this test"- energyLevelMax = 170d+ Arrays.fill(energyMaxLevels, 170d)energyMinLevels = [133d, 150d, 166d, 130d, 130d, 100d, 10d, 100d] as double[]and: "the energy min levels are normalised"@@ -334,10 +342,7 @@ class EnergyOptimisationTest extends Specification {and: "the applyEnergyMinImports routine is run on the input parameters"Function<Integer, Double> energyLevelCalculator = {int interval ->- Math.min(- energyLevelMax,- currentEnergyLevel + IntStream.range(0, interval).mapToDouble({j -> powerSetpoints[j] * intervalSize}).sum()- )+ currentEnergyLevel + IntStream.range(0, interval).mapToDouble({j -> powerSetpoints[j] * intervalSize}).sum()}optimisation.applyEnergyMinImports(optimisedImport, energyMinLevels, powerSetpoints, energyLevelCalculator, importCostCalculator, powerImportMaxCalculator)@@ -352,7 +357,7 @@ class EnergyOptimisationTest extends Specification {powerSetpoints[7] == 0dwhen: "the earning opportunities are applied to the power setpoints"- optimisation.applyEarningOpportunities(optimisedImport, optimisedExport, energyMinLevels, powerSetpoints, energyLevelCalculator, powerImportMaxCalculator, powerExportMaxCalculator, energyLevelMax)+ optimisation.applyEarningOpportunities(optimisedImport, optimisedExport, energyMinLevels, energyMaxLevels, powerSetpoints, energyLevelCalculator, powerImportMaxCalculator, powerExportMaxCalculator)then: "the power setpoints should have been updated to reflect utilisation of earning opportunities"powerSetpoints[0] == 7ddiff --git a/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy b/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovyindex edf85801b..e084adfd1 100644--- a/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy+++ b/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy@@ -13,6 +13,9 @@ import org.openremote.manager.notification.PushNotificationHandlerimport org.openremote.manager.rules.geofence.ORConsoleGeofenceAssetAdapterimport org.openremote.manager.security.ManagerIdentityServiceimport org.openremote.manager.setup.SetupService+import org.openremote.model.query.UserQuery+import org.openremote.model.query.filter.TenantPredicate+import org.openremote.model.util.TextUtilimport org.openremote.test.setup.KeycloakTestSetupimport org.openremote.test.setup.ManagerTestSetupimport org.openremote.model.attribute.AttributeRef@@ -558,6 +561,7 @@ class NotificationTest extends Specification implements ManagerContainerTrait {conditions.eventually {def users = identityService.getIdentityProvider().getUsers(keycloakTestSetup.tenantBuilding.realm)assert users.size() == 4+ assert users.count { !TextUtil.isNullOrEmpty(it.email)} == 3}when: "an email notification is sent to a tenant through same mechanism as rules"diff --git a/test/src/test/groovy/org/openremote/test/protocol/BasicProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/BasicProtocolTest.groovyindex 8dbfffb34..bba400254 100644--- a/test/src/test/groovy/org/openremote/test/protocol/BasicProtocolTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/BasicProtocolTest.groovy@@ -32,8 +32,6 @@ import org.openremote.model.value.ValueFilterimport org.openremote.test.ManagerContainerTraitimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions-import org.openremote.test.protocol.MockAgent-import org.openremote.test.protocol.MockProtocolimport java.util.regex.Patterndiff --git a/test/src/test/groovy/org/openremote/test/protocol/KNXProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/KNXProtocolTest.groovyindex 68287133f..578b2c67b 100644--- a/test/src/test/groovy/org/openremote/test/protocol/KNXProtocolTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/KNXProtocolTest.groovy@@ -35,7 +35,6 @@ import org.openremote.model.attribute.MetaItemimport org.openremote.test.ManagerContainerTraitimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions-import org.openremote.test.protocol.KNXTestingNetworkLinkimport tuwien.auto.calimero.server.Launcherimport tuwien.auto.calimero.server.knxnetip.DefaultServiceContainerdiff --git a/test/src/test/groovy/org/openremote/test/protocol/http/HttpServerProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/http/HttpServerProtocolTest.groovyindex ce7b4d773..811432fa2 100644--- a/test/src/test/groovy/org/openremote/test/protocol/http/HttpServerProtocolTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/http/HttpServerProtocolTest.groovy@@ -42,9 +42,6 @@ import org.openremote.test.ManagerContainerTraitimport spock.lang.Sharedimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions-import org.openremote.test.protocol.http.HttpServerTestAgent-import org.openremote.test.protocol.http.TestHttpServerProtocol-import org.openremote.test.protocol.http.TestResourceimport javax.ws.rs.ForbiddenExceptionimport javax.ws.rs.HttpMethoddiff --git a/test/src/test/groovy/org/openremote/test/protocol/velbus/VelbusBasicTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/velbus/VelbusBasicTest.groovyindex 747e92167..f8a41e198 100644--- a/test/src/test/groovy/org/openremote/test/protocol/velbus/VelbusBasicTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/velbus/VelbusBasicTest.groovy@@ -28,7 +28,6 @@ import org.openremote.model.asset.agent.ConnectionStatusimport spock.lang.Sharedimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions-import org.openremote.test.protocol.velbus.MockVelbusClientimport static spock.util.matcher.HamcrestMatchers.closeTodiff --git a/test/src/test/groovy/org/openremote/test/protocol/velbus/VelbusProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/velbus/VelbusProtocolTest.groovyindex 3a7318408..4317d51d8 100644--- a/test/src/test/groovy/org/openremote/test/protocol/velbus/VelbusProtocolTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/velbus/VelbusProtocolTest.groovy@@ -16,8 +16,6 @@ import org.openremote.test.ManagerContainerTraitimport spock.lang.Sharedimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions-import org.openremote.test.protocol.velbus.MockVelbusAgent-import org.openremote.test.protocol.velbus.MockVelbusProtocolimport java.util.stream.Collectors