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
Minor test updates
Rich Turner712d8aaa0e73
diff --git a/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy b/test/src/main/groovy/org/openremote/test/ContainerTrait.groovyindex 3bb6f3952..e3aac0a04 100644--- a/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy+++ b/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy@@ -34,7 +34,8 @@ import org.openremote.container.security.AuthFormimport org.openremote.container.security.IdentityServiceimport org.openremote.container.security.keycloak.KeycloakIdentityProviderimport org.openremote.container.web.WebClient-import org.openremote.container.web.WebService+import org.openremote.manager.web.ManagerWebService+import org.openremote.model.Constantsimport javax.websocket.ClientEndpointConfigimport javax.websocket.Endpoint@@ -78,28 +79,28 @@ trait ContainerTrait {}}- static ResteasyWebTarget getClientTarget(UriBuilder serverUri) {- WebClient.getTarget(createClient().build(), serverUri.clone().build(), null, null, null)+ static ResteasyWebTarget getClientTarget(UriBuilder serverUri, String accessToken) {+ WebClient.getTarget(createClient().build(), serverUri.build(), accessToken, null, null)}- static ResteasyWebTarget getClientTarget(UriBuilder serverUri, String realm) {- WebClient.getTarget(createClient().build(), serverUri.clone().replacePath(realm).build(), null, null, null)+ static ResteasyWebTarget getClientApiTarget(UriBuilder serverUri, String realm) {+ WebClient.getTarget(createClient().build(), serverUri.clone().replacePath(ManagerWebService.API_PATH).path(realm).build(), null, null, null)}- static ResteasyWebTarget getClientTarget(UriBuilder serverUri, String realm, String accessToken) {- WebClient.getTarget(createClient().build(), serverUri.clone().replacePath(realm).build(), accessToken, null, null)+ static ResteasyWebTarget getClientApiTarget(UriBuilder serverUri, String realm, String accessToken) {+ WebClient.getTarget(createClient().build(), serverUri.clone().replacePath(ManagerWebService.API_PATH).path(realm).build(), accessToken, null, null)}- static ResteasyWebTarget getClientTarget(UriBuilder serverUri, String realm, String path, String accessToken) {- WebClient.getTarget(createClient().build(), serverUri.clone().replacePath(realm).path(path).build(), accessToken, null, null)+ static ResteasyWebTarget getClientApiTarget(UriBuilder serverUri, String realm, String path, String accessToken) {+ WebClient.getTarget(createClient().build(), serverUri.clone().replacePath(ManagerWebService.API_PATH).path(realm).path(path).build(), accessToken, null, null)}- static ResteasyWebTarget getClientTarget(ResteasyClient client, UriBuilder serverUri, String realm, String accessToken) {- WebClient.getTarget(client, serverUri.clone().replacePath(realm).build(), accessToken, null, null)+ static ResteasyWebTarget getClientApiTarget(ResteasyClient client, UriBuilder serverUri, String realm, String accessToken) {+ WebClient.getTarget(client, serverUri.clone().replacePath(ManagerWebService.API_PATH).path(realm).build(), accessToken, null, null)}- static ResteasyWebTarget getClientTarget(ResteasyClient client, UriBuilder serverUri, String realm, String path, String accessToken) {- WebClient.getTarget(client, serverUri.clone().replacePath(realm).path(path).build(), accessToken, null, null)+ static ResteasyWebTarget getClientApiTarget(ResteasyClient client, UriBuilder serverUri, String realm, String path, String accessToken) {+ WebClient.getTarget(client, serverUri.clone().replacePath(ManagerWebService.API_PATH).path(realm).path(path).build(), accessToken, null, null)}static int findEphemeralPort() {@@ -131,7 +132,7 @@ trait ContainerTrait {.scheme("ws").replacePath(MessageBrokerSetupService.WEBSOCKET_PATH).path(endpointPath)- .queryParam(WebService.REQUEST_HEADER_REALM, realm)+ .queryParam(Constants.REQUEST_HEADER_REALM, realm).queryParam("Authorization", "Bearer " + accessToken)}diff --git a/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy b/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovyindex d19ee315f..08307fbb2 100644--- a/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy+++ b/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy@@ -37,7 +37,6 @@ import static org.openremote.container.security.IdentityService.IDENTITY_NETWORKimport static org.openremote.container.timer.TimerService.Clock.PSEUDOimport static org.openremote.container.timer.TimerService.TIMER_CLOCK_TYPEimport static org.openremote.container.web.WebService.WEBSERVER_LISTEN_PORT-import static org.openremote.manager.web.ManagerWebService.APP_DOCROOTimport static org.openremote.manager.setup.SetupTasks.*trait ManagerContainerTrait extends ContainerTrait {@@ -48,8 +47,7 @@ trait ManagerContainerTrait extends ContainerTrait {(IDENTITY_NETWORK_HOST) : KeycloakIdentityProvider.KEYCLOAK_HOST_DEFAULT,(IDENTITY_NETWORK_WEBSERVER_PORT): Integer.toString(KeycloakIdentityProvider.KEYCLOAK_PORT_DEFAULT),(SETUP_IMPORT_DEMO_SCENES) : "false",- (SETUP_IMPORT_DEMO_RULES) : "false",- (APP_DOCROOT) : "../deployment/manager/app/"+ (SETUP_IMPORT_DEMO_RULES) : "false"]}diff --git a/test/src/test/groovy/org/openremote/test/admin/AdminTenantsActivityTest.groovy b/test/src/test/groovy/org/openremote/test/admin/AdminTenantsActivityTest.groovyindex 47adc06a6..6351f69ef 100644--- a/test/src/test/groovy/org/openremote/test/admin/AdminTenantsActivityTest.groovy+++ b/test/src/test/groovy/org/openremote/test/admin/AdminTenantsActivityTest.groovy@@ -74,7 +74,7 @@ class AdminTenantsActivityTest extends Specification implements ManagerContainer)and: "the server resources to call from client"- def clientTarget = getClientTarget(serverUri(serverPort), realm)+ def clientTarget = getClientApiTarget(serverUri(serverPort), realm)def tenantResource = Stub(TenantResource) {_(*_) >> { callResourceProxy(container.JSON, clientTarget, getDelegate()) }}@@ -324,7 +324,7 @@ class AdminTenantsActivityTest extends Specification implements ManagerContainerassert resultEvents[0].place instanceof AdminTenantPlaceassert resultEvents[1] instanceof GoToPlaceEventassert resultEvents[1].place instanceof AdminTenantPlace- assert resultEvents[1].place.getAppName == "testrealm"+ assert resultEvents[1].place.realm == "testrealm"}and: "The admin tenant form should be cleared"diff --git a/test/src/test/groovy/org/openremote/test/admin/AdminUsersActivityTest.groovy b/test/src/test/groovy/org/openremote/test/admin/AdminUsersActivityTest.groovyindex 2f18ae553..b579bf6d9 100644--- a/test/src/test/groovy/org/openremote/test/admin/AdminUsersActivityTest.groovy+++ b/test/src/test/groovy/org/openremote/test/admin/AdminUsersActivityTest.groovy@@ -81,7 +81,7 @@ class AdminUsersActivityTest extends Specification implements ManagerContainerTr)and: "the server resources to call from client"- def clientTarget = getClientTarget(serverUri(serverPort), realm)+ def clientTarget = getClientApiTarget(serverUri(serverPort), realm)def tenantResource = Stub(TenantResource) {_(*_) >> { callResourceProxy(container.JSON, clientTarget, getDelegate()) }}@@ -247,7 +247,7 @@ class AdminUsersActivityTest extends Specification implements ManagerContainerTrresultEvents[0].place instanceof AdminUsersPlaceresultEvents[1] instanceof GoToPlaceEventresultEvents[1].place instanceof AdminUsersPlace- resultEvents[1].place.getAppName == MASTER_REALM+ resultEvents[1].place.realm == MASTER_REALMand: "The view should have received the tenants, selected realm, and users"conditions.eventually {@@ -274,7 +274,7 @@ class AdminUsersActivityTest extends Specification implements ManagerContainerTrassert resultEvents[0].place instanceof AdminUserEditPlaceassert resultEvents[1] instanceof GoToPlaceEventassert resultEvents[1].place instanceof AdminUserEditPlace- assert resultEvents[1].place.getAppName == MASTER_REALM+ assert resultEvents[1].place.realm == MASTER_REALM}and: "The admin navigation view should have the right place set"@@ -405,7 +405,7 @@ class AdminUsersActivityTest extends Specification implements ManagerContainerTrassert resultEvents[1].place instanceof AdminUsersPlaceassert resultEvents[2] instanceof GoToPlaceEventassert resultEvents[2].place instanceof AdminUsersPlace- assert resultEvents[2].place.getAppName == MASTER_REALM+ assert resultEvents[2].place.realm == MASTER_REALM}and: "The view should have received the users"@@ -433,7 +433,7 @@ class AdminUsersActivityTest extends Specification implements ManagerContainerTrassert resultEvents[0].place instanceof AbstractAdminUsersPlaceassert resultEvents[1] instanceof GoToPlaceEventassert resultEvents[1].place instanceof AbstractAdminUsersPlace- assert resultEvents[1].place.getAppName == MASTER_REALM+ assert resultEvents[1].place.realm == MASTER_REALMassert resultEvents[1].place.userId == selectedUser.id}@@ -653,7 +653,7 @@ class AdminUsersActivityTest extends Specification implements ManagerContainerTrassert resultEvents[1].place instanceof AdminUsersPlaceassert resultEvents[2] instanceof GoToPlaceEventassert resultEvents[2].place instanceof AdminUsersPlace- assert resultEvents[2].place.getAppName == MASTER_REALM+ assert resultEvents[2].place.realm == MASTER_REALM}and: "The view should have received the tenants and users"diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetBrowserPresenterTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetBrowserPresenterTest.groovyindex f40a1ba09..33aa4e93b 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetBrowserPresenterTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetBrowserPresenterTest.groovy@@ -76,7 +76,7 @@ class AssetBrowserPresenterTest extends Specification implements ManagerContaineconnect(createWebsocketClient(), clientEventService.endpoint, serverUri(serverPort), WEBSOCKET_EVENTS, realm, accessToken.call())and: "the server resources to call from client"- def clientTarget = getClientTarget(serverUri(serverPort), realm)+ def clientTarget = getClientApiTarget(serverUri(serverPort), realm)def assetResource = Stub(AssetResource) {_(*_) >> { callResourceProxy(container.JSON, clientTarget, getDelegate()) }}@@ -274,7 +274,7 @@ class AssetBrowserPresenterTest extends Specification implements ManagerContaineconnect(createWebsocketClient(), clientEventService.endpoint, serverUri(serverPort), WEBSOCKET_EVENTS, realm, accessToken.call())and: "the server resources to call from client"- def clientTarget = getClientTarget(serverUri(serverPort), realm)+ def clientTarget = getClientApiTarget(serverUri(serverPort), realm)def assetResource = Stub(AssetResource) {_(*_) >> { callResourceProxy(container.JSON, clientTarget, getDelegate()) }}@@ -452,7 +452,7 @@ class AssetBrowserPresenterTest extends Specification implements ManagerContaineconnect(createWebsocketClient(), clientEventService.endpoint, serverUri(serverPort), WEBSOCKET_EVENTS, realm, accessToken.call())and: "the server resources to call from client"- def clientTarget = getClientTarget(serverUri(serverPort), realm)+ def clientTarget = getClientApiTarget(serverUri(serverPort), realm)def assetResource = Stub(AssetResource) {_(*_) >> { callResourceProxy(container.JSON, clientTarget, getDelegate()) }}diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetIntegrityTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetIntegrityTest.groovyindex 1ac7e2913..ad9f1dbf3 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetIntegrityTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetIntegrityTest.groovy@@ -40,7 +40,7 @@ class AssetIntegrityTest extends Specification implements ManagerContainerTraitand: "the asset resource"def serverUri = serverUri(serverPort)- def assetResource = getClientTarget(serverUri, MASTER_REALM, accessToken).proxy(AssetResource.class)+ def assetResource = getClientApiTarget(serverUri, MASTER_REALM, accessToken).proxy(AssetResource.class)when: "an asset is created in the authenticated realm"def testAsset = new Asset("Test Room", AssetType.ROOM, null, keycloakDemoSetup.masterTenant.id)diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovyindex 464e1c289..0accfc632 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy@@ -49,7 +49,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai).tokenand: "the asset resource"- def assetResource = getClientTarget(serverUri(serverPort), MASTER_REALM, accessToken).proxy(AssetResource.class)+ def assetResource = getClientApiTarget(serverUri(serverPort), MASTER_REALM, accessToken).proxy(AssetResource.class)/* ############################################## READ ####################################### */@@ -249,7 +249,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai).tokenand: "the asset resource"- def assetResource = getClientTarget(serverUri(serverPort), MASTER_REALM, accessToken).proxy(AssetResource.class)+ def assetResource = getClientApiTarget(serverUri(serverPort), MASTER_REALM, accessToken).proxy(AssetResource.class)/* ############################################## READ ####################################### */@@ -418,7 +418,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai).tokenand: "the asset resource"- def assetResource = getClientTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm, accessToken).proxy(AssetResource.class)+ def assetResource = getClientApiTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm, accessToken).proxy(AssetResource.class)/* ############################################## READ ####################################### */@@ -562,7 +562,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai).tokenand: "the asset resource"- def assetResource = getClientTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm, accessToken).proxy(AssetResource.class)+ def assetResource = getClientApiTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm, accessToken).proxy(AssetResource.class)/* ############################################## READ ####################################### */diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetPublicQueryTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetPublicQueryTest.groovyindex f896cae2f..fc1308b47 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetPublicQueryTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetPublicQueryTest.groovy@@ -51,7 +51,7 @@ class AssetPublicQueryTest extends Specification implements ManagerContainerTraikeycloakDemoSetup = container.getService(SetupService.class).getTaskOfType(KeycloakDemoSetup.class)assetStorageService = container.getService(AssetStorageService.class)persistenceService = container.getService(PersistenceService.class)- assetResource = getClientTarget(serverUri(serverPort), MASTER_REALM).proxy(AssetResource.class)+ assetResource = getClientApiTarget(serverUri(serverPort), MASTER_REALM).proxy(AssetResource.class)Asset somePublicAsset = new Asset("Some Public Asset", THING)somePublicAsset.setParentId(managerDemoSetup.smartOfficeId)diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovyindex 1e147bc2a..751c32dd1 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovy@@ -38,7 +38,7 @@ class AssetUserLinkingTest extends Specification implements ManagerContainerTrai).tokenand: "the asset resource"- def assetResource = getClientTarget(serverUri(serverPort), MASTER_REALM, accessToken).proxy(AssetResource.class)+ def assetResource = getClientApiTarget(serverUri(serverPort), MASTER_REALM, accessToken).proxy(AssetResource.class)/* ############################################## READ ####################################### */diff --git a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovyindex 13a9e6665..f536c7160 100644--- a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy+++ b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy@@ -123,12 +123,12 @@ class ConsoleTest extends Specification implements ManagerContainerTrait {).tokenand: "authenticated and anonymous console, rules and asset resources"- def authenticatedConsoleResource = getClientTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm, accessToken).proxy(ConsoleResource.class)- def authenticatedRulesResource = getClientTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm, accessToken).proxy(RulesResource.class)- def authenticatedAssetResource = getClientTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm, accessToken).proxy(AssetResource.class)- def anonymousConsoleResource = getClientTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm).proxy(ConsoleResource.class)- def anonymousRulesResource = getClientTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm).proxy(RulesResource.class)- def anonymousAssetResource = getClientTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm).proxy(AssetResource.class)+ def authenticatedConsoleResource = getClientApiTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm, accessToken).proxy(ConsoleResource.class)+ def authenticatedRulesResource = getClientApiTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm, accessToken).proxy(RulesResource.class)+ def authenticatedAssetResource = getClientApiTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm, accessToken).proxy(AssetResource.class)+ def anonymousConsoleResource = getClientApiTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm).proxy(ConsoleResource.class)+ def anonymousRulesResource = getClientApiTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm).proxy(RulesResource.class)+ def anonymousAssetResource = getClientApiTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm).proxy(AssetResource.class)when: "a console registers with an authenticated user"def consoleRegistration = new ConsoleRegistration(null,diff --git a/test/src/test/groovy/org/openremote/test/map/MapActivityTest.groovy b/test/src/test/groovy/org/openremote/test/map/MapActivityTest.groovyindex 4c18af3ba..705906c0f 100644--- a/test/src/test/groovy/org/openremote/test/map/MapActivityTest.groovy+++ b/test/src/test/groovy/org/openremote/test/map/MapActivityTest.groovy@@ -35,7 +35,7 @@ class MapActivityTest { /* extends Specification implements ContainerTrait, GwtCdef requestService = new RequestServiceImpl(securityService, constraintViolationReader)and: "a test client target"- def clientTarget = getClientTarget(serverUri(serverPort), realm);+ def clientTarget = getClientApiTarget(serverUri(serverPort), realm);and: "The map view, resource, and activity"def mapView = Mock(MapView) {diff --git a/test/src/test/groovy/org/openremote/test/map/MapResourceTest.groovy b/test/src/test/groovy/org/openremote/test/map/MapResourceTest.groovyindex 8c500af05..d0f25caad 100644--- a/test/src/test/groovy/org/openremote/test/map/MapResourceTest.groovy+++ b/test/src/test/groovy/org/openremote/test/map/MapResourceTest.groovy@@ -27,7 +27,7 @@ class MapResourceTest extends Specification implements ManagerContainerTrait {).tokenand: "a test client target"- def clientTarget = getClientTarget(serverUri(serverPort), realm, accessToken)+ def clientTarget = getClientApiTarget(serverUri(serverPort), realm, accessToken)and: "the map resource"def mapResource = clientTarget.proxy(MapResource.class)diff --git a/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy b/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovyindex 8a2d7562b..8080c459d 100644--- a/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy+++ b/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy@@ -116,16 +116,16 @@ class NotificationTest extends Specification implements ManagerContainerTrait {Values.create(false)),null, null), null)and: "the notification resource"- def testuser1NotificationResource = getClientTarget(serverUri(serverPort), MASTER_REALM, testuser1AccessToken).proxy(NotificationResource.class)- def testuser2NotificationResource = getClientTarget(serverUri(serverPort), realm, testuser2AccessToken).proxy(NotificationResource.class)- def testuser3NotificationResource = getClientTarget(serverUri(serverPort), realm, testuser3AccessToken).proxy(NotificationResource.class)- def adminNotificationResource = getClientTarget(serverUri(serverPort), MASTER_REALM, adminAccessToken).proxy(NotificationResource.class)- def anonymousNotificationResource = getClientTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm).proxy(NotificationResource.class)- def testuser1ConsoleResource = getClientTarget(serverUri(serverPort), MASTER_REALM, testuser1AccessToken).proxy(ConsoleResource.class)- def testuser2ConsoleResource = getClientTarget(serverUri(serverPort), realm, testuser2AccessToken).proxy(ConsoleResource.class)- def testuser3ConsoleResource = getClientTarget(serverUri(serverPort), realm, testuser3AccessToken).proxy(ConsoleResource.class)- def adminConsoleResource = getClientTarget(serverUri(serverPort), MASTER_REALM, adminAccessToken).proxy(ConsoleResource.class)- def anonymousConsoleResource = getClientTarget(serverUri(serverPort), realm).proxy(ConsoleResource.class)+ def testuser1NotificationResource = getClientApiTarget(serverUri(serverPort), MASTER_REALM, testuser1AccessToken).proxy(NotificationResource.class)+ def testuser2NotificationResource = getClientApiTarget(serverUri(serverPort), realm, testuser2AccessToken).proxy(NotificationResource.class)+ def testuser3NotificationResource = getClientApiTarget(serverUri(serverPort), realm, testuser3AccessToken).proxy(NotificationResource.class)+ def adminNotificationResource = getClientApiTarget(serverUri(serverPort), MASTER_REALM, adminAccessToken).proxy(NotificationResource.class)+ def anonymousNotificationResource = getClientApiTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm).proxy(NotificationResource.class)+ def testuser1ConsoleResource = getClientApiTarget(serverUri(serverPort), MASTER_REALM, testuser1AccessToken).proxy(ConsoleResource.class)+ def testuser2ConsoleResource = getClientApiTarget(serverUri(serverPort), realm, testuser2AccessToken).proxy(ConsoleResource.class)+ def testuser3ConsoleResource = getClientApiTarget(serverUri(serverPort), realm, testuser3AccessToken).proxy(ConsoleResource.class)+ def adminConsoleResource = getClientApiTarget(serverUri(serverPort), MASTER_REALM, adminAccessToken).proxy(ConsoleResource.class)+ def anonymousConsoleResource = getClientApiTarget(serverUri(serverPort), realm).proxy(ConsoleResource.class)when: "various consoles are registered"def consoleRegistration = new ConsoleRegistration(null,diff --git a/test/src/test/groovy/org/openremote/test/protocol/KNXImportTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/KNXImportTest.groovyindex 147a2ca73..f4b748598 100644--- a/test/src/test/groovy/org/openremote/test/protocol/KNXImportTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/KNXImportTest.groovy@@ -87,7 +87,7 @@ class KNXImportTest extends Specification implements ManagerContainerTrait {).tokenand: "the agent resource"- def agentResource = getClientTarget(serverUri(serverPort), MASTER_REALM, accessToken).proxy(AgentResource.class)+ def agentResource = getClientApiTarget(serverUri(serverPort), MASTER_REALM, accessToken).proxy(AgentResource.class)and: "the container is running"container.isRunning()diff --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 5e5a90a66..bad4e86f3 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@@ -291,15 +291,15 @@ class HttpServerProtocolTest extends Specification implements ManagerContainerTrand: "the test resource (to be deployed by the protocol)"def authenticatedTestResource = getClientTarget(- serverUri(serverPort),- MASTER_REALM,- AbstractHttpServerProtocol.DEFAULT_DEPLOYMENT_PATH_PREFIX + "/test",+ serverUri(serverPort)+ .path(AbstractHttpServerProtocol.DEFAULT_DEPLOYMENT_PATH_PREFIX)+ .path("test"),accessToken).proxy(TestResource.class)def testResource = getClientTarget(- serverUri(serverPort),- MASTER_REALM,- AbstractHttpServerProtocol.DEFAULT_DEPLOYMENT_PATH_PREFIX + "/test",- null).proxy(TestResource.class)+ serverUri(serverPort)+ .path(AbstractHttpServerProtocol.DEFAULT_DEPLOYMENT_PATH_PREFIX)+ .path("test"),+ null).proxy(TestResource.class)when: "an agent with a test HTTP server protocol configuration is created"def agent = new Asset()@@ -375,7 +375,7 @@ class HttpServerProtocolTest extends Specification implements ManagerContainerTragent = assetStorageService.merge(agent)and: "an un-authenticated test resource proxy is created for the new deployment"- def testResource2 = getClientTarget(+ def testResource2 = getClientApiTarget(serverUri(serverPort),MASTER_REALM,AbstractHttpServerProtocol.DEFAULT_DEPLOYMENT_PATH_PREFIX + "/test2",diff --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 a51d8a814..fb0aa88e0 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@@ -181,7 +181,7 @@ class VelbusProtocolTest extends Specification implements ManagerContainerTrait).tokenand: "the agent resource"- def agentResource = getClientTarget(serverUri(serverPort), MASTER_REALM, accessToken).proxy(AgentResource.class)+ def agentResource = getClientApiTarget(serverUri(serverPort), MASTER_REALM, accessToken).proxy(AgentResource.class)when: "the container is running"container.isRunning()diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovyindex f788d45ff..6cbc37011 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy@@ -45,7 +45,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer).tokenand: "the ruleset resource"- def rulesetResource = getClientTarget(serverUri(serverPort), MASTER_REALM, accessToken).proxy(RulesResource.class)+ def rulesetResource = getClientApiTarget(serverUri(serverPort), MASTER_REALM, accessToken).proxy(RulesResource.class)expect: "the rules engines to be ready"new PollingConditions(initialDelay: 2, timeout: 10, delay: 1).eventually {@@ -319,7 +319,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer).tokenand: "the ruleset resource"- def rulesetResource = getClientTarget(serverUri(serverPort), MASTER_REALM, accessToken).proxy(RulesResource.class)+ def rulesetResource = getClientApiTarget(serverUri(serverPort), MASTER_REALM, accessToken).proxy(RulesResource.class)expect: "the rules engines to be ready"new PollingConditions(initialDelay: 3, timeout: 20, delay: 1).eventually {@@ -549,7 +549,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer).tokenand: "the ruleset resource"- def rulesetResource = getClientTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm, accessToken).proxy(RulesResource.class)+ def rulesetResource = getClientApiTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm, accessToken).proxy(RulesResource.class)expect: "the rules engines to be ready"new PollingConditions(initialDelay: 3, timeout: 20, delay: 1).eventually {@@ -697,7 +697,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer).tokenand: "the ruleset resource"- def rulesetResource = getClientTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm, accessToken).proxy(RulesResource.class)+ def rulesetResource = getClientApiTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm, accessToken).proxy(RulesResource.class)expect: "the rules engines to be ready"new PollingConditions(initialDelay: 3, timeout: 20, delay: 1).eventually {diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovyindex 855b63178..f1198f09a 100644--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy@@ -108,7 +108,7 @@ class ResidenceNotifyAlarmTriggerTest extends Specification implements ManagerCo).tokenand: "the notification and console resources"- def authenticatedConsoleResource = getClientTarget(serverUri(serverPort), realm, accessToken).proxy(ConsoleResource.class)+ def authenticatedConsoleResource = getClientApiTarget(serverUri(serverPort), realm, accessToken).proxy(ConsoleResource.class)when: "a console is registered by the test user"def consoleRegistration = new ConsoleRegistration(null,