You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/08/13 14:43:10 UTC
stratos git commit: Update integration test
Repository: stratos
Updated Branches:
refs/heads/tenant-isolation d819d1aae -> 89b1254c3
Update integration test
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/89b1254c
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/89b1254c
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/89b1254c
Branch: refs/heads/tenant-isolation
Commit: 89b1254c36bae00ab3c71dd28843a677f3e15fc2
Parents: d819d1a
Author: Gayan Gunarathne <ga...@wso2.com>
Authored: Thu Aug 13 18:12:56 2015 +0530
Committer: Gayan Gunarathne <ga...@wso2.com>
Committed: Thu Aug 13 18:12:56 2015 +0530
----------------------------------------------------------------------
.../application/PartitionRoundRobinClusterTest.java | 10 +++++-----
.../tests/application/SingleClusterScalingTest.java | 12 ++++++------
.../integration/src/test/resources/stratos-testing.xml | 1 +
3 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/89b1254c/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionRoundRobinClusterTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionRoundRobinClusterTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionRoundRobinClusterTest.java
index ab7d592..477091b 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionRoundRobinClusterTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionRoundRobinClusterTest.java
@@ -203,21 +203,21 @@ public class PartitionRoundRobinClusterTest extends StratosTestServerManager {
* @param applicationName
*/
private void assertClusterWithRoundRobinAlgorithm(String applicationName) {
- Application application = ApplicationManager.getApplications().getApplication(applicationName);
+ Application application = ApplicationManager.getApplications().getApplicationByTenant(applicationName, -1234);
assertNotNull(String.format("Application is not found: [application-id] %s",
applicationName), 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);
+ applicationName, 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);
+ applicationName, serviceUUid, clusterId), cluster);
for (ClusterInstance instance : cluster.getInstanceIdToInstanceContextMap().values()) {
List<String> partitionsUsedInMembers = new ArrayList<String>();
http://git-wip-us.apache.org/repos/asf/stratos/blob/89b1254c/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/SingleClusterScalingTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/SingleClusterScalingTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/SingleClusterScalingTest.java
index f5fba7c..2acb579 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/SingleClusterScalingTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/SingleClusterScalingTest.java
@@ -196,7 +196,7 @@ public class SingleClusterScalingTest extends StratosTestServerManager {
* @param applicationName
*/
private void assertClusterWithScalingup(String applicationName) {
- Application application = ApplicationManager.getApplications().getApplication(applicationName);
+ Application application = ApplicationManager.getApplications().getApplicationByTenant(applicationName,-1234);
assertNotNull(String.format("Application is not found: [application-id] %s",
applicationName), application);
boolean clusterScaleup = false;
@@ -209,15 +209,15 @@ public class SingleClusterScalingTest extends StratosTestServerManager {
}
Set<ClusterDataHolder> clusterDataHolderSet = application.getClusterDataRecursively();
for (ClusterDataHolder clusterDataHolder : clusterDataHolderSet) {
- String serviceName = clusterDataHolder.getServiceType();
+ String serviceUuid = clusterDataHolder.getServiceUuid();
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);
+ applicationName, 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);
+ applicationName, serviceUuid, clusterId), cluster);
for (ClusterInstance instance : cluster.getInstanceIdToInstanceContextMap().values()) {
int activeInstances = 0;
for (Member member : cluster.getMembers()) {
@@ -232,7 +232,7 @@ public class SingleClusterScalingTest extends StratosTestServerManager {
break;
}
}
- application = ApplicationManager.getApplications().getApplication(applicationName);
+ application = ApplicationManager.getApplications().getApplicationByTenant(applicationName,-1234);
if ((System.currentTimeMillis() - startTime) > CLUSTER_SCALE_UP_TIMEOUT) {
break;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/89b1254c/products/stratos/modules/integration/src/test/resources/stratos-testing.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/stratos-testing.xml b/products/stratos/modules/integration/src/test/resources/stratos-testing.xml
index 31118dc..c50a636 100644
--- a/products/stratos/modules/integration/src/test/resources/stratos-testing.xml
+++ b/products/stratos/modules/integration/src/test/resources/stratos-testing.xml
@@ -21,6 +21,7 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
<suite name="StratosIntegrationSuite">
+
<test name="CartridgeTest">
<classes>
<class name="org.apache.stratos.integration.tests.group.CartridgeTest" />