diff --git a/management/testing/integration-tests/src/test/java/org/terracotta/management/integration/tests/AbstractSingleTest.java b/management/testing/integration-tests/src/test/java/org/terracotta/management/integration/tests/AbstractSingleTest.java new file mode 100644 index 0000000000..702a69c547 --- /dev/null +++ b/management/testing/integration-tests/src/test/java/org/terracotta/management/integration/tests/AbstractSingleTest.java @@ -0,0 +1,55 @@ +/* + * Copyright Terracotta, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.terracotta.management.integration.tests; + +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.terracotta.testing.rules.BasicExternalCluster; + +import java.io.File; + +import static java.util.Collections.emptyList; + +/** + * @author Mathieu Carbou + */ +public abstract class AbstractSingleTest extends AbstractTest { + + private final String offheapResource = "primary-server-resource"; + private final String resourceConfig = + "" + + "" + + "64" + + "" + + "\n"; + + @Rule + public org.terracotta.testing.rules.Cluster voltron = + new BasicExternalCluster(new File("target/galvan"), 1, emptyList(), "", resourceConfig, ""); + + @Before + public void setUp() throws Exception { + voltron.getClusterControl().waitForActive(); + commonSetUp(voltron); + } + + @After + public void tearDown() throws Exception { + commonTearDown(); + } + +} diff --git a/management/testing/sample-entity/src/test/java/org/terracotta/management/entity/sample/ClientCacheRemoteManagementTest.java b/management/testing/integration-tests/src/test/java/org/terracotta/management/integration/tests/ClientCacheRemoteManagementIT.java similarity index 97% rename from management/testing/sample-entity/src/test/java/org/terracotta/management/entity/sample/ClientCacheRemoteManagementTest.java rename to management/testing/integration-tests/src/test/java/org/terracotta/management/integration/tests/ClientCacheRemoteManagementIT.java index 7b6bdd0031..2d08f4c91f 100644 --- a/management/testing/sample-entity/src/test/java/org/terracotta/management/entity/sample/ClientCacheRemoteManagementTest.java +++ b/management/testing/integration-tests/src/test/java/org/terracotta/management/integration/tests/ClientCacheRemoteManagementIT.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.terracotta.management.entity.sample; +package org.terracotta.management.integration.tests; import org.junit.Test; import org.terracotta.management.model.call.Parameter; @@ -37,7 +37,7 @@ /** * @author Mathieu Carbou */ -public class ClientCacheRemoteManagementTest extends AbstractTest { +public class ClientCacheRemoteManagementIT extends AbstractSingleTest { @Test public void can_access_remote_management_registry_of_client() throws Exception { diff --git a/management/testing/sample-entity/src/test/java/org/terracotta/management/entity/sample/ServerCacheManagementTest.java b/management/testing/integration-tests/src/test/java/org/terracotta/management/integration/tests/ServerCacheManagementIT.java similarity index 98% rename from management/testing/sample-entity/src/test/java/org/terracotta/management/entity/sample/ServerCacheManagementTest.java rename to management/testing/integration-tests/src/test/java/org/terracotta/management/integration/tests/ServerCacheManagementIT.java index 68b259493c..00e86a4c3e 100644 --- a/management/testing/sample-entity/src/test/java/org/terracotta/management/entity/sample/ServerCacheManagementTest.java +++ b/management/testing/integration-tests/src/test/java/org/terracotta/management/integration/tests/ServerCacheManagementIT.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.terracotta.management.entity.sample; +package org.terracotta.management.integration.tests; import org.junit.Test; import org.terracotta.management.entity.tms.TmsAgentConfig; @@ -40,7 +40,7 @@ /** * @author Mathieu Carbou */ -public class ServerCacheManagementTest extends AbstractTest { +public class ServerCacheManagementIT extends AbstractSingleTest { @Test public void can_access_remote_management_registry_on_server() throws Exception { diff --git a/management/testing/sample-entity/src/test/java/org/terracotta/management/entity/sample/TopologyTest.java b/management/testing/integration-tests/src/test/java/org/terracotta/management/integration/tests/TopologyIT.java similarity index 81% rename from management/testing/sample-entity/src/test/java/org/terracotta/management/entity/sample/TopologyTest.java rename to management/testing/integration-tests/src/test/java/org/terracotta/management/integration/tests/TopologyIT.java index 47675804ae..0077c16b55 100644 --- a/management/testing/sample-entity/src/test/java/org/terracotta/management/entity/sample/TopologyTest.java +++ b/management/testing/integration-tests/src/test/java/org/terracotta/management/integration/tests/TopologyIT.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.terracotta.management.entity.sample; +package org.terracotta.management.integration.tests; import org.junit.Test; import org.terracotta.management.model.capabilities.descriptors.Settings; @@ -34,7 +34,7 @@ /** * @author Mathieu Carbou */ -public class TopologyTest extends AbstractTest { +public class TopologyIT extends AbstractSingleTest { @Test public void can_read_topology() throws Exception { @@ -70,9 +70,32 @@ public void can_read_topology() throws Exception { .replace(client.getHostName(), "") .replace(client.getHostAddress(), "127.0.0.1")); + String actual = replaceHostname(zeroPortsAndUptime(currentTopo[0])); + String expected = replaceVersion(readJson("topology.json").toString()); + + System.out.println("This is the actual topology : " + actual); + System.out.println("This is the expected topology : " + expected); // and compare + assertEquals(expected, actual); + } + + private String zeroPortsAndUptime(String s) { + return s.replaceAll("(\"bindPort\":[0-9]+)", "\"bindPort\":0") + .replaceAll("(\"groupPort\":[0-9]+)", "\"groupPort\":0") + .replaceAll("(\"upTimeSec\":[0-9]+)", "\"upTimeSec\":0"); + } + + private String replaceHostname(String s) { + return s.replaceAll("\"hostname\":(.*),", "\"hostname\":\"\","); + } - assertEquals(readJson("topology.json").toString(), currentTopo[0]); + /** + * + * @param topology, probably from topology.json + * @return the same topology, but replacing VERSION_TO_REPLACE with the tc core version from the pom + */ + private String replaceVersion(String topology) { + return topology.replace("VERSION_TO_REPLACE", System.getProperty("kitInstallationPath").substring(System.getProperty("kitInstallationPath").lastIndexOf("terracotta-") + 11, System.getProperty("kitInstallationPath").length()-1)); } @Test diff --git a/management/testing/integration-tests/src/test/resources/client-descriptors.json b/management/testing/integration-tests/src/test/resources/client-descriptors.json new file mode 100644 index 0000000000..97c6aa470c --- /dev/null +++ b/management/testing/integration-tests/src/test/resources/client-descriptors.json @@ -0,0 +1,186 @@ +[ + { + "name": "CacheCalls", + "descriptors": [ + { + "name": "clear", + "returnType": "void", + "parameters": [] + }, + { + "name": "get", + "returnType": "java.lang.String", + "parameters": [ + { + "name": "key", + "type": "java.lang.String" + } + ] + }, + { + "name": "put", + "returnType": "void", + "parameters": [ + { + "name": "key", + "type": "java.lang.String" + }, + { + "name": "value", + "type": "java.lang.String" + } + ] + }, + { + "name": "size", + "returnType": "int", + "parameters": [] + } + ], + "capabilityContext": { + "attributes": [ + { + "name": "appName", + "required": true + }, + { + "name": "cacheName", + "required": true + } + ] + } + }, + { + "name": "CacheSettings", + "descriptors": [ + { + "appName": "pet-clinic", + "cacheName": "pets", + "size": 0 + }, + { + "appName": "pet-clinic", + "cacheName": "clients", + "size": 0 + } + ], + "capabilityContext": { + "attributes": [ + { + "name": "appName", + "required": true + }, + { + "name": "cacheName", + "required": true + } + ] + } + }, + { + "name": "CacheStatistics", + "properties": { + "averageWindowDuration": 1, + "averageWindowUnit": "MINUTES", + "historySize": 100, + "historyInterval": 1, + "historyIntervalUnit": "SECONDS", + "timeToDisable": 5, + "timeToDisableUnit": "SECONDS" + }, + "descriptors": [ + { + "name": "Cache:ClearCount", + "type": "COUNTER_HISTORY" + }, + { + "name": "Cache:ClearRate", + "type": "RATE_HISTORY" + }, + { + "name": "Cache:HitCount", + "type": "COUNTER_HISTORY" + }, + { + "name": "Cache:HitRate", + "type": "RATE_HISTORY" + }, + { + "name": "Cache:HitRatio", + "type": "RATIO_HISTORY" + }, + { + "name": "Cache:MissCount", + "type": "COUNTER_HISTORY" + }, + { + "name": "Cache:MissRate", + "type": "RATE_HISTORY" + }, + { + "name": "Cache:MissRatio", + "type": "RATIO_HISTORY" + }, + { + "name": "ClientCache:Size", + "type": "SIZE_HISTORY" + } + ], + "capabilityContext": { + "attributes": [ + { + "name": "appName", + "required": true + }, + { + "name": "cacheName", + "required": true + } + ] + } + }, + { + "name": "ManagementAgentService", + "descriptors": [], + "capabilityContext": { + "attributes": [] + } + }, + { + "name": "StatisticCollectorCapability", + "descriptors": [ + { + "name": "startStatisticCollector", + "returnType": "void", + "parameters": [] + }, + { + "name": "stopStatisticCollector", + "returnType": "void", + "parameters": [] + }, + { + "name": "updateCollectedStatistics", + "returnType": "void", + "parameters": [ + { + "name": "capabilityName", + "type": "java.lang.String" + }, + { + "name": "statisticNames", + "type": "java.util.Collection" + } + ] + } + ], + "capabilityContext": { + "attributes": [ + { + "name": "appName", + "required": true + } + ] + } + } +] \ No newline at end of file diff --git a/management/testing/sample-entity/src/test/resources/notifications.json b/management/testing/integration-tests/src/test/resources/notifications.json similarity index 84% rename from management/testing/sample-entity/src/test/resources/notifications.json rename to management/testing/integration-tests/src/test/resources/notifications.json index 60e6bfe962..e92fe07b13 100644 --- a/management/testing/sample-entity/src/test/resources/notifications.json +++ b/management/testing/integration-tests/src/test/resources/notifications.json @@ -3,10 +3,10 @@ "type": "SERVER_ENTITY_CREATED", "context": { "stripeId": "SINGLE", - "serverId": "stripe-1_0", - "serverName": "stripe-1_0", - "entityId": "TopologyTest:org.terracotta.management.entity.tms.client.TmsAgentEntity", - "entityName": "TopologyTest", + "serverId": "testServer0", + "serverName": "testServer0", + "entityId": "TopologyIT:org.terracotta.management.entity.tms.client.TmsAgentEntity", + "entityName": "TopologyIT", "entityType": "org.terracotta.management.entity.tms.client.TmsAgentEntity", "consumerId": "1" }, @@ -16,10 +16,10 @@ "type": "ENTITY_REGISTRY_AVAILABLE", "context": { "stripeId": "SINGLE", - "serverId": "stripe-1_0", - "serverName": "stripe-1_0", - "entityId": "TopologyTest:org.terracotta.management.entity.tms.client.TmsAgentEntity", - "entityName": "TopologyTest", + "serverId": "testServer0", + "serverName": "testServer0", + "entityId": "TopologyIT:org.terracotta.management.entity.tms.client.TmsAgentEntity", + "entityName": "TopologyIT", "entityType": "org.terracotta.management.entity.tms.client.TmsAgentEntity", "consumerId": "1" }, @@ -29,15 +29,15 @@ "type": "SERVER_ENTITY_FETCHED", "context": { "stripeId": "SINGLE", - "serverId": "stripe-1_0", - "serverName": "stripe-1_0", - "entityId": "TopologyTest:org.terracotta.management.entity.tms.client.TmsAgentEntity", - "entityName": "TopologyTest", + "serverId": "testServer0", + "serverName": "testServer0", + "entityId": "TopologyIT:org.terracotta.management.entity.tms.client.TmsAgentEntity", + "entityName": "TopologyIT", "entityType": "org.terracotta.management.entity.tms.client.TmsAgentEntity", "consumerId": "1" }, "attributes": { - "clientId": "0@127.0.0.1:TopologyTest:" + "clientId": "0@127.0.0.1:TopologyIT:" } }, { @@ -51,8 +51,8 @@ "type": "SERVER_ENTITY_CREATED", "context": { "stripeId": "SINGLE", - "serverId": "stripe-1_0", - "serverName": "stripe-1_0", + "serverId": "testServer0", + "serverName": "testServer0", "entityId": "ManagementAgent:org.terracotta.management.entity.management.client.ManagementAgentEntity", "entityName": "ManagementAgent", "entityType": "org.terracotta.management.entity.management.client.ManagementAgentEntity", @@ -64,8 +64,8 @@ "type": "SERVER_ENTITY_FETCHED", "context": { "stripeId": "SINGLE", - "serverId": "stripe-1_0", - "serverName": "stripe-1_0", + "serverId": "testServer0", + "serverName": "testServer0", "entityId": "ManagementAgent:org.terracotta.management.entity.management.client.ManagementAgentEntity", "entityName": "ManagementAgent", "entityType": "org.terracotta.management.entity.management.client.ManagementAgentEntity", @@ -108,8 +108,8 @@ "type": "SERVER_ENTITY_FETCHED", "context": { "stripeId": "SINGLE", - "serverId": "stripe-1_0", - "serverName": "stripe-1_0", + "serverId": "testServer0", + "serverName": "testServer0", "entityId": "ManagementAgent:org.terracotta.management.entity.management.client.ManagementAgentEntity", "entityName": "ManagementAgent", "entityType": "org.terracotta.management.entity.management.client.ManagementAgentEntity", @@ -145,8 +145,8 @@ "type": "SERVER_ENTITY_CREATED", "context": { "stripeId": "SINGLE", - "serverId": "stripe-1_0", - "serverName": "stripe-1_0", + "serverId": "testServer0", + "serverName": "testServer0", "entityId": "pet-clinic/pets:org.terracotta.management.entity.sample.client.CacheEntity", "entityName": "pet-clinic/pets", "entityType": "org.terracotta.management.entity.sample.client.CacheEntity", @@ -158,8 +158,8 @@ "type": "ENTITY_REGISTRY_AVAILABLE", "context": { "stripeId": "SINGLE", - "serverId": "stripe-1_0", - "serverName": "stripe-1_0", + "serverId": "testServer0", + "serverName": "testServer0", "entityId": "pet-clinic/pets:org.terracotta.management.entity.sample.client.CacheEntity", "entityName": "pet-clinic/pets", "entityType": "org.terracotta.management.entity.sample.client.CacheEntity", @@ -171,8 +171,8 @@ "type": "ENTITY_REGISTRY_UPDATED", "context": { "stripeId": "SINGLE", - "serverId": "stripe-1_0", - "serverName": "stripe-1_0", + "serverId": "testServer0", + "serverName": "testServer0", "entityId": "pet-clinic/pets:org.terracotta.management.entity.sample.client.CacheEntity", "entityName": "pet-clinic/pets", "entityType": "org.terracotta.management.entity.sample.client.CacheEntity", @@ -187,8 +187,8 @@ "alias": "pet-clinic/pets", "type": "ServerCache", "stripeId": "SINGLE", - "serverId": "stripe-1_0", - "serverName": "stripe-1_0", + "serverId": "testServer0", + "serverName": "testServer0", "entityId": "pet-clinic/pets:org.terracotta.management.entity.sample.client.CacheEntity", "entityName": "pet-clinic/pets", "entityType": "org.terracotta.management.entity.sample.client.CacheEntity" @@ -199,8 +199,8 @@ "type": "SERVER_ENTITY_FETCHED", "context": { "stripeId": "SINGLE", - "serverId": "stripe-1_0", - "serverName": "stripe-1_0", + "serverId": "testServer0", + "serverName": "testServer0", "entityId": "pet-clinic/pets:org.terracotta.management.entity.sample.client.CacheEntity", "entityName": "pet-clinic/pets", "entityType": "org.terracotta.management.entity.sample.client.CacheEntity", @@ -230,8 +230,8 @@ "type": "SERVER_ENTITY_FETCHED", "context": { "stripeId": "SINGLE", - "serverId": "stripe-1_0", - "serverName": "stripe-1_0", + "serverId": "testServer0", + "serverName": "testServer0", "entityId": "pet-clinic/pets:org.terracotta.management.entity.sample.client.CacheEntity", "entityName": "pet-clinic/pets", "entityType": "org.terracotta.management.entity.sample.client.CacheEntity", @@ -261,8 +261,8 @@ "type": "SERVER_ENTITY_CREATED", "context": { "stripeId": "SINGLE", - "serverId": "stripe-1_0", - "serverName": "stripe-1_0", + "serverId": "testServer0", + "serverName": "testServer0", "entityId": "pet-clinic/clients:org.terracotta.management.entity.sample.client.CacheEntity", "entityName": "pet-clinic/clients", "entityType": "org.terracotta.management.entity.sample.client.CacheEntity", @@ -274,8 +274,8 @@ "type": "ENTITY_REGISTRY_AVAILABLE", "context": { "stripeId": "SINGLE", - "serverId": "stripe-1_0", - "serverName": "stripe-1_0", + "serverId": "testServer0", + "serverName": "testServer0", "entityId": "pet-clinic/clients:org.terracotta.management.entity.sample.client.CacheEntity", "entityName": "pet-clinic/clients", "entityType": "org.terracotta.management.entity.sample.client.CacheEntity", @@ -287,8 +287,8 @@ "type": "ENTITY_REGISTRY_UPDATED", "context": { "stripeId": "SINGLE", - "serverId": "stripe-1_0", - "serverName": "stripe-1_0", + "serverId": "testServer0", + "serverName": "testServer0", "entityId": "pet-clinic/clients:org.terracotta.management.entity.sample.client.CacheEntity", "entityName": "pet-clinic/clients", "entityType": "org.terracotta.management.entity.sample.client.CacheEntity", @@ -303,8 +303,8 @@ "alias": "pet-clinic/clients", "type": "ServerCache", "stripeId": "SINGLE", - "serverId": "stripe-1_0", - "serverName": "stripe-1_0", + "serverId": "testServer0", + "serverName": "testServer0", "entityId": "pet-clinic/clients:org.terracotta.management.entity.sample.client.CacheEntity", "entityName": "pet-clinic/clients", "entityType": "org.terracotta.management.entity.sample.client.CacheEntity" @@ -315,8 +315,8 @@ "type": "SERVER_ENTITY_FETCHED", "context": { "stripeId": "SINGLE", - "serverId": "stripe-1_0", - "serverName": "stripe-1_0", + "serverId": "testServer0", + "serverName": "testServer0", "entityId": "pet-clinic/clients:org.terracotta.management.entity.sample.client.CacheEntity", "entityName": "pet-clinic/clients", "entityType": "org.terracotta.management.entity.sample.client.CacheEntity", @@ -346,8 +346,8 @@ "type": "SERVER_ENTITY_FETCHED", "context": { "stripeId": "SINGLE", - "serverId": "stripe-1_0", - "serverName": "stripe-1_0", + "serverId": "testServer0", + "serverName": "testServer0", "entityId": "pet-clinic/clients:org.terracotta.management.entity.sample.client.CacheEntity", "entityName": "pet-clinic/clients", "entityType": "org.terracotta.management.entity.sample.client.CacheEntity", diff --git a/management/testing/sample-entity/src/test/resources/server-descriptors.json b/management/testing/integration-tests/src/test/resources/server-descriptors.json similarity index 100% rename from management/testing/sample-entity/src/test/resources/server-descriptors.json rename to management/testing/integration-tests/src/test/resources/server-descriptors.json diff --git a/management/testing/sample-entity/src/test/resources/topology.json b/management/testing/integration-tests/src/test/resources/topology.json similarity index 96% rename from management/testing/sample-entity/src/test/resources/topology.json rename to management/testing/integration-tests/src/test/resources/topology.json index 273ade3cd2..f7fd47e692 100644 --- a/management/testing/sample-entity/src/test/resources/topology.json +++ b/management/testing/integration-tests/src/test/resources/topology.json @@ -5,7 +5,7 @@ "name": "SINGLE", "servers": [ { - "id": "stripe-1_0", + "id": "testServer0", "serverEntities": [ { "id": "ManagementAgent:org.terracotta.management.entity.management.client.ManagementAgentEntity", @@ -15,9 +15,9 @@ "managementRegistry": null }, { - "id": "TopologyTest:org.terracotta.management.entity.tms.client.TmsAgentEntity", + "id": "TopologyIT:org.terracotta.management.entity.tms.client.TmsAgentEntity", "type": "org.terracotta.management.entity.tms.client.TmsAgentEntity", - "name": "TopologyTest", + "name": "TopologyIT", "consumerId": 1, "managementRegistry": { "contextContainer": { @@ -44,10 +44,10 @@ "descriptors": [ { "consumerId": "1", - "alias": "primary-resource", + "alias": "primary-server-resource", "type": "OffHeapResource", - "capacity": 33554432, - "availableAtTime": 33554432 + "capacity": 67108864, + "availableAtTime": 67108864 }, { "type": "OffHeapResourceSettingsManagementProvider", @@ -438,14 +438,14 @@ } } ], - "serverName": "stripe-1_0", - "hostName": "localhost", + "serverName": "testServer0", + "hostName": "", "hostAddress": "127.0.0.1", "bindAddress": "0.0.0.0", "bindPort": 0, "groupPort": 0, "state": "ACTIVE", - "version": "Version Passthrough 5.0.0-SNAPSHOT", + "version": "VERSION_TO_REPLACE", "buildId": "Build ID", "startTime": 0, "upTimeSec": 0, @@ -456,27 +456,27 @@ ], "clients": [ { - "id": "0@127.0.0.1:TopologyTest:", + "id": "0@127.0.0.1:TopologyIT:", "pid": 0, "hostAddress": "127.0.0.1", - "name": "TopologyTest", + "name": "TopologyIT", "logicalConnectionUid": "", "vmId": "0@127.0.0.1", - "clientId": "0@127.0.0.1:TopologyTest:", + "clientId": "0@127.0.0.1:TopologyIT:", "hostName": "", "tags": [], "connections": [ { - "id": ":SINGLE:stripe-1_0:127.0.0.1:0", + "id": ":SINGLE:testServer0:127.0.0.1:0", "logicalConnectionUid": "", "clientEndpoint": { "address": "127.0.0.1", "port": 0 }, "stripeId": "SINGLE", - "serverId": "stripe-1_0", + "serverId": "testServer0", "serverEntityIds": { - "TopologyTest:org.terracotta.management.entity.tms.client.TmsAgentEntity": 1 + "TopologyIT:org.terracotta.management.entity.tms.client.TmsAgentEntity": 1 } } ], @@ -497,14 +497,14 @@ ], "connections": [ { - "id": ":SINGLE:stripe-1_0:127.0.0.1:0", + "id": ":SINGLE:testServer0:127.0.0.1:0", "logicalConnectionUid": "", "clientEndpoint": { "address": "127.0.0.1", "port": 0 }, "stripeId": "SINGLE", - "serverId": "stripe-1_0", + "serverId": "testServer0", "serverEntityIds": { "ManagementAgent:org.terracotta.management.entity.management.client.ManagementAgentEntity": 1, "pet-clinic/clients:org.terracotta.management.entity.sample.client.CacheEntity": 1, @@ -710,14 +710,14 @@ ], "connections": [ { - "id": ":SINGLE:stripe-1_0:127.0.0.1:0", + "id": ":SINGLE:testServer0:127.0.0.1:0", "logicalConnectionUid": "", "clientEndpoint": { "address": "127.0.0.1", "port": 0 }, "stripeId": "SINGLE", - "serverId": "stripe-1_0", + "serverId": "testServer0", "serverEntityIds": { "ManagementAgent:org.terracotta.management.entity.management.client.ManagementAgentEntity": 1, "pet-clinic/clients:org.terracotta.management.entity.sample.client.CacheEntity": 1,