Repository: stratos Updated Branches: refs/heads/stratos-4.1.x d1d8d0b62 -> 973c05b57
Grouping integration tests, adding smoke test suite Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/644803fd Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/644803fd Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/644803fd Branch: refs/heads/stratos-4.1.x Commit: 644803fdd7c2d4ee40aca74dbd33ba5da03ae55e Parents: d1d8d0b Author: Akila Perera <[email protected]> Authored: Sat Sep 12 00:07:43 2015 +0530 Committer: Akila Perera <[email protected]> Committed: Sat Sep 12 00:07:43 2015 +0530 ---------------------------------------------------------------------- .../common/StratosTestServerManager.java | 1 - .../integration/test-integration/pom.xml | 5 +- .../application/ApplicationBurstingTest.java | 2 +- .../application/ApplicationUpdateTest.java | 2 +- .../application/GroupStartupOrderTest.java | 2 +- .../GroupTerminationBehaviorTest.java | 2 +- .../PartitionOneAfterAnotherClusterTest.java | 2 +- .../PartitionRoundRobinClusterTest.java | 2 +- .../application/SampleApplicationsTest.java | 4 +- .../application/SingleClusterScalingTest.java | 2 +- .../tests/group/CartridgeGroupTest.java | 4 +- .../integration/tests/group/CartridgeTest.java | 4 +- .../tests/policies/ApplicationPolicyTest.java | 4 +- .../tests/policies/AutoscalingPolicyTest.java | 4 +- .../tests/policies/DeploymentPolicyTest.java | 4 +- .../tests/policies/NetworkPartitionTest.java | 4 +- .../integration/tests/users/TenantTest.java | 2 +- .../integration/tests/users/UserTest.java | 2 +- .../src/test/resources/stratos-testng.xml | 101 ------------------- .../src/test/resources/test-suite-all.xml | 44 ++++++++ .../src/test/resources/test-suite-smoke.xml | 45 +++++++++ 21 files changed, 116 insertions(+), 126 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/644803fd/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/StratosTestServerManager.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/StratosTestServerManager.java b/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/StratosTestServerManager.java index be73c6e..ed233c4 100644 --- a/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/StratosTestServerManager.java +++ b/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/StratosTestServerManager.java @@ -101,7 +101,6 @@ public class StratosTestServerManager extends TestServerManager { this.carbonZip = carbonZip; } - // TODO: get rid of this method once startup script issue is fixed in automation engine public String startServer() throws AutomationFrameworkException, IOException, XPathExpressionException { if (this.carbonHome == null) { if (this.carbonZip == null) { http://git-wip-us.apache.org/repos/asf/stratos/blob/644803fd/products/stratos/modules/integration/test-integration/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/pom.xml b/products/stratos/modules/integration/test-integration/pom.xml index d27916c..c30ff2a 100755 --- a/products/stratos/modules/integration/test-integration/pom.xml +++ b/products/stratos/modules/integration/test-integration/pom.xml @@ -175,7 +175,7 @@ <filters.file>${basedir}/src/test/resources/filters.txt</filters.file> </systemProperties> <suiteXmlFiles> - <suiteXmlFile>${basedir}/src/test/resources/stratos-testng.xml</suiteXmlFile> + <suiteXmlFile>${suiteFile}</suiteXmlFile> </suiteXmlFiles> <workingDirectory>${basedir}/target</workingDirectory> </configuration> @@ -223,4 +223,7 @@ </plugin> </plugins> </build> + <properties> + <suiteFile>${basedir}/src/test/resources/test-suite-all.xml</suiteFile> + </properties> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/644803fd/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationBurstingTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationBurstingTest.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationBurstingTest.java index fc14469..43e3732 100644 --- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationBurstingTest.java +++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationBurstingTest.java @@ -42,7 +42,7 @@ public class ApplicationBurstingTest extends StratosIntegrationTest { private static final String RESOURCES_PATH = "/application-bursting-test"; - @Test(timeOut = APPLICATION_TEST_TIMEOUT) + @Test(timeOut = APPLICATION_TEST_TIMEOUT, groups = {"stratos.application.deployment"}) public void testApplicationBusting() { try { log.info("----------------------------Started application Bursting test case----------------------------"); http://git-wip-us.apache.org/repos/asf/stratos/blob/644803fd/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationUpdateTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationUpdateTest.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationUpdateTest.java index 310f644..b07ea2f 100644 --- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationUpdateTest.java +++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationUpdateTest.java @@ -40,7 +40,7 @@ public class ApplicationUpdateTest extends StratosIntegrationTest { private static final Log log = LogFactory.getLog(ApplicationUpdateTest.class); private static final String RESOURCES_PATH = "/application-update-test"; - @Test(timeOut = APPLICATION_TEST_TIMEOUT) + @Test(timeOut = APPLICATION_TEST_TIMEOUT, groups = {"stratos.application.deployment"}) public void testDeployApplication() { try { log.info("-------------------------Started application runtime update test case-------------------------"); http://git-wip-us.apache.org/repos/asf/stratos/blob/644803fd/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/GroupStartupOrderTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/GroupStartupOrderTest.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/GroupStartupOrderTest.java index b7bff04..031c4ea 100644 --- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/GroupStartupOrderTest.java +++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/GroupStartupOrderTest.java @@ -44,7 +44,7 @@ public class GroupStartupOrderTest extends StratosIntegrationTest { private static final int NODES_START_PARALLEL_TIMEOUT = 30000; - @Test(timeOut = APPLICATION_TEST_TIMEOUT) + @Test(timeOut = APPLICATION_TEST_TIMEOUT, groups = {"stratos.application.deployment"}) public void testTerminationBehavior() { try { log.info("----------------------Started application startup order test case------------------------"); http://git-wip-us.apache.org/repos/asf/stratos/blob/644803fd/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/GroupTerminationBehaviorTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/GroupTerminationBehaviorTest.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/GroupTerminationBehaviorTest.java index 2134385..262b6eb 100644 --- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/GroupTerminationBehaviorTest.java +++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/GroupTerminationBehaviorTest.java @@ -47,7 +47,7 @@ public class GroupTerminationBehaviorTest extends StratosIntegrationTest { private static final String RESOURCES_PATH = "/group-termination-behavior-test"; private static final int GROUP_INACTIVE_TIMEOUT = 180000; - @Test(timeOut = APPLICATION_TEST_TIMEOUT) + @Test(timeOut = APPLICATION_TEST_TIMEOUT, groups = {"stratos.application.deployment", "failed"}) public void testTerminationBehavior() { try { log.info("----------------------Started application termination behavior test case----------------------"); http://git-wip-us.apache.org/repos/asf/stratos/blob/644803fd/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionOneAfterAnotherClusterTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionOneAfterAnotherClusterTest.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionOneAfterAnotherClusterTest.java index ddd157f..76bf716 100644 --- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionOneAfterAnotherClusterTest.java +++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionOneAfterAnotherClusterTest.java @@ -50,7 +50,7 @@ public class PartitionOneAfterAnotherClusterTest extends StratosIntegrationTest private static final String RESOURCES_PATH = "/partition-round-robin-cluster-test"; - @Test(timeOut = APPLICATION_TEST_TIMEOUT) + @Test(timeOut = APPLICATION_TEST_TIMEOUT, groups = {"stratos.application.deployment", "failed"}) public void testDeployApplication() { try { log.info("-----------------------Started Partition One after another test case-----------------------"); http://git-wip-us.apache.org/repos/asf/stratos/blob/644803fd/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionRoundRobinClusterTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionRoundRobinClusterTest.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionRoundRobinClusterTest.java index 35fd827..58fb0a3 100644 --- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionRoundRobinClusterTest.java +++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionRoundRobinClusterTest.java @@ -48,7 +48,7 @@ public class PartitionRoundRobinClusterTest extends StratosIntegrationTest { private static final Log log = LogFactory.getLog(SampleApplicationsTest.class); private static final String RESOURCES_PATH = "/partition-round-robin-cluster-test"; - @Test(timeOut = APPLICATION_TEST_TIMEOUT) + @Test(timeOut = APPLICATION_TEST_TIMEOUT, groups = {"stratos.application.deployment"}) public void testDeployApplication() { try { log.info("------------------------Started application Bursting test case-----------------------"); http://git-wip-us.apache.org/repos/asf/stratos/blob/644803fd/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/SampleApplicationsTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/SampleApplicationsTest.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/SampleApplicationsTest.java index b8653af..f2120cf 100644 --- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/SampleApplicationsTest.java +++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/SampleApplicationsTest.java @@ -45,7 +45,7 @@ public class SampleApplicationsTest extends StratosIntegrationTest { private static final Log log = LogFactory.getLog(SampleApplicationsTest.class); private static final String RESOURCES_PATH = "/sample-applications-test"; - @Test(timeOut = APPLICATION_TEST_TIMEOUT) + @Test(timeOut = APPLICATION_TEST_TIMEOUT, groups = {"stratos.application.deployment"}) public void testApplication() { log.info("-------------------------------Started application test case-------------------------------"); try { @@ -252,7 +252,7 @@ public class SampleApplicationsTest extends StratosIntegrationTest { } } - @Test(timeOut = APPLICATION_TEST_TIMEOUT) + @Test(timeOut = APPLICATION_TEST_TIMEOUT, groups = {"stratos.application.deployment"}) public void testApplicationList() { log.info("-------------------------------Started application listtest case-------------------------------"); try { http://git-wip-us.apache.org/repos/asf/stratos/blob/644803fd/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/SingleClusterScalingTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/SingleClusterScalingTest.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/SingleClusterScalingTest.java index edf8c0c..71702f1 100644 --- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/SingleClusterScalingTest.java +++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/SingleClusterScalingTest.java @@ -53,7 +53,7 @@ public class SingleClusterScalingTest extends StratosIntegrationTest { private static final int CLUSTER_SCALE_DOWN_TIMEOUT = 360000; private int activeInstancesAfterScaleup = 0; - @Test(timeOut = APPLICATION_TEST_TIMEOUT) + @Test(timeOut = APPLICATION_TEST_TIMEOUT, groups = {"stratos.application.deployment"}) public void testDeployApplication() { try { log.info("------------------------Started application Bursting test case----------------------"); http://git-wip-us.apache.org/repos/asf/stratos/blob/644803fd/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/group/CartridgeGroupTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/group/CartridgeGroupTest.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/group/CartridgeGroupTest.java index 0b0a9d1..cf4e995 100644 --- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/group/CartridgeGroupTest.java +++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/group/CartridgeGroupTest.java @@ -42,7 +42,7 @@ public class CartridgeGroupTest extends StratosIntegrationTest { private static final Log log = LogFactory.getLog(CartridgeGroupTest.class); private static final String RESOURCES_PATH = "/cartridge-group-test"; - @Test(timeOut = GLOBAL_TEST_TIMEOUT) + @Test(timeOut = GLOBAL_TEST_TIMEOUT, groups = {"stratos.cartridge.deployment", "smoke"}) public void testCartridgeGroup() { try { log.info("-------------------------Started Cartridge group test case-------------------------"); @@ -144,7 +144,7 @@ public class CartridgeGroupTest extends StratosIntegrationTest { } } - @Test(timeOut = GLOBAL_TEST_TIMEOUT) + @Test(timeOut = GLOBAL_TEST_TIMEOUT, groups = {"stratos.cartridge.deployment", "smoke"}) public void testCartridgeGroupList() { try { log.info("-------------------------Started Cartridge group list test case-------------------------"); http://git-wip-us.apache.org/repos/asf/stratos/blob/644803fd/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/group/CartridgeTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/group/CartridgeTest.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/group/CartridgeTest.java index 5c3db3d..1e72dc5 100644 --- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/group/CartridgeTest.java +++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/group/CartridgeTest.java @@ -44,7 +44,7 @@ public class CartridgeTest extends StratosIntegrationTest { private static final Log log = LogFactory.getLog(CartridgeTest.class); private static final String RESOURCES_PATH = "/cartridge-test"; - @Test(timeOut = GLOBAL_TEST_TIMEOUT) + @Test(timeOut = GLOBAL_TEST_TIMEOUT, groups = {"stratos.cartridge.deployment", "smoke"}) public void testCartridge() { log.info("--------------------Started Cartridge test case-----------------------------"); @@ -135,7 +135,7 @@ public class CartridgeTest extends StratosIntegrationTest { } } - @Test(timeOut = GLOBAL_TEST_TIMEOUT) + @Test(timeOut = GLOBAL_TEST_TIMEOUT, groups = {"stratos.cartridge.deployment", "smoke"}) public void testCartridgeList() { log.info("--------------------Started Cartridge list test case-----------------------------"); http://git-wip-us.apache.org/repos/asf/stratos/blob/644803fd/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/policies/ApplicationPolicyTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/policies/ApplicationPolicyTest.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/policies/ApplicationPolicyTest.java index 08d2a7a..5df6f4f 100644 --- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/policies/ApplicationPolicyTest.java +++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/policies/ApplicationPolicyTest.java @@ -44,7 +44,7 @@ public class ApplicationPolicyTest extends StratosIntegrationTest { private static final Log log = LogFactory.getLog(ApplicationPolicyTest.class); private static final String RESOURCES_PATH = "/application-policy-test"; - @Test(timeOut = GLOBAL_TEST_TIMEOUT) + @Test(timeOut = GLOBAL_TEST_TIMEOUT, groups = {"stratos.policy.management", "smoke"}) public void testApplicationPolicy() { try { String applicationPolicyId = "application-policy-application-policy-test"; @@ -140,7 +140,7 @@ public class ApplicationPolicyTest extends StratosIntegrationTest { } } - @Test(timeOut = GLOBAL_TEST_TIMEOUT) + @Test(timeOut = GLOBAL_TEST_TIMEOUT, groups = {"stratos.policy.management", "smoke"}) public void testApplicationPolicyList() { try { String applicationPolicyId1 = "application-policy-application-policy-test-1"; http://git-wip-us.apache.org/repos/asf/stratos/blob/644803fd/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/policies/AutoscalingPolicyTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/policies/AutoscalingPolicyTest.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/policies/AutoscalingPolicyTest.java index 70c3a78..476e993 100644 --- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/policies/AutoscalingPolicyTest.java +++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/policies/AutoscalingPolicyTest.java @@ -39,7 +39,7 @@ public class AutoscalingPolicyTest extends StratosIntegrationTest { private static final Log log = LogFactory.getLog(AutoscalingPolicyTest.class); private static final String RESOURCES_PATH = "/autoscaling-policy-test"; - @Test(timeOut = GLOBAL_TEST_TIMEOUT) + @Test(timeOut = GLOBAL_TEST_TIMEOUT, groups = {"stratos.policy.management", "smoke"}) public void testAutoscalingPolicy() { log.info("-------------------------Started autoscaling policy test case-------------------------"); String policyId = "autoscaling-policy-autoscaling-policy-test"; @@ -95,7 +95,7 @@ public class AutoscalingPolicyTest extends StratosIntegrationTest { } } - @Test(timeOut = GLOBAL_TEST_TIMEOUT) + @Test(timeOut = GLOBAL_TEST_TIMEOUT, groups = {"stratos.policy.management", "smoke"}) public void testAutoscalingPolicyList() { log.info("-------------------------Started autoscaling policy list test case-------------------------"); String policyId1 = "autoscaling-policy-autoscaling-policy-test-1"; http://git-wip-us.apache.org/repos/asf/stratos/blob/644803fd/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/policies/DeploymentPolicyTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/policies/DeploymentPolicyTest.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/policies/DeploymentPolicyTest.java index c0f237b..3a3169a 100644 --- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/policies/DeploymentPolicyTest.java +++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/policies/DeploymentPolicyTest.java @@ -46,7 +46,7 @@ public class DeploymentPolicyTest extends StratosIntegrationTest { private static final Log log = LogFactory.getLog(DeploymentPolicyTest.class); private static final String RESOURCES_PATH = "/deployment-policy-test"; - @Test(timeOut = GLOBAL_TEST_TIMEOUT) + @Test(timeOut = GLOBAL_TEST_TIMEOUT, groups = {"stratos.policy.management", "smoke"}) public void testDeploymentPolicy() { try { String deploymentPolicyId = "deployment-policy-deployment-policy-test"; @@ -179,7 +179,7 @@ public class DeploymentPolicyTest extends StratosIntegrationTest { } } - @Test(timeOut = GLOBAL_TEST_TIMEOUT) + @Test(timeOut = GLOBAL_TEST_TIMEOUT, groups = {"stratos.policy.management", "smoke"}) public void testDeploymentPolicyList() { try { String deploymentPolicyId1 = "deployment-policy-deployment-policy-test-1"; http://git-wip-us.apache.org/repos/asf/stratos/blob/644803fd/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/policies/NetworkPartitionTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/policies/NetworkPartitionTest.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/policies/NetworkPartitionTest.java index ec335a9..04c3a38 100644 --- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/policies/NetworkPartitionTest.java +++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/policies/NetworkPartitionTest.java @@ -44,7 +44,7 @@ public class NetworkPartitionTest extends StratosIntegrationTest { private static final Log log = LogFactory.getLog(NetworkPartitionTest.class); private static final String RESOURCES_PATH = "/network-partition-test"; - @Test(timeOut = GLOBAL_TEST_TIMEOUT) + @Test(timeOut = GLOBAL_TEST_TIMEOUT, groups = {"stratos.policy.management", "smoke"}) public void testNetworkPartition() { try { String networkPartitionId = "network-partition-network-partition-test"; @@ -100,7 +100,7 @@ public class NetworkPartitionTest extends StratosIntegrationTest { } } - @Test(timeOut = GLOBAL_TEST_TIMEOUT) + @Test(timeOut = GLOBAL_TEST_TIMEOUT, groups = {"stratos.policy.management", "smoke"}) public void testNetworkPartitionList() { try { String networkPartitionId1 = "network-partition-network-partition-test-1"; http://git-wip-us.apache.org/repos/asf/stratos/blob/644803fd/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/users/TenantTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/users/TenantTest.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/users/TenantTest.java index 876af01..9cab5e7 100644 --- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/users/TenantTest.java +++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/users/TenantTest.java @@ -31,7 +31,7 @@ import static junit.framework.Assert.assertTrue; public class TenantTest extends StratosIntegrationTest { private static final String RESOURCES_PATH = "/user-test"; - @Test(timeOut = GLOBAL_TEST_TIMEOUT) + @Test(timeOut = GLOBAL_TEST_TIMEOUT, groups = {"user.management", "smoke", "disabled"}) public void addUser() { String tenantId = "tenant-1"; boolean addedUser1 = restClient.addEntity(RESOURCES_PATH + "/" + http://git-wip-us.apache.org/repos/asf/stratos/blob/644803fd/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/users/UserTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/users/UserTest.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/users/UserTest.java index 9f64e4b..3e760d8 100644 --- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/users/UserTest.java +++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/users/UserTest.java @@ -39,7 +39,7 @@ public class UserTest extends StratosIntegrationTest { private static final Log log = LogFactory.getLog(UserTest.class); private static final String RESOURCES_PATH = "/user-test"; - @Test(timeOut = GLOBAL_TEST_TIMEOUT) + @Test(timeOut = GLOBAL_TEST_TIMEOUT, groups = {"user.management", "smoke"}) public void addUser() { try { log.info("-------------------------------Started users test case-------------------------------"); http://git-wip-us.apache.org/repos/asf/stratos/blob/644803fd/products/stratos/modules/integration/test-integration/src/test/resources/stratos-testng.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/resources/stratos-testng.xml b/products/stratos/modules/integration/test-integration/src/test/resources/stratos-testng.xml deleted file mode 100644 index 040bde0..0000000 --- a/products/stratos/modules/integration/test-integration/src/test/resources/stratos-testng.xml +++ /dev/null @@ -1,101 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you 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. - --> - -<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; > - -<suite name="StratosIntegrationSuite"> - <listeners> - <listener class-name="org.wso2.carbon.automation.engine.testlisteners.TestExecutionListener"/> - <listener class-name="org.wso2.carbon.automation.engine.testlisteners.TestSuiteListener"/> - <listener class-name="org.wso2.carbon.automation.engine.testlisteners.TestTransformerListener"/> - <listener class-name="org.wso2.carbon.automation.engine.testlisteners.TestManagerListener"/> - <listener class-name="org.wso2.carbon.automation.engine.testlisteners.TestReportListener"/> - </listeners> - <test name="UserTest" preserve-order="true" parallel="false"> - <classes> - <class name="org.apache.stratos.integration.tests.users.UserTest"/> - </classes> - </test> - <test name="CartridgeTest" preserve-order="true" parallel="false"> - <classes> - <class name="org.apache.stratos.integration.tests.group.CartridgeTest"/> - </classes> - </test> - <test name="CartridgeGroupTest" preserve-order="true" parallel="false"> - <classes> - <class name="org.apache.stratos.integration.tests.group.CartridgeGroupTest"/> - </classes> - </test> - <test name="NetworkPartitionTest" preserve-order="true" parallel="false"> - <classes> - <class name="org.apache.stratos.integration.tests.policies.NetworkPartitionTest"/> - </classes> - </test> - <test name="ApplicationPolicyTest" preserve-order="true" parallel="false"> - <classes> - <class name="org.apache.stratos.integration.tests.policies.ApplicationPolicyTest"/> - </classes> - </test> - <test name="DeploymentPolicyTest" preserve-order="true" parallel="false"> - <classes> - <class name="org.apache.stratos.integration.tests.policies.DeploymentPolicyTest"/> - </classes> - </test> - <test name="AutoscalingPolicyTest" preserve-order="true" parallel="false"> - <classes> - <class name="org.apache.stratos.integration.tests.policies.AutoscalingPolicyTest"/> - </classes> - </test> - <test name="SampleApplicationsTest" preserve-order="true" parallel="false"> - <classes> - <class name="org.apache.stratos.integration.tests.application.SampleApplicationsTest"/> - </classes> - </test> - <test name="ApplicationUpdateTest" preserve-order="true" parallel="false"> - <classes> - <class name="org.apache.stratos.integration.tests.application.ApplicationUpdateTest"/> - </classes> - </test> - <test name="SingleClusterScalingTest" preserve-order="true" parallel="false"> - <classes> - <class name="org.apache.stratos.integration.tests.application.SingleClusterScalingTest"/> - </classes> - </test> - <test name="ApplicationBurstingTest" preserve-order="true" parallel="false"> - <classes> - <class name="org.apache.stratos.integration.tests.application.ApplicationBurstingTest"/> - </classes> - </test> - <test name="PartitionRoundRobinClusterTest" preserve-order="true" parallel="false"> - <classes> - <class name="org.apache.stratos.integration.tests.application.PartitionRoundRobinClusterTest"/> - </classes> - </test> - <test name="GroupStartupOrderTest" preserve-order="true" parallel="false"> - <classes> - <class name="org.apache.stratos.integration.tests.application.GroupStartupOrderTest"/> - </classes> - </test> - <!--test name="GroupTerminationBehaviorTest" preserve-order="true" parallel="false"> - <classes> - <class name="org.apache.stratos.integration.tests.application.GroupTerminationBehaviorTest"/> - </classes> - </test--> -</suite> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/644803fd/products/stratos/modules/integration/test-integration/src/test/resources/test-suite-all.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/resources/test-suite-all.xml b/products/stratos/modules/integration/test-integration/src/test/resources/test-suite-all.xml new file mode 100644 index 0000000..be687f2 --- /dev/null +++ b/products/stratos/modules/integration/test-integration/src/test/resources/test-suite-all.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you 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. + --> + +<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; > + +<suite name="StratosIntegrationSuite"> + <listeners> + <listener class-name="org.wso2.carbon.automation.engine.testlisteners.TestExecutionListener"/> + <listener class-name="org.wso2.carbon.automation.engine.testlisteners.TestSuiteListener"/> + <listener class-name="org.wso2.carbon.automation.engine.testlisteners.TestTransformerListener"/> + <listener class-name="org.wso2.carbon.automation.engine.testlisteners.TestManagerListener"/> + <listener class-name="org.wso2.carbon.automation.engine.testlisteners.TestReportListener"/> + </listeners> + + <test name="all" preserve-order="true" parallel="false"> + <groups> + <run> + <exclude name="failed"/> + <exclude name="disabled"/> + </run> + </groups> + + <packages> + <package name="org.apache.stratos.integration.tests.*"/> + </packages> + </test> +</suite> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/644803fd/products/stratos/modules/integration/test-integration/src/test/resources/test-suite-smoke.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/resources/test-suite-smoke.xml b/products/stratos/modules/integration/test-integration/src/test/resources/test-suite-smoke.xml new file mode 100644 index 0000000..bc44369 --- /dev/null +++ b/products/stratos/modules/integration/test-integration/src/test/resources/test-suite-smoke.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you 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. + --> + +<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; > + +<suite name="StratosIntegrationSuite"> + <listeners> + <listener class-name="org.wso2.carbon.automation.engine.testlisteners.TestExecutionListener"/> + <listener class-name="org.wso2.carbon.automation.engine.testlisteners.TestSuiteListener"/> + <listener class-name="org.wso2.carbon.automation.engine.testlisteners.TestTransformerListener"/> + <listener class-name="org.wso2.carbon.automation.engine.testlisteners.TestManagerListener"/> + <listener class-name="org.wso2.carbon.automation.engine.testlisteners.TestReportListener"/> + </listeners> + + <test name="smoke" preserve-order="true" parallel="false"> + <groups> + <run> + <include name="smoke"/> + <exclude name="failed"/> + <exclude name="disabled"/> + </run> + </groups> + + <packages> + <package name="org.apache.stratos.integration.tests.*"/> + </packages> + </test> +</suite> \ No newline at end of file
