You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/08/18 13:29:15 UTC
stratos git commit: Refactor integration test
Repository: stratos
Updated Branches:
refs/heads/tenant-isolation 6aaeba430 -> d1141f4b0
Refactor integration test
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d1141f4b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d1141f4b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d1141f4b
Branch: refs/heads/tenant-isolation
Commit: d1141f4b03cec369b9c6fe447800fdbeba6efb7d
Parents: 6aaeba4
Author: gayangunarathne <ga...@wso2.com>
Authored: Tue Aug 18 16:58:28 2015 +0530
Committer: gayangunarathne <ga...@wso2.com>
Committed: Tue Aug 18 16:58:28 2015 +0530
----------------------------------------------------------------------
.../integration/tests/StratosTestServerManager.java | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d1141f4b/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 1670a66..6329d30 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
@@ -59,6 +59,13 @@ public class StratosTestServerManager extends TestServerManager {
private static final String MOCK_IAAS_XML_FILE = "mock-iaas.xml";
private static final String JNDI_PROPERTIES_FILE = "jndi.properties";
private static final String JMS_OUTPUT_ADAPTER_FILE = "JMSOutputAdaptor.xml";
+ private static final String SUPER_ADMIN_USERNAME = "admin";
+ private static final String SUPER_ADMIN_PASSWD = "admin";
+ private static final String TENANT1_USER_NAME = "admin@test1.com";
+ private static final String TENANT1_PASSWD = "admin123";
+ private static final String TENANT2_USER_NAME = "admin@test2.com";
+ private static final String TENANT2_PASSWD = "admin123";
+
protected RestClient restClientAdmin;
protected RestClient restClientTenant1;
protected RestClient restClientTenant2;
@@ -75,9 +82,9 @@ public class StratosTestServerManager extends TestServerManager {
public StratosTestServerManager() {
super(CARBON_ZIP, PORT_OFFSET);
serverUtils = new ServerUtils();
- restClientAdmin=new RestClient(endpoint,"admin","admin");
- restClientTenant1 = new RestClient(endpoint, "admin@test1.com", "admin123");
- restClientTenant2 = new RestClient(endpoint, "admin@test2.com", "admin123");
+ restClientAdmin=new RestClient(endpoint, SUPER_ADMIN_USERNAME, SUPER_ADMIN_PASSWD);
+ restClientTenant1 = new RestClient(endpoint, TENANT1_USER_NAME, TENANT1_PASSWD);
+ restClientTenant2 = new RestClient(endpoint, TENANT2_USER_NAME, TENANT2_PASSWD);
mockIaasApiClient = new IntegrationMockClient(endpoint + "/mock-iaas/api");
}
@@ -209,7 +216,7 @@ public class StratosTestServerManager extends TestServerManager {
}
- public void tenantCreation(){
+ private void tenantCreation(){
log.info("Added tenants to the testing suit");
boolean addedTenant1=restClientAdmin.addEntity(RestConstants.TENANT1_RESOURCE,RestConstants.TENANT_API,RestConstants.TENANTS_NAME);
assertEquals(addedTenant1,true);