Repository: stratos Updated Branches: refs/heads/tenant-isolation f7cd51769 -> 84c1d554e
Update the integration test with tenant operations Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/84c1d554 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/84c1d554 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/84c1d554 Branch: refs/heads/tenant-isolation Commit: 84c1d554e1aa62cb0c700e2202c54eb45393b229 Parents: f7cd517 Author: gayangunarathne <[email protected]> Authored: Mon Aug 17 16:19:40 2015 +0530 Committer: gayangunarathne <[email protected]> Committed: Mon Aug 17 16:19:40 2015 +0530 ---------------------------------------------------------------------- .../org/apache/stratos/integration/tests/TopologyHandler.java | 7 +++++++ .../integration/tests/application/ApplicationUpdateTest.java | 3 +++ 2 files changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/84c1d554/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java index c631461..2adcadb 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java @@ -183,6 +183,13 @@ public class TopologyHandler { status, application.getStatus()); } + public void assertApplicationForNonAvailability(String applicationName, int tenantId) { + + Application application = ApplicationManager.getApplications().getApplicationByTenant(applicationName, tenantId); + assertNull(String.format("Application is found for other tenant : [application-id] %s", applicationName),application); + + } + /** * Assert application activation * http://git-wip-us.apache.org/repos/asf/stratos/blob/84c1d554/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationUpdateTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationUpdateTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationUpdateTest.java index 19a44bb..dd81724 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationUpdateTest.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationUpdateTest.java @@ -118,6 +118,7 @@ public class ApplicationUpdateTest extends StratosTestServerManager { //Application active handling TopologyHandler.getInstance().assertApplicationStatus(bean.getApplicationId(), ApplicationStatus.Active, tenant1Id); + TopologyHandler.getInstance().assertApplicationForNonAvailability(bean.getApplicationId(),tenant2Id); //Group active handling TopologyHandler.getInstance().assertGroupActivation(bean.getApplicationId(), tenant1Id); @@ -139,6 +140,8 @@ public class ApplicationUpdateTest extends StratosTestServerManager { "g-sc-G123-1-application-update-test", ApplicationBean.class, RestConstants.APPLICATIONS_NAME); assertEquals(updatedBean.getApplicationId(), "g-sc-G123-1-application-update-test"); + TopologyHandler.getInstance().assertApplicationForNonAvailability(bean.getApplicationId(),tenant2Id); + boolean removedGroup = restClientTenant1.removeEntity(RestConstants.CARTRIDGE_GROUPS, "G1-application-update-test", RestConstants.CARTRIDGE_GROUPS_NAME); assertEquals(removedGroup, false);
