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
Fixed tests broken after merge
Rich Turnercf665a3a2a3b
diff --git a/test/src/test/groovy/org/openremote/test/map/MapResourceTest.groovy b/test/src/test/groovy/org/openremote/test/map/MapResourceTest.groovyindex b45e9659b..590b35ec9 100644--- a/test/src/test/groovy/org/openremote/test/map/MapResourceTest.groovy+++ b/test/src/test/groovy/org/openremote/test/map/MapResourceTest.groovy@@ -40,8 +40,10 @@ class MapResourceTest extends Specification implements ManagerContainerTrait {and: "JSON content is valid"def json = new JsonSlurper().parseText(mapSettings.toJson())- json.center.size() == 2- json.maxBounds.size() == 4+ json.options != null+ json.options.default != null+ json.options.default.center.size() == 2+ json.options.default.bounds.size() == 4json.sources != nulljson.layers.size() > 0diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovyindex ca3e51d95..c7af49a8d 100644--- a/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy@@ -2,11 +2,9 @@ package org.openremote.test.rules.residenceimport com.google.firebase.messaging.Messageimport org.openremote.container.timer.TimerService-import org.openremote.manager.asset.AssetProcessingServiceimport org.openremote.manager.asset.AssetStorageServiceimport org.openremote.manager.notification.NotificationServiceimport org.openremote.manager.notification.PushNotificationHandler-import org.openremote.manager.rules.JsonRulesBuilderimport org.openremote.manager.rules.RulesEngineimport org.openremote.manager.rules.RulesServiceimport org.openremote.manager.rules.RulesetStorageService@@ -109,8 +107,8 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {).tokenand: "a console is registered by that user"- def authenticatedConsoleResource = getClientTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm, accessToken).proxy(ConsoleResource.class)- def authenticatedAssetResource = getClientTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm, accessToken).proxy(AssetResource.class)+ def authenticatedConsoleResource = getClientApiTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm, accessToken).proxy(ConsoleResource.class)+ def authenticatedAssetResource = getClientApiTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm, accessToken).proxy(AssetResource.class)def consoleRegistration = new ConsoleRegistration(null,"Test Console","1.0",