Fixed issues in integration tests
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e1e6c1a6 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e1e6c1a6 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e1e6c1a6 Branch: refs/heads/tenant-isolation Commit: e1e6c1a6c61712e4efdb628c7f86cb5701b5a3e4 Parents: 203d893 Author: Dinithi <[email protected]> Authored: Thu Aug 6 18:43:16 2015 +0530 Committer: Dinithi <[email protected]> Committed: Thu Aug 6 18:43:16 2015 +0530 ---------------------------------------------------------------------- .../tests/SampleApplicationsTest.java | 46 ++++++++++---------- .../application-policy-1.json | 4 +- 2 files changed, 26 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/e1e6c1a6/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java index 61bb287..f05bd51 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java @@ -379,7 +379,7 @@ public class SampleApplicationsTest extends StratosTestServerManager { } } - + @Test public void testDeployApplication() { try { //Initializing event Receivers @@ -442,13 +442,13 @@ public class SampleApplicationsTest extends StratosTestServerManager { assertEquals(deployed, true); //Application active handling - assertApplicationActivation(bean.getApplicationId()); + assertApplicationActivation(bean.getApplicationUuid()); //Group active handling - assertGroupActivation(bean.getApplicationId()); + assertGroupActivation(bean.getApplicationUuid()); //Cluster active handling - assertClusterActivation(bean.getApplicationId()); + assertClusterActivation(bean.getApplicationUuid()); //Updating application /* boolean updated = applicationTest.updateApplication("g-sc-G123-1.json", @@ -825,35 +825,35 @@ public class SampleApplicationsTest extends StratosTestServerManager { /** * Assert application activation * - * @param applicationName + * @param applicationUuid */ - private void assertApplicationActivation(String applicationName) { + private void assertApplicationActivation(String applicationUuid) { long startTime = System.currentTimeMillis(); - Application application = ApplicationManager.getApplications().getApplication(applicationName); + Application application = ApplicationManager.getApplications().getApplication(applicationUuid); while (!((application != null) && (application.getStatus() == ApplicationStatus.Active))) { try { Thread.sleep(1000); } catch (InterruptedException ignore) { } - application = ApplicationManager.getApplications().getApplication(applicationName); + application = ApplicationManager.getApplications().getApplication(applicationUuid); if ((System.currentTimeMillis() - startTime) > APPLICATION_ACTIVATION_TIMEOUT) { break; } } - assertNotNull(String.format("Application is not found: [application-id] %s", applicationName), application); - assertEquals(String.format("Application status did not change to active: [application-id] %s", applicationName), + assertNotNull(String.format("Application is not found: [application-id] %s", applicationUuid), application); + assertEquals(String.format("Application status did not change to active: [application-id] %s", applicationUuid), ApplicationStatus.Active, application.getStatus()); } /** * Assert application activation * - * @param applicationName + * @param applicationUuid */ - private void assertGroupActivation(String applicationName) { - Application application = ApplicationManager.getApplications().getApplication(applicationName); + private void assertGroupActivation(String applicationUuid) { + Application application = ApplicationManager.getApplications().getApplication(applicationUuid); assertNotNull(String.format("Application is not found: [application-id] %s", - applicationName), application); + applicationUuid), application); Collection<Group> groups = application.getAllGroupsRecursively(); for(Group group : groups) { @@ -864,24 +864,24 @@ public class SampleApplicationsTest extends StratosTestServerManager { /** * Assert application activation * - * @param applicationName + * @param applicationUuid */ - private void assertClusterActivation(String applicationName) { - Application application = ApplicationManager.getApplications().getApplication(applicationName); + private void assertClusterActivation(String applicationUuid) { + Application application = ApplicationManager.getApplications().getApplication(applicationUuid); assertNotNull(String.format("Application is not found: [application-id] %s", - applicationName), application); + applicationUuid), application); Set<ClusterDataHolder> clusterDataHolderSet = application.getClusterDataRecursively(); for(ClusterDataHolder clusterDataHolder : clusterDataHolderSet) { - String serviceName = clusterDataHolder.getServiceType(); + String serviceUuid = clusterDataHolder.getServiceUuid(); String clusterId = clusterDataHolder.getClusterId(); - Service service = TopologyManager.getTopology().getService(serviceName); + Service service = TopologyManager.getTopology().getService(serviceUuid); assertNotNull(String.format("Service is not found: [application-id] %s [service] %s", - applicationName, serviceName), service); + applicationUuid, serviceUuid), service); Cluster cluster = service.getCluster(clusterId); assertNotNull(String.format("Cluster is not found: [application-id] %s [service] %s [cluster-id] %s", - applicationName, serviceName, clusterId), cluster); + applicationUuid, serviceUuid, clusterId), cluster); boolean clusterActive = false; for (ClusterInstance instance : cluster.getInstanceIdToInstanceContextMap().values()) { @@ -894,6 +894,8 @@ public class SampleApplicationsTest extends StratosTestServerManager { } } clusterActive = activeInstances >= clusterDataHolder.getMinInstances(); + log.info(String.format("Active instance count: %s, Min instance count: %s", activeInstances, + clusterDataHolder.getMinInstances())); if (!clusterActive) { break; http://git-wip-us.apache.org/repos/asf/stratos/blob/e1e6c1a6/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-1.json b/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-1.json index 17858bb..12b9bd4 100644 --- a/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-1.json +++ b/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-1.json @@ -3,11 +3,11 @@ "algorithm": "one-after-another", "networkPartitions": [ "network-partition-1", - "network-partition-2" + "network-partition-2" ], "properties": [ { - "name": "networkPartitionGroups", + "name": "key-1", "value": "network-partition-1,network-partition-2" }, {
