You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/11/21 19:11:32 UTC
stratos git commit: fixing an issue in git-hook test clean up
Repository: stratos
Updated Branches:
refs/heads/stratos-4.1.x dfb878c9f -> db07464df
fixing an issue in git-hook test clean up
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/db07464d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/db07464d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/db07464d
Branch: refs/heads/stratos-4.1.x
Commit: db07464dffe0de1fea44f81683c990fae4f7e95b
Parents: dfb878c
Author: rajkumar <rr...@gmail.com>
Authored: Sat Nov 21 23:41:09 2015 +0530
Committer: rajkumar <rr...@gmail.com>
Committed: Sat Nov 21 23:41:09 2015 +0530
----------------------------------------------------------------------
.../apache/stratos/integration/tests/adc/GitHookTestCase.java | 2 +-
.../tests/application/ApplicationUpdateTestCase.java | 5 +++--
.../application/PartitionOneAfterAnotherClusterTestCase.java | 5 +++--
.../tests/application/PartitionRoundRobinClusterTestCase.java | 5 +++--
.../tests/application/SingleClusterScalingTestCase.java | 5 +++--
5 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/db07464d/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/adc/GitHookTestCase.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/adc/GitHookTestCase.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/adc/GitHookTestCase.java
index 873fe86..5e3ff70 100644
--- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/adc/GitHookTestCase.java
+++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/adc/GitHookTestCase.java
@@ -154,7 +154,7 @@ public class GitHookTestCase extends StratosIntegrationTest {
//Need to forcefully undeploy the application
log.info(String.format("Force undeployment is going to start for the [application] %s", applicationId));
- restClient.undeployEntity(RestConstants.APPLICATIONS + applicationId +
+ restClient.undeployEntity(RestConstants.APPLICATIONS + "/" + applicationId +
RestConstants.APPLICATIONS_UNDEPLOY + "?force=true", RestConstants.APPLICATIONS);
boolean forceUndeployed = TopologyHandler.getInstance().assertApplicationUndeploy(applicationId);
http://git-wip-us.apache.org/repos/asf/stratos/blob/db07464d/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationUpdateTestCase.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationUpdateTestCase.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationUpdateTestCase.java
index 5ed9b5d..f916cda 100644
--- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationUpdateTestCase.java
+++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationUpdateTestCase.java
@@ -35,6 +35,7 @@ import org.apache.stratos.messaging.message.receiver.application.ApplicationMana
import org.testng.annotations.Test;
import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
/**
* Sample application tests with application add, .
@@ -197,8 +198,8 @@ public class ApplicationUpdateTestCase extends StratosIntegrationTest {
boolean forceUndeployed =
topologyHandler.assertApplicationUndeploy("g-sc-G123-1-application-update-test");
- assertEquals(String.format("Forceful undeployment failed for the application %s",
- "g-sc-G123-1-application-update-test"), forceUndeployed, true);
+ assertTrue(String.format("Forceful undeployment failed for the application %s",
+ "g-sc-G123-1-application-update-test"), forceUndeployed);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/db07464d/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionOneAfterAnotherClusterTestCase.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionOneAfterAnotherClusterTestCase.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionOneAfterAnotherClusterTestCase.java
index a5ac9ec..301cd53 100644
--- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionOneAfterAnotherClusterTestCase.java
+++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionOneAfterAnotherClusterTestCase.java
@@ -40,6 +40,7 @@ import java.util.*;
import static org.testng.Assert.assertEquals;
import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertTrue;
/**
* This will handle the scale-up and scale-down of a particular cluster bursting test cases
@@ -142,8 +143,8 @@ public class PartitionOneAfterAnotherClusterTestCase extends StratosIntegrationT
RestConstants.APPLICATIONS_UNDEPLOY + "?force=true", RestConstants.APPLICATIONS);
boolean forceUndeployed = topologyHandler.assertApplicationUndeploy("single-cluster-scaling-test");
- assertEquals(forceUndeployed, true, String.format("Forceful undeployment failed for the application %s",
- "single-cluster-scaling-test"));
+ assertTrue(String.format("Forceful undeployment failed for the application %s",
+ "single-cluster-scaling-test"), forceUndeployed);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/db07464d/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionRoundRobinClusterTestCase.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionRoundRobinClusterTestCase.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionRoundRobinClusterTestCase.java
index c68cb35..b088d8f 100644
--- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionRoundRobinClusterTestCase.java
+++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionRoundRobinClusterTestCase.java
@@ -39,6 +39,7 @@ import java.util.*;
import static org.testng.Assert.assertEquals;
import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertTrue;
/**
* This will handle the scale-up and scale-down of a particular cluster bursting test cases
@@ -148,8 +149,8 @@ public class PartitionRoundRobinClusterTestCase extends StratosIntegrationTest {
RestConstants.APPLICATIONS_UNDEPLOY + "?force=true", RestConstants.APPLICATIONS);
boolean forceUndeployed = topologyHandler.assertApplicationUndeploy("partition-round-robin-test");
- assertEquals(forceUndeployed, true, String.format("Forceful undeployment failed for the application %s",
- "partition-round-robin-test"));
+ assertTrue(String.format("Forceful undeployment failed for the application %s",
+ "partition-round-robin-test"), forceUndeployed);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/db07464d/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/SingleClusterScalingTestCase.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/SingleClusterScalingTestCase.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/SingleClusterScalingTestCase.java
index 9598df0..18806dc 100644
--- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/SingleClusterScalingTestCase.java
+++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/SingleClusterScalingTestCase.java
@@ -41,6 +41,7 @@ import java.util.Set;
import static org.testng.Assert.assertEquals;
import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertTrue;
/**
* This will handle the scale-up and scale-down of a particular cluster bursting test cases
@@ -150,8 +151,8 @@ public class SingleClusterScalingTestCase extends StratosIntegrationTest {
RestConstants.APPLICATIONS_UNDEPLOY + "?force=true", RestConstants.APPLICATIONS);
boolean forceUndeployed = topologyHandler.assertApplicationUndeploy("single-cluster-scaling-test");
- assertEquals(forceUndeployed, true, String.format("Forceful undeployment failed for the application %s",
- "single-cluster-scaling-test"));
+ assertTrue(String.format("Forceful undeployment failed for the application %s",
+ "single-cluster-scaling-test"), forceUndeployed);
}
boolean removed = restClient.removeEntity(RestConstants.APPLICATIONS, "single-cluster-scaling-test",