Repository: stratos Updated Branches: refs/heads/tenant-isolation 7dc733655 -> bb965a53a
Adding tenant resources to the integration test Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bb965a53 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bb965a53 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bb965a53 Branch: refs/heads/tenant-isolation Commit: bb965a53a5c442742eac7bdeb53e0c842e2f5e08 Parents: 7dc7336 Author: Gayan Gunarathne <[email protected]> Authored: Tue Aug 11 17:20:38 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Tue Aug 11 17:20:38 2015 +0530 ---------------------------------------------------------------------- .../integration/tests/RestConstants.java | 6 ++++++ .../tests/StratosTestServerManager.java | 14 +++++++++++++ .../integration/tests/rest/RestClient.java | 22 +++++++++++++++++--- .../src/test/resources/tenant/tenant1.json | 9 ++++++++ .../src/test/resources/tenant/tenant2.json | 9 ++++++++ 5 files changed, 57 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/bb965a53/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/RestConstants.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/RestConstants.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/RestConstants.java index bf7de6c..747a131 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/RestConstants.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/RestConstants.java @@ -49,4 +49,10 @@ public class RestConstants { public static final String APPLICATION_POLICIES_PATH = "/application-policies/"; public static final String APPLICATION_POLICIES_NAME = "applicationPolicy"; + public static final String TENANT1_RESOURCE ="/tenant/tenant1.json"; + public static final String TENANT2_RESOURCE ="/tenant/tenant2.json"; + public static final String TENANT_API = "/" + API + "/tenants"; + public static final String TENANTS_NAME = "tenants"; + + } http://git-wip-us.apache.org/repos/asf/stratos/blob/bb965a53/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 f5648d6..13fcb5d 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 @@ -29,6 +29,7 @@ import org.apache.stratos.common.test.TestLogAppender; import org.apache.stratos.integration.tests.application.SampleApplicationsTest; import org.apache.stratos.integration.tests.rest.RestClient; import org.testng.annotations.AfterSuite; +import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeSuite; import org.wso2.carbon.integration.framework.TestServerManager; import org.wso2.carbon.integration.framework.utils.FrameworkSettings; @@ -39,6 +40,7 @@ import java.io.File; import java.io.IOException; import java.net.URL; +import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; /** @@ -55,6 +57,7 @@ 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"; + protected RestClient restClientAdmin; protected RestClient restClient; private String endpoint = "https://localhost:9443";; @@ -66,6 +69,7 @@ public class StratosTestServerManager extends TestServerManager { public StratosTestServerManager() { super(CARBON_ZIP, PORT_OFFSET); serverUtils = new ServerUtils(); + restClientAdmin=new RestClient(endpoint,"admin","admin"); restClient = new RestClient(endpoint, "admin", "admin"); } @@ -123,6 +127,7 @@ public class StratosTestServerManager extends TestServerManager { long time4 = System.currentTimeMillis(); log.info(String.format("Stratos server started in %d sec", (time4 - time3) / 1000)); + tenantCreation(); return carbonHome; } } @@ -193,4 +198,13 @@ public class StratosTestServerManager extends TestServerManager { } return false; } + + + public 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); + boolean addedTenant2=restClientAdmin.addEntity(RestConstants.TENANT2_RESOURCE,RestConstants.TENANT_API,RestConstants.TENANTS_NAME); + assertEquals(addedTenant2,true); + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/bb965a53/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java index 34a9d75..54b04a8 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java @@ -60,8 +60,8 @@ public class RestClient { public RestClient(String endPoint, String userName, String password) { this(); this.endPoint = endPoint; - this.userName = userName; - this.password = password; + this.setUserName(userName); + this.setPassword(password); } /** @@ -352,6 +352,22 @@ public class RestClient { * @return username:password */ private String getUsernamePassword() { - return this.userName + ":" + this.password; + return this.getUserName() + ":" + this.getPassword(); + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; } } http://git-wip-us.apache.org/repos/asf/stratos/blob/bb965a53/products/stratos/modules/integration/src/test/resources/tenant/tenant1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/tenant/tenant1.json b/products/stratos/modules/integration/src/test/resources/tenant/tenant1.json new file mode 100644 index 0000000..f575b1b --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/tenant/tenant1.json @@ -0,0 +1,9 @@ +{ + "admin": "admin", + "firstName": "Frank", + "lastName": "Myers", + "adminPassword": "admin123", + "tenantDomain": "test1.com", + "email": "[email protected]", + "active": "true" +} http://git-wip-us.apache.org/repos/asf/stratos/blob/bb965a53/products/stratos/modules/integration/src/test/resources/tenant/tenant2.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/tenant/tenant2.json b/products/stratos/modules/integration/src/test/resources/tenant/tenant2.json new file mode 100644 index 0000000..3d2baf2 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/tenant/tenant2.json @@ -0,0 +1,9 @@ +{ + "admin": "admin", + "firstName": "Frank", + "lastName": "Myers", + "adminPassword": "admin123", + "tenantDomain": "test2.com", + "email": "[email protected]", + "active": "true" +}
