Repository: stratos Updated Branches: refs/heads/tenant-isolation 72863002b -> 9bbbc02d1
Update the cartridge group with integration test Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9bbbc02d Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9bbbc02d Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9bbbc02d Branch: refs/heads/tenant-isolation Commit: 9bbbc02d1b71ab8e29029f464ddcaab3a7b92226 Parents: 7286300 Author: Gayan Gunarathne <[email protected]> Authored: Wed Aug 5 14:37:25 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Wed Aug 5 14:37:25 2015 +0530 ---------------------------------------------------------------------- .../tests/SampleApplicationsTest.java | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/9bbbc02d/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 eef6a69..e6c35fd 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 @@ -29,6 +29,7 @@ import org.apache.stratos.autoscaler.stub.pojo.ApplicationContext; import org.apache.stratos.common.beans.PropertyBean; import org.apache.stratos.common.beans.application.ApplicationBean; import org.apache.stratos.common.beans.cartridge.CartridgeBean; +import org.apache.stratos.common.beans.cartridge.CartridgeGroupBean; import org.apache.stratos.common.beans.partition.NetworkPartitionBean; import org.apache.stratos.common.beans.policy.autoscale.AutoscalePolicyBean; import org.apache.stratos.common.beans.policy.deployment.DeploymentPolicyBean; @@ -155,7 +156,7 @@ public class SampleApplicationsTest extends StratosTestServerManager { boolean addedC3 = cartridgeTest.addCartridge("c3.json", endpoint, restClient); assertEquals(addedC3, true); - /* + boolean added = cartridgeGroupTest.addCartridgeGroup("cartrdige-nested.json", endpoint, restClient); assertEquals(added, true); @@ -163,12 +164,12 @@ public class SampleApplicationsTest extends StratosTestServerManager { restClient); assertEquals(bean.getName(), "G1"); - boolean updated = cartridgeGroupTest.updateCartridgeGroup("cartrdige-nested.json", + /* boolean updated = cartridgeGroupTest.updateCartridgeGroup("cartrdige-nested.json", endpoint, restClient); assertEquals(updated, true); CartridgeGroupBean updatedBean = cartridgeGroupTest.getCartridgeGroup("G1", endpoint, restClient); - assertEquals(updatedBean.getName(), "G1"); + assertEquals(updatedBean.getName(), "G1"); */ boolean removedC1 = cartridgeTest.removeCartridge("c1", endpoint, restClient); @@ -201,7 +202,7 @@ public class SampleApplicationsTest extends StratosTestServerManager { removedC3 = cartridgeTest.removeCartridge("c3", endpoint, restClient); - assertEquals(removedC3, true);*/ + assertEquals(removedC3, true); } catch (Exception e) { log.error(e); @@ -209,7 +210,6 @@ public class SampleApplicationsTest extends StratosTestServerManager { } } - public void testApplication() { try { boolean addedScalingPolicy = autoscalingPolicyTest.addAutoscalingPolicy("autoscaling-policy-1.json", @@ -225,12 +225,12 @@ public class SampleApplicationsTest extends StratosTestServerManager { boolean addedC3 = cartridgeTest.addCartridge("c3.json", endpoint, restClient); assertEquals(addedC3, true); - /* boolean addedG1 = cartridgeGroupTest.addCartridgeGroup("cartrdige-nested.json", + boolean addedG1 = cartridgeGroupTest.addCartridgeGroup("cartrdige-nested.json", endpoint, restClient); assertEquals(addedG1, true); CartridgeGroupBean beanG1 = cartridgeGroupTest.getCartridgeGroup("G1", endpoint, restClient); - assertEquals(beanG1.getName(), "G1"); */ + assertEquals(beanG1.getName(), "G1"); boolean addedN1 = networkPartitionTest.addNetworkPartition("network-partition-1.json", endpoint, restClient); @@ -314,9 +314,9 @@ public class SampleApplicationsTest extends StratosTestServerManager { assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMax(), 3); - /* boolean removedGroup = cartridgeGroupTest.removeCartridgeGroup("G1", endpoint, + boolean removedGroup = cartridgeGroupTest.removeCartridgeGroup("G1", endpoint, restClient); - assertEquals(removedGroup, false); */ + assertEquals(removedGroup, false); boolean removedAuto = autoscalingPolicyTest.removeAutoscalingPolicy("autoscaling-policy-1", endpoint, restClient, "admin", "admin"); @@ -339,9 +339,9 @@ public class SampleApplicationsTest extends StratosTestServerManager { restClient); assertEquals(beanRemoved, null); - /*removedGroup = cartridgeGroupTest.removeCartridgeGroup("G1", endpoint, + removedGroup = cartridgeGroupTest.removeCartridgeGroup("G1", endpoint, restClient); - assertEquals(removedGroup, true); */ + assertEquals(removedGroup, true); boolean removedC1 = cartridgeTest.removeCartridge("c1", endpoint, restClient);
