You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/03/01 19:35:42 UTC
[21/50] [abbrv] stratos git commit: Updating integration test
execution method and activemq bind port
Updating integration test execution method and activemq bind port
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/16a8ef57
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/16a8ef57
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/16a8ef57
Branch: refs/heads/docker-grouping-merge
Commit: 16a8ef5765db66e66b9d6eb28eaba0352f3f3ee9
Parents: 9b25a04
Author: Imesh Gunaratne <im...@apache.org>
Authored: Fri Feb 27 23:56:02 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Feb 27 23:56:02 2015 +0530
----------------------------------------------------------------------
.../integration/tests/SampleApplicationsTest.java | 14 ++++++++++----
.../integration/tests/StratosTestServerManager.java | 2 +-
.../integration/src/test/resources/jndi.properties | 2 +-
3 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/16a8ef57/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 abc7e2e..f916083 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
@@ -60,16 +60,22 @@ public class SampleApplicationsTest extends StratosTestServerManager {
try {
initializeApplicationEventReceiver();
- String scriptPath = getApplicationsPath() + "/single-cartridge/scripts/mock/deploy.sh";
- executeCommand(scriptPath);
-
- assertApplicationActivation("single-cartridge-app");
+ runApplicationTest("single-cartridge", "single-cartridge-app");
} catch (Exception e) {
log.error(e);
assertTrue("An error occurred", false);
}
}
+ private void runApplicationTest(String applicationId) {
+ runApplicationTest(applicationId, applicationId);
+ }
+
+ private void runApplicationTest(String applicationFolderName, String applicationId) {
+ executeCommand(getApplicationsPath() + "/" + applicationFolderName + "/scripts/mock/deploy.sh");
+ assertApplicationActivation(applicationId);
+ }
+
/**
* Initialize application event receiver
*/
http://git-wip-us.apache.org/repos/asf/stratos/blob/16a8ef57/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
index 2d1deac..fd74f75 100755
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
@@ -49,7 +49,7 @@ public class StratosTestServerManager extends TestServerManager {
private final static String CARBON_ZIP = SampleApplicationsTest.class.getResource("/").getPath() +
"/../../../distribution/target/apache-stratos-4.1.0-SNAPSHOT.zip";
private final static int PORT_OFFSET = 0;
- private static final String ACTIVEMQ_BIND_ADDRESS = "tcp://localhost:61616";
+ private static final String ACTIVEMQ_BIND_ADDRESS = "tcp://localhost:61617";
private static final String MOCK_IAAS_XML = "mock-iaas.xml";
private ServerUtils serverUtils;
http://git-wip-us.apache.org/repos/asf/stratos/blob/16a8ef57/products/stratos/modules/integration/src/test/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/jndi.properties b/products/stratos/modules/integration/src/test/resources/jndi.properties
index 21d7420..beefe3c 100644
--- a/products/stratos/modules/integration/src/test/resources/jndi.properties
+++ b/products/stratos/modules/integration/src/test/resources/jndi.properties
@@ -18,5 +18,5 @@
#
connectionfactoryName=TopicConnectionFactory
-java.naming.provider.url=tcp://localhost:61616
+java.naming.provider.url=tcp://localhost:61617
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory