Wed Feb 29 12:08:49 PST 2012

Author: krishantha
Date: Wed Feb 29 12:08:49 2012
New Revision: 121764
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=121764

Log:
Removing depricated classes and migrate ravana tests to testNG

Added:
   trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.ravana/src/test/java/org/wso2/carbon/automation/ravana/test/ravanautils/RavanaTestMaster.java
      - copied, changed from r121758, /trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.ravana/src/test/java/org/wso2/carbon/automation/ravana/test/ravanautils/RavanaTestTemplate.java
Modified:
   trunk/graphite/platform-integration/system-test-framework/core/org.wso2.platform.integration.core/src/main/java/org/wso2/platform/test/core/utils/TenantDetails.java
   trunk/graphite/platform-integration/system-test-framework/core/org.wso2.platform.integration.core/src/main/java/org/wso2/platform/test/core/utils/TenantListCsvReader.java
   trunk/graphite/platform-integration/system-test-framework/core/org.wso2.platform.integration.core/src/main/java/org/wso2/platform/test/core/utils/gregutils/GregRemoteRegistryProvider.java
   trunk/graphite/platform-integration/system-test-framework/core/org.wso2.platform.integration.core/src/main/java/org/wso2/platform/test/core/utils/gregutils/GregUserIDEvaluator.java
   trunk/graphite/platform-integration/system-test-framework/core/org.wso2.platform.integration.core/src/main/java/org/wso2/platform/test/core/utils/gregutils/RegistryProvider.java
   trunk/graphite/platform-integration/system-test-framework/core/org.wso2.platform.integration.core/src/main/resources/framework.properties
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/as/ExternalSchemaReferenceTest.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/dss/DSSTestSuite.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/EndpointServiceTestClient.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/GarFileImportServiceTestClient.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/LifeCycleServiceTestClient.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/PolicyImportServiceTestClient.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/SchemaImportServiceTestClient.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/ServiceImportServiceTestClient.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/WSDLImportServiceTestClient.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/WsdlUpadateContentServiceTestClient.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/GarfileUploadServiceTestClient.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/LifeCycleComparisonServiceTestClient.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/PolicyUploadServiceTestClient.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/ResourceHandlingServiceTestClient.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/SchemaUploadServiceTestClient.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/WsdlImportServiceTestClient.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/CommentTest.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/ContinuousOperations.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/PropertiesTest.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/QueryTest.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/RatingTest.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/RenameTest.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/ResourceHandling.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestAssociation.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestContentStream.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestCopy.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestMove.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestPaths.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestResources.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestTagging.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/CollectionChildCountTest.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/CommentTest.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/ContinuousOperations.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/OnDemandContentTest.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/PropertiesTest.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/QueryTest.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/RatingTest.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/RenameTest.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/ResourceHandling.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestAssociation.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestContentStream.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestCopy.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestMove.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestPaths.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestResources.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestTagging.java
   trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/VersionHandlingTest.java
   trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.ravana/src/test/java/org/wso2/carbon/automation/ravana/test/esb/RavanaESBTest.java
   trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.ravana/src/test/java/org/wso2/carbon/automation/ravana/test/ravanautils/RavanaTestTemplate.java
   trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegCollectionSeleniumTest.java
   trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegPolicyUploaderSeleniumTest.java
   trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegResourceSeleniumTest.java
   trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegRootSeleniumTest.java
   trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegSchemaUploaderSeleniumTest.java
   trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegServiceCreatorSeleniumTest.java
   trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegWSDLUploaderfromURLSeleniumTest.java
   trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GregLoginSeleniumTest.java

Modified: trunk/graphite/platform-integration/system-test-framework/core/org.wso2.platform.integration.core/src/main/java/org/wso2/platform/test/core/utils/gregutils/GregRemoteRegistryProvider.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/core/org.wso2.platform.integration.core/src/main/java/org/wso2/platform/test/core/utils/gregutils/GregRemoteRegistryProvider.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================

--- trunk/graphite/platform-integration/system-test-framework/core/org.wso2.platform.integration.core/src/main/java/org/wso2/platform/test/core/utils/gregutils/GregRemoteRegistryProvider.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/core/org.wso2.platform.integration.core/src/main/java/org/wso2/platform/test/core/utils/gregutils/GregRemoteRegistryProvider.java	Wed Feb 29 12:08:49 2012
@@ -20,11 +20,11 @@
     private static final Log log = LogFactory.getLog(GregRemoteRegistryProvider.class);
     public RemoteRegistry registry;
 
-    public RemoteRegistry getRegistry(String userId)
+    public RemoteRegistry getRegistry(int userId)
             throws MalformedURLException, RegistryException {
         String registryURL;
         //tenant details
-        UserInfo userDetails = UserListCsvReader.getUserInfo(UserListCsvReader.getUserId(userId));
+        UserInfo userDetails = UserListCsvReader.getUserInfo(userId);
         String username = userDetails.getUserName();
         String password = userDetails.getPassword();
         EnvironmentBuilder env = new EnvironmentBuilder();

Modified: trunk/graphite/platform-integration/system-test-framework/core/org.wso2.platform.integration.core/src/main/java/org/wso2/platform/test/core/utils/gregutils/GregUserIDEvaluator.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/core/org.wso2.platform.integration.core/src/main/java/org/wso2/platform/test/core/utils/gregutils/GregUserIDEvaluator.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/core/org.wso2.platform.integration.core/src/main/java/org/wso2/platform/test/core/utils/gregutils/GregUserIDEvaluator.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/core/org.wso2.platform.integration.core/src/main/java/org/wso2/platform/test/core/utils/gregutils/GregUserIDEvaluator.java	Wed Feb 29 12:08:49 2012
@@ -21,14 +21,14 @@
 import org.wso2.platform.test.core.utils.environmentutils.EnvironmentBuilder;
 
 public class GregUserIDEvaluator {
-    String tenantId;
+    int tenantId;
 
-    public String getTenantID(){
+    public int getTenantID(){
         EnvironmentBuilder env = new EnvironmentBuilder();
         if (env.getFrameworkSettings().getEnvironmentSettings().is_runningOnStratos()) {
-            tenantId = "3";
+            tenantId = 3;
         } else {
-            tenantId = "0";
+            tenantId = 0;
         }
         return tenantId;
     }

Modified: trunk/graphite/platform-integration/system-test-framework/core/org.wso2.platform.integration.core/src/main/java/org/wso2/platform/test/core/utils/gregutils/RegistryProvider.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/core/org.wso2.platform.integration.core/src/main/java/org/wso2/platform/test/core/utils/gregutils/RegistryProvider.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/core/org.wso2.platform.integration.core/src/main/java/org/wso2/platform/test/core/utils/gregutils/RegistryProvider.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/core/org.wso2.platform.integration.core/src/main/java/org/wso2/platform/test/core/utils/gregutils/RegistryProvider.java	Wed Feb 29 12:08:49 2012
@@ -40,7 +40,7 @@
     private static WSRegistryServiceClient registry = null;
     private static Registry governance = null;
 
-    public WSRegistryServiceClient getRegistry(String userID, String productName) throws RegistryException, AxisFault {
+    public WSRegistryServiceClient getRegistry(int userID, String productName) throws RegistryException, AxisFault {
         String userName;
         String password;
         String tenantDomain;
@@ -48,13 +48,13 @@
         String serverURL;
         EnvironmentBuilder env = new EnvironmentBuilder();
         if (env.getFrameworkSettings().getEnvironmentSettings().is_runningOnStratos()) {   //if Stratos tests are enabled.
-            UserInfo userDetails = UserListCsvReader.getUserInfo(UserListCsvReader.getUserId(userID));
+            UserInfo userDetails = UserListCsvReader.getUserInfo(userID);
             userName = userDetails.getUserName();
             password = userDetails.getPassword();
             tenantDomain = userDetails.getDomain();
             serverURL = getServiceURL(tenantDomain, productName);
         }else{
-            UserInfo userDetails = UserListCsvReader.getUserInfo(UserListCsvReader.getUserId(userID));
+            UserInfo userDetails = UserListCsvReader.getUserInfo(userID);
             userName = "admin"; //To-do read user credentials for product user file
             password = "admin";
             serverURL = getServiceURL(null, productName);
@@ -78,8 +78,8 @@
         return registry;
     }
 
-    public Registry getGovernance(WSRegistryServiceClient registry, String userId) throws RegistryException {
-        UserInfo userDetails = UserListCsvReader.getUserInfo(UserListCsvReader.getUserId(userId));
+    public Registry getGovernance(WSRegistryServiceClient registry, int userId) throws RegistryException {
+        UserInfo userDetails = UserListCsvReader.getUserInfo(userId);
         String userName = userDetails.getUserName();
         setSystemProperties();
 

Modified: trunk/graphite/platform-integration/system-test-framework/core/org.wso2.platform.integration.core/src/main/resources/framework.properties
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/core/org.wso2.platform.integration.core/src/main/resources/framework.properties?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/core/org.wso2.platform.integration.core/src/main/resources/framework.properties	(original)
+++ trunk/graphite/platform-integration/system-test-framework/core/org.wso2.platform.integration.core/src/main/resources/framework.properties	Wed Feb 29 12:08:49 2012
@@ -65,8 +65,8 @@
 brs.http.port=9775
 brs.https.port=9455
 
-ravana.framework.path=/home/krishantha/svn/ravana/ravana2
-ravana.test=false
+ravana.framework.path=/home/krishantha/new-machine/svn/ravana/ravana2
+ravana.test=true
 
 #(chrome|firefox|opera|ie|htmlUnit)
 browser.name=firefox

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/as/ExternalSchemaReferenceTest.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/as/ExternalSchemaReferenceTest.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/as/ExternalSchemaReferenceTest.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/as/ExternalSchemaReferenceTest.java	Wed Feb 29 12:08:49 2012
@@ -62,7 +62,7 @@
         environment = builder.build();
         AXIS2SERVICE_EPR = environment.getAs().getServiceUrl() + "/" + serviceName;
         registry = new RegistryProvider().getRegistry
-                (Integer.toString(userId), ProductConstant.APP_SERVER_NAME); //get remote registry instance
+                (userId, ProductConstant.APP_SERVER_NAME); //get remote registry instance
     }
 
     @Test(groups = "wso2.as", description = "Put claculator schema to G-Reg", priority = 1)

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/dss/DSSTestSuite.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/dss/DSSTestSuite.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/dss/DSSTestSuite.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/dss/DSSTestSuite.java	Wed Feb 29 12:08:49 2012
@@ -67,7 +67,7 @@
         suiteVariablesList.add(new SuiteVariables("EditFaultyDataServiceTest", EditFaultyDataServiceTest.class));
         suiteVariablesList.add(new SuiteVariables("AddScheduleTaskTest", AddScheduleTaskTest.class));
         suiteVariablesList.add(new SuiteVariables("ReScheduleTaskTest", ReScheduleTaskTest.class));
-        superSuite("Data Service Server",suiteVariablesList).run();
+        superSuite("DataServiceServer",suiteVariablesList).run();
     }
 
     public static void main(String[] args) {

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/EndpointServiceTestClient.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/EndpointServiceTestClient.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/EndpointServiceTestClient.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/EndpointServiceTestClient.java	Wed Feb 29 12:08:49 2012
@@ -51,7 +51,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault {
-        String userId = new GregUserIDEvaluator().getTenantID();
+        int userId = new GregUserIDEvaluator().getTenantID();
         registry = new RegistryProvider().getRegistry(userId, ProductConstant.GREG_SERVER_NAME);
         governance = new RegistryProvider().getGovernance(registry, userId);
         wsdlManager = new WsdlManager(governance);

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/GarFileImportServiceTestClient.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/GarFileImportServiceTestClient.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/GarFileImportServiceTestClient.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/GarFileImportServiceTestClient.java	Wed Feb 29 12:08:49 2012
@@ -40,7 +40,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault {
-        String userId = new GregUserIDEvaluator().getTenantID();
+        int userId = new GregUserIDEvaluator().getTenantID();
         registry = new RegistryProvider().getRegistry(userId, ProductConstant.GREG_SERVER_NAME);
         //Delete existing resources
         removeResource();

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/LifeCycleServiceTestClient.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/LifeCycleServiceTestClient.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/LifeCycleServiceTestClient.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/LifeCycleServiceTestClient.java	Wed Feb 29 12:08:49 2012
@@ -45,7 +45,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault {
-        String userId = new GregUserIDEvaluator().getTenantID();
+        int userId = new GregUserIDEvaluator().getTenantID();
         registry = new RegistryProvider().getRegistry(userId, ProductConstant.GREG_SERVER_NAME);
         governance = new RegistryProvider().getGovernance(registry, userId);
         deleteWSDL(); //Delete wsdl

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/PolicyImportServiceTestClient.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/PolicyImportServiceTestClient.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/PolicyImportServiceTestClient.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/PolicyImportServiceTestClient.java	Wed Feb 29 12:08:49 2012
@@ -41,7 +41,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault {
-        String userId = new GregUserIDEvaluator().getTenantID();
+        int userId = new GregUserIDEvaluator().getTenantID();
         registry = new RegistryProvider().getRegistry(userId, ProductConstant.GREG_SERVER_NAME);
         governance = new RegistryProvider().getGovernance(registry, userId);
         deletePolicy();  //Delete already exising policies

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/SchemaImportServiceTestClient.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/SchemaImportServiceTestClient.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/SchemaImportServiceTestClient.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/SchemaImportServiceTestClient.java	Wed Feb 29 12:08:49 2012
@@ -30,9 +30,9 @@
 import org.wso2.carbon.registry.core.exceptions.RegistryException;
 import org.wso2.carbon.registry.core.utils.RegistryClientUtils;
 import org.wso2.carbon.registry.ws.client.registry.WSRegistryServiceClient;
-import org.wso2.carbon.system.test.core.utils.TenantDetails;
-import org.wso2.carbon.system.test.core.utils.TenantListCsvReader;
 import org.wso2.platform.test.core.ProductConstant;
+import org.wso2.platform.test.core.utils.UserInfo;
+import org.wso2.platform.test.core.utils.UserListCsvReader;
 import org.wso2.platform.test.core.utils.gregutils.GregUserIDEvaluator;
 import org.wso2.platform.test.core.utils.gregutils.RegistryProvider;
 import org.testng.annotations.*;
@@ -53,19 +53,19 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault, MalformedURLException {
-        String userId = new GregUserIDEvaluator().getTenantID();
+        int userId = new GregUserIDEvaluator().getTenantID();
         registry = new RegistryProvider().getRegistry(userId, ProductConstant.GREG_SERVER_NAME);
         governance = new RegistryProvider().getGovernance(registry, userId);
         String registryURL;
 
-        TenantDetails tenantDetails = TenantListCsvReader.getTenantDetails(TenantListCsvReader.getTenantId(userId));
-        String username = tenantDetails.getTenantName();
-        String password = tenantDetails.getTenantPassword();
+        UserInfo tenantDetails = UserListCsvReader.getUserInfo(userId);
+        String username = tenantDetails.getUserName();
+        String password = tenantDetails.getPassword();
 
         if (FrameworkSettings.getStratosTestStatus()) {
             registryURL =
                     "https://" + FrameworkSettings.GREG_SERVER_HOST_NAME + "/t/" +
-                    tenantDetails.getTenantDomain() + File.separator + "registry" + File.separator;
+                    tenantDetails.getDomain() + File.separator + "registry" + File.separator;
         } else {
             if (FrameworkSettings.GREG_SERVER_WEB_CONTEXT_ROOT != null) {
                 registryURL =

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/ServiceImportServiceTestClient.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/ServiceImportServiceTestClient.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/ServiceImportServiceTestClient.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/ServiceImportServiceTestClient.java	Wed Feb 29 12:08:49 2012
@@ -43,7 +43,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault {
-        String userId = new GregUserIDEvaluator().getTenantID();
+        int userId = new GregUserIDEvaluator().getTenantID();
         registry = new RegistryProvider().getRegistry(userId, ProductConstant.GREG_SERVER_NAME);
         governance = new RegistryProvider().getGovernance(registry, userId);
         //Delete Service already exists

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/WSDLImportServiceTestClient.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/WSDLImportServiceTestClient.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/WSDLImportServiceTestClient.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/WSDLImportServiceTestClient.java	Wed Feb 29 12:08:49 2012
@@ -48,7 +48,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault {
-        String userId = new GregUserIDEvaluator().getTenantID();
+        int userId = new GregUserIDEvaluator().getTenantID();
         registry = new RegistryProvider().getRegistry(userId, ProductConstant.GREG_SERVER_NAME);
         governance = new RegistryProvider().getGovernance(registry, userId);
         deleteWSDL();   //Delete WSDL which exists

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/WsdlUpadateContentServiceTestClient.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/WsdlUpadateContentServiceTestClient.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/WsdlUpadateContentServiceTestClient.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/governance/WsdlUpadateContentServiceTestClient.java	Wed Feb 29 12:08:49 2012
@@ -48,7 +48,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault {
-        String userId = new GregUserIDEvaluator().getTenantID();
+        int userId = new GregUserIDEvaluator().getTenantID();
         registry = new RegistryProvider().getRegistry(userId, ProductConstant.GREG_SERVER_NAME);
         governance = new RegistryProvider().getGovernance(registry, userId);
         deleteWSDL();    //Delete WSDL which exists

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/GarfileUploadServiceTestClient.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/GarfileUploadServiceTestClient.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/GarfileUploadServiceTestClient.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/GarfileUploadServiceTestClient.java	Wed Feb 29 12:08:49 2012
@@ -43,8 +43,8 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, LoginAuthenticationExceptionException, RemoteException, UserAdminException {
-        String tenantId = "3";
-        String diff_Domainuser = "6";
+        int tenantId = 3;
+        int diff_Domainuser = 6;
         int tenantID_testUser = 3;
         String userID = "testuser1";
         String userPassword = "test123";

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/LifeCycleComparisonServiceTestClient.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/LifeCycleComparisonServiceTestClient.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/LifeCycleComparisonServiceTestClient.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/LifeCycleComparisonServiceTestClient.java	Wed Feb 29 12:08:49 2012
@@ -30,8 +30,8 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault, UserAdminException {
-        String tenantId = "3";
-        String diff_Domainuser = "2";
+        int tenantId = 3;
+        int diff_Domainuser = 2;
         int tenantID_testUser = 3;
         String userID = "testuser1";
         String userPassword = "test123";

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/PolicyUploadServiceTestClient.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/PolicyUploadServiceTestClient.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/PolicyUploadServiceTestClient.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/PolicyUploadServiceTestClient.java	Wed Feb 29 12:08:49 2012
@@ -30,8 +30,8 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, RemoteException, UserAdminException, LoginAuthenticationExceptionException {
-        String tenantId = "3";
-        String diff_Domainuser = "6";
+        int tenantId = 3;
+        int diff_Domainuser = 6;
         int tenantID_testUser = 3;
         String userID = "testuser1";
         String userPassword = "test123";

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/ResourceHandlingServiceTestClient.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/ResourceHandlingServiceTestClient.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/ResourceHandlingServiceTestClient.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/ResourceHandlingServiceTestClient.java	Wed Feb 29 12:08:49 2012
@@ -11,8 +11,8 @@
 import org.wso2.carbon.registry.ws.client.registry.WSRegistryServiceClient;
 import org.wso2.carbon.user.mgt.common.UserAdminException;
 import org.wso2.platform.test.core.ProductConstant;
-import org.wso2.platform.test.core.utils.TenantDetails;
-import org.wso2.platform.test.core.utils.TenantListCsvReader;
+import org.wso2.platform.test.core.utils.UserInfo;
+import org.wso2.platform.test.core.utils.UserListCsvReader;
 import org.wso2.platform.test.core.utils.gregutils.GregUserCreator;
 import org.wso2.platform.test.core.utils.gregutils.RegistryProvider;
 import org.testng.annotations.*;
@@ -38,8 +38,8 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, RemoteException, LoginAuthenticationExceptionException, UserAdminException {
-        String tenantId = "3";
-        String diff_Domainuser = "6";
+        int tenantId = 3;
+        int diff_Domainuser = 6;
         int tenantID_testUser = 3;
         String userID = "testuser1";
         String userPassword = "test123";
@@ -54,13 +54,13 @@
         registry_testUser = GregUserCreator.getRegistry(tenantID_testUser, userID, userPassword);
 
         //Admin Tenant Details
-        TenantDetails tenantDetails = TenantListCsvReader.getTenantDetails(TenantListCsvReader.getTenantId(tenantId));
-        admin_username = tenantDetails.getTenantName();
-        admin_password = tenantDetails.getTenantPassword();
+        UserInfo tenantDetails = UserListCsvReader.getUserInfo(tenantId);
+        admin_username = tenantDetails.getUserName();
+        admin_password = tenantDetails.getPassword();
 
         //different domain user1
-        TenantDetails tenantDetails_diffDomainUser1 = TenantListCsvReader.getTenantDetails(TenantListCsvReader.getTenantId(diff_Domainuser));
-        diffDomain_username1 = tenantDetails_diffDomainUser1.getTenantName();
+        UserInfo tenantDetails_diffDomainUser1 = UserListCsvReader.getUserInfo(diff_Domainuser);
+        diffDomain_username1 = tenantDetails_diffDomainUser1.getUserName();
         // Delete Resource
         removeResource();
     }

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/SchemaUploadServiceTestClient.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/SchemaUploadServiceTestClient.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/SchemaUploadServiceTestClient.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/SchemaUploadServiceTestClient.java	Wed Feb 29 12:08:49 2012
@@ -30,8 +30,8 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, RemoteException, UserAdminException, LoginAuthenticationExceptionException {
-        String tenantId = "3";
-        String diff_Domainuser = "6";
+        int tenantId = 3;
+        int diff_Domainuser = 6;
         int tenantID_testUser = 3;
         String userID = "testuser1";
         String userPassword = "test123";

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/WsdlImportServiceTestClient.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/WsdlImportServiceTestClient.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/WsdlImportServiceTestClient.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/multitenancy/WsdlImportServiceTestClient.java	Wed Feb 29 12:08:49 2012
@@ -50,8 +50,8 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, RemoteException, UserAdminException, LoginAuthenticationExceptionException {
-        String tenantId = "3";
-        String diff_Domainuser = "6";
+        int tenantId = 3;
+        int diff_Domainuser = 6;
         int tenantID_testUser = 3;
         String userID = "testuser1";
         String userPassword = "test123";

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/CommentTest.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/CommentTest.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/CommentTest.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/CommentTest.java	Wed Feb 29 12:08:49 2012
@@ -24,8 +24,8 @@
 import org.wso2.carbon.registry.core.Comment;
 import org.wso2.carbon.registry.core.Resource;
 import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import org.wso2.platform.test.core.utils.TenantDetails;
-import org.wso2.platform.test.core.utils.TenantListCsvReader;
+import org.wso2.platform.test.core.utils.UserInfo;
+import org.wso2.platform.test.core.utils.UserListCsvReader;
 import org.wso2.platform.test.core.utils.gregutils.GregRemoteRegistryProvider;
 import org.wso2.platform.test.core.utils.gregutils.GregUserIDEvaluator;
 
@@ -44,11 +44,11 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws MalformedURLException, RegistryException {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new GregRemoteRegistryProvider().getRegistry(tenantId);
         //Tenant Details
-        TenantDetails tenantDetails = TenantListCsvReader.getTenantDetails(TenantListCsvReader.getTenantId(tenantId));
-        username = tenantDetails.getTenantName();
+        UserInfo tenantDetails = UserListCsvReader.getUserInfo(tenantId);
+        username = tenantDetails.getUserName();
         removeResource();
     }
 

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/ContinuousOperations.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/ContinuousOperations.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/ContinuousOperations.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/ContinuousOperations.java	Wed Feb 29 12:08:49 2012
@@ -39,7 +39,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws MalformedURLException, RegistryException {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new GregRemoteRegistryProvider().getRegistry(tenantId);
         removeResource();
 

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/PropertiesTest.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/PropertiesTest.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/PropertiesTest.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/PropertiesTest.java	Wed Feb 29 12:08:49 2012
@@ -38,7 +38,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, MalformedURLException {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new GregRemoteRegistryProvider().getRegistry(tenantId);
         removeResource();
 

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/QueryTest.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/QueryTest.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/QueryTest.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/QueryTest.java	Wed Feb 29 12:08:49 2012
@@ -40,7 +40,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws MalformedURLException, RegistryException {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new GregRemoteRegistryProvider().getRegistry(tenantId);
         removeResource();
     }

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/RatingTest.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/RatingTest.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/RatingTest.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/RatingTest.java	Wed Feb 29 12:08:49 2012
@@ -40,7 +40,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws MalformedURLException, RegistryException {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new GregRemoteRegistryProvider().getRegistry(tenantId);
         removeResource();
     }

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/RenameTest.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/RenameTest.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/RenameTest.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/RenameTest.java	Wed Feb 29 12:08:49 2012
@@ -37,7 +37,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws MalformedURLException, RegistryException {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new GregRemoteRegistryProvider().getRegistry(tenantId);
         removeResource();
     }

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/ResourceHandling.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/ResourceHandling.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/ResourceHandling.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/ResourceHandling.java	Wed Feb 29 12:08:49 2012
@@ -24,8 +24,8 @@
 import org.wso2.carbon.registry.core.Resource;
 import org.wso2.carbon.registry.core.Tag;
 import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import org.wso2.platform.test.core.utils.TenantDetails;
-import org.wso2.platform.test.core.utils.TenantListCsvReader;
+import org.wso2.platform.test.core.utils.UserInfo;
+import org.wso2.platform.test.core.utils.UserListCsvReader;
 import org.wso2.platform.test.core.utils.gregutils.GregRemoteRegistryProvider;
 import org.wso2.platform.test.core.utils.gregutils.GregUserIDEvaluator;
 
@@ -46,11 +46,11 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws MalformedURLException, RegistryException {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new GregRemoteRegistryProvider().getRegistry(tenantId);
         //Tenant Details
-        TenantDetails tenantDetails = TenantListCsvReader.getTenantDetails(TenantListCsvReader.getTenantId(tenantId));
-        username = tenantDetails.getTenantName();
+        UserInfo tenantDetails = UserListCsvReader.getUserInfo(tenantId);
+        username = tenantDetails.getUserName();
         removeResource();
     }
 

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestAssociation.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestAssociation.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestAssociation.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestAssociation.java	Wed Feb 29 12:08:49 2012
@@ -39,7 +39,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws MalformedURLException, RegistryException {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new GregRemoteRegistryProvider().getRegistry(tenantId);
         removeResource();
 

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestContentStream.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestContentStream.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestContentStream.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestContentStream.java	Wed Feb 29 12:08:49 2012
@@ -39,7 +39,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws MalformedURLException, RegistryException {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new GregRemoteRegistryProvider().getRegistry(tenantId);
         resourcePath = ProductConstant.SYSTEM_TEST_RESOURCE_LOCATION;
         removeResource();

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestCopy.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestCopy.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestCopy.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestCopy.java	Wed Feb 29 12:08:49 2012
@@ -38,7 +38,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws MalformedURLException, RegistryException {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new GregRemoteRegistryProvider().getRegistry(tenantId);
         removeResource();
     }

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestMove.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestMove.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestMove.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestMove.java	Wed Feb 29 12:08:49 2012
@@ -38,7 +38,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws MalformedURLException, RegistryException {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new GregRemoteRegistryProvider().getRegistry(tenantId);
         removeResource();
     }

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestPaths.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestPaths.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestPaths.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestPaths.java	Wed Feb 29 12:08:49 2012
@@ -37,7 +37,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws MalformedURLException, RegistryException {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new GregRemoteRegistryProvider().getRegistry(tenantId);
         removeResource();
     }

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestResources.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestResources.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestResources.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestResources.java	Wed Feb 29 12:08:49 2012
@@ -23,8 +23,8 @@
 import org.wso2.carbon.registry.core.Resource;
 import org.wso2.carbon.registry.core.exceptions.RegistryException;
 import org.testng.annotations.*;
-import org.wso2.platform.test.core.utils.TenantDetails;
-import org.wso2.platform.test.core.utils.TenantListCsvReader;
+import org.wso2.platform.test.core.utils.UserInfo;
+import org.wso2.platform.test.core.utils.UserListCsvReader;
 import org.wso2.platform.test.core.utils.gregutils.GregRemoteRegistryProvider;
 import org.wso2.platform.test.core.utils.gregutils.GregUserIDEvaluator;
 
@@ -41,11 +41,11 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws MalformedURLException, RegistryException {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new GregRemoteRegistryProvider().getRegistry(tenantId);
         //Tenant Details
-        TenantDetails tenantDetails = TenantListCsvReader.getTenantDetails(TenantListCsvReader.getTenantId(tenantId));
-        username = tenantDetails.getTenantName();
+        UserInfo tenantDetails = UserListCsvReader.getUserInfo(tenantId);
+        username = tenantDetails.getUserName();
         removeResource();
 
     }

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestTagging.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestTagging.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestTagging.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/remoteregistry/TestTagging.java	Wed Feb 29 12:08:49 2012
@@ -37,7 +37,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws MalformedURLException, RegistryException {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new GregRemoteRegistryProvider().getRegistry(tenantId);
         removeResource();
     }

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/CollectionChildCountTest.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/CollectionChildCountTest.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/CollectionChildCountTest.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/CollectionChildCountTest.java	Wed Feb 29 12:08:49 2012
@@ -38,7 +38,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new RegistryProvider().getRegistry(tenantId, ProductConstant.GREG_SERVER_NAME);
 
     }

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/CommentTest.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/CommentTest.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/CommentTest.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/CommentTest.java	Wed Feb 29 12:08:49 2012
@@ -25,8 +25,8 @@
 import org.wso2.carbon.registry.core.exceptions.RegistryException;
 import org.wso2.carbon.registry.ws.client.registry.WSRegistryServiceClient;
 import org.wso2.platform.test.core.ProductConstant;
-import org.wso2.platform.test.core.utils.TenantDetails;
-import org.wso2.platform.test.core.utils.TenantListCsvReader;
+import org.wso2.platform.test.core.utils.UserInfo;
+import org.wso2.platform.test.core.utils.UserListCsvReader;
 import org.wso2.platform.test.core.utils.gregutils.GregUserIDEvaluator;
 import org.wso2.platform.test.core.utils.gregutils.RegistryProvider;
 
@@ -47,12 +47,12 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new RegistryProvider().getRegistry(tenantId, ProductConstant.GREG_SERVER_NAME);
 
-        TenantDetails tenantDetails = TenantListCsvReader.getTenantDetails(TenantListCsvReader.getTenantId(tenantId));
-        username = tenantDetails.getTenantName();
-        password = tenantDetails.getTenantPassword();
+        UserInfo tenantDetails = UserListCsvReader.getUserInfo(tenantId);
+        username = tenantDetails.getUserName();
+        password = tenantDetails.getPassword();
         removeResource();       //delete existing resources
     }
 

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/ContinuousOperations.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/ContinuousOperations.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/ContinuousOperations.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/ContinuousOperations.java	Wed Feb 29 12:08:49 2012
@@ -22,7 +22,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new RegistryProvider().getRegistry(tenantId, ProductConstant.GREG_SERVER_NAME);
         removeResource();
     }

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/OnDemandContentTest.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/OnDemandContentTest.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/OnDemandContentTest.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/OnDemandContentTest.java	Wed Feb 29 12:08:49 2012
@@ -21,7 +21,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new RegistryProvider().getRegistry(tenantId, ProductConstant.GREG_SERVER_NAME);
         removeResource();
     }

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/PropertiesTest.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/PropertiesTest.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/PropertiesTest.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/PropertiesTest.java	Wed Feb 29 12:08:49 2012
@@ -39,7 +39,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new RegistryProvider().getRegistry(tenantId, ProductConstant.GREG_SERVER_NAME);
         removeResource();
     }

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/QueryTest.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/QueryTest.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/QueryTest.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/QueryTest.java	Wed Feb 29 12:08:49 2012
@@ -40,7 +40,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new RegistryProvider().getRegistry(tenantId, ProductConstant.GREG_SERVER_NAME);
         removeResource();
     }

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/RatingTest.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/RatingTest.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/RatingTest.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/RatingTest.java	Wed Feb 29 12:08:49 2012
@@ -37,7 +37,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new RegistryProvider().getRegistry(tenantId, ProductConstant.GREG_SERVER_NAME);
         removeResource();
     }

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/RenameTest.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/RenameTest.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/RenameTest.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/RenameTest.java	Wed Feb 29 12:08:49 2012
@@ -34,7 +34,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new RegistryProvider().getRegistry(tenantId, ProductConstant.GREG_SERVER_NAME);
         removeResource();
     }

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/ResourceHandling.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/ResourceHandling.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/ResourceHandling.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/ResourceHandling.java	Wed Feb 29 12:08:49 2012
@@ -22,8 +22,8 @@
 import org.wso2.carbon.registry.core.exceptions.RegistryException;
 import org.wso2.carbon.registry.ws.client.registry.WSRegistryServiceClient;
 import org.wso2.platform.test.core.ProductConstant;
-import org.wso2.platform.test.core.utils.TenantListCsvReader;
 import org.testng.annotations.*;
+import org.wso2.platform.test.core.utils.UserListCsvReader;
 import org.wso2.platform.test.core.utils.gregutils.GregUserIDEvaluator;
 import org.wso2.platform.test.core.utils.gregutils.RegistryProvider;
 
@@ -39,9 +39,9 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new RegistryProvider().getRegistry(tenantId, ProductConstant.GREG_SERVER_NAME);
-        password = TenantListCsvReader.getTenantDetails(TenantListCsvReader.getTenantId(tenantId)).getTenantPassword();
+        password = UserListCsvReader.getUserInfo(tenantId).getPassword();
         removeResource();
     }
 

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestAssociation.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestAssociation.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestAssociation.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestAssociation.java	Wed Feb 29 12:08:49 2012
@@ -26,7 +26,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new RegistryProvider().getRegistry(tenantId, ProductConstant.GREG_SERVER_NAME);
         removeResource();
     }

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestContentStream.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestContentStream.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestContentStream.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestContentStream.java	Wed Feb 29 12:08:49 2012
@@ -23,7 +23,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new RegistryProvider().getRegistry(tenantId, ProductConstant.GREG_SERVER_NAME);
         resourcePath = ProductConstant.SYSTEM_TEST_RESOURCE_LOCATION;
         removeResource();

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestCopy.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestCopy.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestCopy.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestCopy.java	Wed Feb 29 12:08:49 2012
@@ -22,7 +22,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new RegistryProvider().getRegistry(tenantId, ProductConstant.GREG_SERVER_NAME);
         removeResource();
     }

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestMove.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestMove.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestMove.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestMove.java	Wed Feb 29 12:08:49 2012
@@ -36,7 +36,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new RegistryProvider().getRegistry(tenantId, ProductConstant.GREG_SERVER_NAME);
         removeResource();
     }

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestPaths.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestPaths.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestPaths.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestPaths.java	Wed Feb 29 12:08:49 2012
@@ -36,7 +36,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new RegistryProvider().getRegistry(tenantId, ProductConstant.GREG_SERVER_NAME);
         removeResource();
     }

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestResources.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestResources.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestResources.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestResources.java	Wed Feb 29 12:08:49 2012
@@ -24,7 +24,7 @@
 import org.wso2.carbon.registry.ws.client.registry.WSRegistryServiceClient;
 import org.testng.annotations.*;
 import org.wso2.platform.test.core.ProductConstant;
-import org.wso2.platform.test.core.utils.TenantListCsvReader;
+import org.wso2.platform.test.core.utils.UserListCsvReader;
 import org.wso2.platform.test.core.utils.gregutils.GregUserIDEvaluator;
 import org.wso2.platform.test.core.utils.gregutils.RegistryProvider;
 
@@ -41,9 +41,9 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new RegistryProvider().getRegistry(tenantId, ProductConstant.GREG_SERVER_NAME);
-        password = TenantListCsvReader.getTenantDetails(TenantListCsvReader.getTenantId(tenantId)).getTenantPassword();
+        password = UserListCsvReader.getUserInfo(tenantId).getPassword();
         removeResource();
     }
 

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestTagging.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestTagging.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestTagging.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/TestTagging.java	Wed Feb 29 12:08:49 2012
@@ -35,7 +35,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new RegistryProvider().getRegistry(tenantId, ProductConstant.GREG_SERVER_NAME);
         removeResource();
     }

Modified: trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/VersionHandlingTest.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/VersionHandlingTest.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/VersionHandlingTest.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/scenario/org.wso2.stratos.test.auto/src/test/java/org/wso2/stratos/automation/test/greg/wsapi/VersionHandlingTest.java	Wed Feb 29 12:08:49 2012
@@ -38,7 +38,7 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws RegistryException, AxisFault {
-        String tenantId = new GregUserIDEvaluator().getTenantID();
+        int tenantId = new GregUserIDEvaluator().getTenantID();
         registry = new RegistryProvider().getRegistry(tenantId, ProductConstant.GREG_SERVER_NAME);
         removeResource();
     }

Modified: trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.ravana/src/test/java/org/wso2/carbon/automation/ravana/test/esb/RavanaESBTest.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.ravana/src/test/java/org/wso2/carbon/automation/ravana/test/esb/RavanaESBTest.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.ravana/src/test/java/org/wso2/carbon/automation/ravana/test/esb/RavanaESBTest.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.ravana/src/test/java/org/wso2/carbon/automation/ravana/test/esb/RavanaESBTest.java	Wed Feb 29 12:08:49 2012
@@ -18,75 +18,66 @@
 
 package org.wso2.carbon.automation.ravana.test.esb;
 
-import junit.framework.Assert;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.admin.service.utils.FrameworkSettings;
-import org.wso2.carbon.automation.ravana.test.ravanautils.RavanaTestTemplate;
+
+import static org.testng.Assert.*;
+
+import org.testng.annotations.Test;
+import org.wso2.carbon.automation.ravana.test.ravanautils.RavanaTestMaster;
+import org.wso2.platform.test.core.utils.frameworkutils.FrameworkProperties;
 
 import java.io.File;
 import java.io.IOException;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-public class RavanaESBTest extends RavanaTestTemplate {
+public class RavanaESBTest extends RavanaTestMaster {
     private static final Log log = LogFactory.getLog(RavanaESBTest.class);
     private static ResultSet resultSet;
 
 
-    @Override
-    public void executeSql() {
-        testClassName = RavanaESBTest.class.getName();
-        String queryString = "select TPS, TPS_MIN from TEST, SCENARIO,  SVN, SVN_URL where PRODUCT='wso2esb-3.0.1' " +
-                "and SCENARIO.VERSION='3.0.1' and SVN.VERSION=(select max(VERSION) from SVN) and CONCURRENCY=20 " +
-                "and MESSAGE_SIZE=297 and TEST.SCENARIO_ID=SCENARIO.ID and TEST.SVN_ID=SVN.ID;";
-        try {
-            resultSet = mysqlDBMgt.executeQuery(queryString);
-        } catch (SQLException e) {
-            log.error("SQL error " + e.getMessage());
-            Assert.fail("SQL error " + e.getMessage());
-        }
-    }
-
-    @Override
-    public void runSuccessCase() {
-        log.info("Running RavanaESBTest..");
-        try {
-            if (resultSet.next()) {
-                int tps = resultSet.getInt("TPS");
-                int tpsThreshold = resultSet.getInt("TPS_MIN");
-                log.info("Actual TPS:" + tps);
-                log.info("Expected TPS minimum value :" + tpsThreshold);
-                Assert.assertTrue("Actual - " + tps + " TPS is less than expected - " + tpsThreshold + " TPS minimum value", tps > tpsThreshold);
-            } else {
-                Assert.assertNotNull("Result set is empty", resultSet);
-            }
-        } catch (SQLException e) {
-            log.error("SQL error " + e.getMessage());
-            Assert.fail("SQL error " + e.getMessage());
-        }
-    }
-
-    @Override
-    public void createProcessBuilder() {
+    @Test(groups = "wso2.ravana", description = "create process builder to run ravana script file",
+          priority = 1)
+    public void createProcessBuilder() throws IOException, InterruptedException {
         String scenarioName = "esb_direct_string";
-        String ravanaFrameworkPath = FrameworkSettings.RAVANA_FRAMEWORK_PATH;
+        FrameworkProperties frameworkProperties = new FrameworkProperties();
+        String ravanaFrameworkPath = frameworkProperties.getRavana().getFrameworkPath();
         log.info("Running " + scenarioName + "scenario ..");
         ProcessBuilder pb = new ProcessBuilder("./test.sh", "wso2/" + scenarioName);
         log.info("Scenario execution finish ..");
         pb.directory(new File(ravanaFrameworkPath));
         Process proc;
-        try {
-            proc = pb.start();
-            int exitVal = proc.waitFor();
-            log.info("Proc wait for status " + exitVal);
-        } catch (IOException e) {
-            log.error("File IO error " + e.getMessage());
-            Assert.fail("File IO error " + e.getMessage());
-        } catch (InterruptedException e) {
-            log.error("Process interruption exception " + e.getMessage());
-            Assert.fail("Process interruption exception " + e.getMessage());
+        proc = pb.start();
+        int exitVal = proc.waitFor();
+        log.info("Proc wait for status " + exitVal);
+    }
+
+    @Test(groups = "wso2.ravana", description = "execute the query to analyse data",
+          priority = 2)
+    public void executeSql() throws SQLException {
+        String queryString = "select TPS, TPS_MIN from TEST, SCENARIO,  SVN, " +
+                             "SVN_URL where PRODUCT='wso2esb-3.0.1' " +
+                             "and SCENARIO.VERSION='3.0.1' and " +
+                             "SVN.VERSION=(select max(VERSION) from SVN) and CONCURRENCY=20 " +
+                             "and MESSAGE_SIZE=297 and " +
+                             "TEST.SCENARIO_ID=SCENARIO.ID and TEST.SVN_ID=SVN.ID;";
+        resultSet = mysqlDBMgt.executeQuery(queryString);
+    }
+
+    @Test(groups = "wso2.ravana", description = "verify Ravana test results",
+          priority = 3)
+    public void testVerifyRavanaResult() throws SQLException {
+        log.info("Running Ravana ESB Test..");
+        if (resultSet.next()) {
+            int tps = resultSet.getInt("TPS");
+            int tpsThreshold = resultSet.getInt("TPS_MIN");
+            log.info("Actual TPS:" + tps);
+            log.info("Expected TPS minimum value :" + tpsThreshold);
+            assertTrue(tps > tpsThreshold, "Actual - " + tps + " TPS is less than expected - " +
+                                           tpsThreshold + " TPS minimum value");
+        } else {
+            assertNotNull(resultSet, "Result set is empty");
         }
-        log.info("Ravana Test run finished");
     }
 }

Copied: trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.ravana/src/test/java/org/wso2/carbon/automation/ravana/test/ravanautils/RavanaTestMaster.java (from r121758, /trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.ravana/src/test/java/org/wso2/carbon/automation/ravana/test/ravanautils/RavanaTestTemplate.java)
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.ravana/src/test/java/org/wso2/carbon/automation/ravana/test/ravanautils/RavanaTestMaster.java?rev=121764&r1=121758&r2=121764&view=diff
==============================================================================
--- /trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.ravana/src/test/java/org/wso2/carbon/automation/ravana/test/ravanautils/RavanaTestTemplate.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.ravana/src/test/java/org/wso2/carbon/automation/ravana/test/ravanautils/RavanaTestMaster.java	Wed Feb 29 12:08:49 2012
@@ -17,115 +17,80 @@
 */
 package org.wso2.carbon.automation.ravana.test.ravanautils;
 
-import junit.framework.Assert;
-import org.apache.axis2.AxisFault;
-import org.wso2.carbon.admin.service.AdminServiceAuthentication;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
 import org.wso2.carbon.admin.service.AdminServiceSynapseConfigAdmin;
 import org.wso2.carbon.admin.service.utils.FrameworkSettings;
-import org.wso2.carbon.system.test.core.TestTemplate;
-import org.wso2.carbon.system.test.core.utils.TenantDetails;
-import org.wso2.carbon.system.test.core.utils.TenantListCsvReader;
-import org.wso2.carbon.system.test.core.utils.dbUtils.MySqlDatabaseManager;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.platform.test.core.utils.UserInfo;
+import org.wso2.platform.test.core.utils.UserListCsvReader;
+import org.wso2.platform.test.core.utils.dbutils.MySqlDatabaseManager;
+import org.wso2.platform.test.core.utils.environmentutils.EnvironmentBuilder;
+import org.wso2.platform.test.core.utils.environmentutils.ManageEnvironment;
 
-import javax.servlet.ServletException;
 import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.stream.XMLStreamException;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 import java.io.*;
-import java.rmi.RemoteException;
 import java.sql.SQLException;
 
-public abstract class RavanaTestTemplate extends TestTemplate {
-    private static final Log logRavanaTemplate = LogFactory.getLog(RavanaTestTemplate.class);
-    public static MySqlDatabaseManager mysqlDBMgt = null;
+import static org.testng.Assert.*;
 
-    public abstract void executeSql();
+public abstract class RavanaTestMaster {
+    private static final Log logRavanaTemplate = LogFactory.getLog(RavanaTestMaster.class);
+    public static MySqlDatabaseManager mysqlDBMgt = null;
 
-    public abstract void createProcessBuilder();
 
-    @Override
-    public void init() {
+    @BeforeClass
+    public void initializeProperties() throws Exception {
         updateSynapseConfiguration();
         createConnection();
-        createProcessBuilder();
-        executeSql();
     }
 
-    @Override
-    public void cleanup() {
-        try {
-            mysqlDBMgt.disconnect();
-        } catch (SQLException e) {
-            logRavanaTemplate.error("SQL error " + e.getMessage());
-            Assert.fail("SQL error " + e.getMessage());
-        }
+    @AfterClass
+    public void cleanup() throws SQLException {
+        mysqlDBMgt.disconnect();
     }
 
-    private void createConnection() {
+    private void createConnection() throws ClassNotFoundException, SQLException {
         String dbInstanceName = "ravana";
         String connectionURL = FrameworkSettings.RAVANA_JDBC_URL + "/" + dbInstanceName;
         String password = FrameworkSettings.RAVANA_DB_PASSWORD;
         String userName = FrameworkSettings.RAVANA_DB_USER;
-        try {
-            mysqlDBMgt = new MySqlDatabaseManager(connectionURL, userName, password);
-        } catch (SQLException e) {
-            logRavanaTemplate.error("SQL error " + e.getMessage());
-            Assert.fail("SQL error " + e.getMessage());
-        } catch (ClassNotFoundException e) {
-            logRavanaTemplate.error("Driver classes not found " + e.getMessage());
-            Assert.fail("Driver classes not found " + e.getMessage());
-        }
+
+        mysqlDBMgt = new MySqlDatabaseManager(connectionURL, userName, password);
+
     }
 
-    public static void updateSynapseConfiguration() {
-        String backendURL = FrameworkSettings.ESB_BACKEND_URL;
-        String synapseFileLocation = FrameworkSettings.RAVANA_FRAMEWORK_PATH + File.separator + "scenario" +
-                File.separator + "wso2" + File.separator + "synapse.xml";
+    private static void updateSynapseConfiguration() throws Exception {
+        EnvironmentBuilder builder = new EnvironmentBuilder().esb(0);
+        ManageEnvironment environment = builder.build();
+        String backendURL = environment.getEsb().getBackEndUrl();
+        String synapseFileLocation = builder.getFrameworkSettings().getRavana().getFrameworkPath() + File.separator +
+                                     "scenario" + File.separator + "wso2" + File.separator + "synapse.xml";
         logRavanaTemplate.debug("Synapse file content" + convertXMLFileToString(synapseFileLocation));
-        try {
-            TenantDetails tenantDetails = TenantListCsvReader.getTenantDetails(TenantListCsvReader.getTenantId("0"));
-            String sessionCookie = login(tenantDetails.getTenantName(), tenantDetails.getTenantPassword(), backendURL);
-            AdminServiceSynapseConfigAdmin synapseConfigAdmin = new AdminServiceSynapseConfigAdmin(sessionCookie, backendURL);
-            assertTrue("Synapse configuration update failed",
-                    synapseConfigAdmin.updateConfiguration(convertXMLFileToString(synapseFileLocation)));
-            logRavanaTemplate.info("synapse configuration updated");
-
-            Thread.sleep(1000 * 30);
-        } catch (InterruptedException e) {
-            logRavanaTemplate.error("Thread interrupted " + e.getMessage());
-        } catch (AxisFault axisFault) {
-            logRavanaTemplate.error("AxisFault Exception thrown"  + axisFault.getMessage());
-        } catch (RemoteException e) {
-            logRavanaTemplate.error("Remote Exception thrown"  + e.getMessage());
-        } catch (ServletException e) {
-            logRavanaTemplate.error("Servlet Exception thrown"  + e.getMessage());
-        } catch (XMLStreamException e) {
-            logRavanaTemplate.error("XMLStreamException Exception thrown"  + e.getMessage());
-        }
-    }
+        UserInfo tenantDetails = UserListCsvReader.getUserInfo(0);
+        String sessionCookie = environment.getEsb().getSessionCookie();
+        AdminServiceSynapseConfigAdmin synapseConfigAdmin =
+                new AdminServiceSynapseConfigAdmin(sessionCookie, backendURL);
+        assertTrue(synapseConfigAdmin.updateConfiguration(convertXMLFileToString(synapseFileLocation)),
+                   "Synapse configuration update failed");
+        logRavanaTemplate.info("synapse configuration updated");
+        Thread.sleep(1000 * 30); // waif for 30 sec
 
-    protected static String login(String userName, String password, String hostName) {
-        AdminServiceAuthentication loginClient = new AdminServiceAuthentication(hostName);
-        return loginClient.login(userName, password, hostName);
     }
 
-    private static String convertXMLFileToString(String fileName) {
-        try {
-            DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
-            InputStream inputStream = new FileInputStream(new File(fileName));
-            org.w3c.dom.Document doc = documentBuilderFactory.newDocumentBuilder().parse(inputStream);
-            StringWriter stw = new StringWriter();
-            Transformer serializer = TransformerFactory.newInstance().newTransformer();
-            serializer.transform(new DOMSource(doc), new StreamResult(stw));
-            return stw.toString();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
+    private static String convertXMLFileToString(String fileName) throws Exception {
+        DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+        InputStream inputStream = new FileInputStream(new File(fileName));
+        org.w3c.dom.Document doc = documentBuilderFactory.newDocumentBuilder().parse(inputStream);
+        StringWriter stw = new StringWriter();
+        Transformer serializer = TransformerFactory.newInstance().newTransformer();
+        serializer.transform(new DOMSource(doc), new StreamResult(stw));
+        return stw.toString();
     }
+
 }

Modified: trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegCollectionSeleniumTest.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegCollectionSeleniumTest.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegCollectionSeleniumTest.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegCollectionSeleniumTest.java	Wed Feb 29 12:08:49 2012
@@ -24,12 +24,10 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebDriverBackedSelenium;
 import org.openqa.selenium.WebDriverException;
-import org.wso2.platform.test.core.utils.TenantDetails;
-import org.wso2.platform.test.core.utils.TenantListCsvReader;
 import org.wso2.carbon.system.test.core.utils.seleniumUtils.SeleniumScreenCapture;
 import org.wso2.platform.test.core.BrowserManager;
-import org.wso2.platform.test.core.utils.TenantDetails;
-import org.wso2.platform.test.core.utils.TenantListCsvReader;
+import org.wso2.platform.test.core.utils.UserInfo;
+import org.wso2.platform.test.core.utils.UserListCsvReader;
 import org.wso2.platform.test.core.utils.gregutils.GregUserIDEvaluator;
 import org.wso2.platform.test.core.utils.seleniumutils.GRegBackEndURLEvaluator;
 import org.wso2.platform.test.core.utils.seleniumutils.GregUserLogin;
@@ -52,16 +50,16 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws MalformedURLException {
-        String userId = new GregUserIDEvaluator().getTenantID();
+        int userId = new GregUserIDEvaluator().getTenantID();
         String baseUrl = new GRegBackEndURLEvaluator().getBackEndURL();
         log.info("baseURL is " + baseUrl);
         driver = BrowserManager.getWebDriver();
         selenium = new WebDriverBackedSelenium(driver, baseUrl);
         driver.get(baseUrl);
-        TenantDetails tenantDetails = TenantListCsvReader.
-                getTenantDetails(TenantListCsvReader.getTenantId(userId));
-        username = tenantDetails.getTenantName();
-        password = tenantDetails.getTenantPassword();
+        UserInfo tenantDetails = UserListCsvReader.
+                getUserInfo(userId);
+        username = tenantDetails.getUserName();
+        password = tenantDetails.getPassword();
     }
 
     @Test(groups = {"wso2.greg"}, description = "add a collection tree ", priority = 1)

Modified: trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegPolicyUploaderSeleniumTest.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegPolicyUploaderSeleniumTest.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegPolicyUploaderSeleniumTest.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegPolicyUploaderSeleniumTest.java	Wed Feb 29 12:08:49 2012
@@ -26,8 +26,8 @@
 import org.openqa.selenium.WebDriverException;
 import org.testng.annotations.*;
 import org.wso2.platform.test.core.BrowserManager;
-import org.wso2.platform.test.core.utils.TenantDetails;
-import org.wso2.platform.test.core.utils.TenantListCsvReader;
+import org.wso2.platform.test.core.utils.UserInfo;
+import org.wso2.platform.test.core.utils.UserListCsvReader;
 import org.wso2.platform.test.core.utils.gregutils.GregUserIDEvaluator;
 import org.wso2.platform.test.core.utils.seleniumutils.GRegBackEndURLEvaluator;
 import org.wso2.platform.test.core.utils.seleniumutils.GregResourceURLUploader;
@@ -49,15 +49,15 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws MalformedURLException {
-        String userId = new GregUserIDEvaluator().getTenantID();
+        int userId = new GregUserIDEvaluator().getTenantID();
         String baseUrl = new GRegBackEndURLEvaluator().getBackEndURL();
         log.info("baseURL is " + baseUrl);
         driver = BrowserManager.getWebDriver();
         selenium = new WebDriverBackedSelenium(driver, baseUrl);
         driver.get(baseUrl);
-        TenantDetails tenantDetails = TenantListCsvReader.getTenantDetails(TenantListCsvReader.getTenantId(userId));
-        username = tenantDetails.getTenantName();
-        password = tenantDetails.getTenantPassword();
+        UserInfo tenantDetails = UserListCsvReader.getUserInfo(userId);
+        username = tenantDetails.getUserName();
+        password = tenantDetails.getPassword();
     }
 
     @Test(groups = {"wso2.greg"}, description = "add a simple policy from Url", priority = 1)

Modified: trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegResourceSeleniumTest.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegResourceSeleniumTest.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegResourceSeleniumTest.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegResourceSeleniumTest.java	Wed Feb 29 12:08:49 2012
@@ -32,8 +32,8 @@
 import org.testng.annotations.*;
 import org.wso2.carbon.system.test.core.utils.seleniumUtils.SeleniumScreenCapture;
 import org.wso2.platform.test.core.BrowserManager;
-import org.wso2.platform.test.core.utils.TenantDetails;
-import org.wso2.platform.test.core.utils.TenantListCsvReader;
+import org.wso2.platform.test.core.utils.UserInfo;
+import org.wso2.platform.test.core.utils.UserListCsvReader;
 import org.wso2.platform.test.core.utils.gregutils.GregUserIDEvaluator;
 import org.wso2.platform.test.core.utils.seleniumutils.GRegBackEndURLEvaluator;
 import org.wso2.platform.test.core.utils.seleniumutils.GregUserLogin;
@@ -52,15 +52,15 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws MalformedURLException {
-        String userId = new GregUserIDEvaluator().getTenantID();
+        int userId = new GregUserIDEvaluator().getTenantID();
         String baseUrl = new GRegBackEndURLEvaluator().getBackEndURL();
         log.info("baseURL is " + baseUrl);
         driver = BrowserManager.getWebDriver();
         selenium = new WebDriverBackedSelenium(driver, baseUrl);
         driver.get(baseUrl);
-        TenantDetails tenantDetails = TenantListCsvReader.getTenantDetails(TenantListCsvReader.getTenantId(userId));
-        username = tenantDetails.getTenantName();
-        password = tenantDetails.getTenantPassword();
+        UserInfo tenantDetails = UserListCsvReader.getUserInfo(userId);
+        username = tenantDetails.getUserName();
+        password = tenantDetails.getPassword();
 
     }
 

Modified: trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegRootSeleniumTest.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegRootSeleniumTest.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegRootSeleniumTest.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegRootSeleniumTest.java	Wed Feb 29 12:08:49 2012
@@ -28,9 +28,9 @@
 import org.openqa.selenium.WebDriverBackedSelenium;
 import org.openqa.selenium.WebDriverException;
 import org.wso2.carbon.system.test.core.BrowserManager;
-import org.wso2.platform.test.core.utils.TenantDetails;
-import org.wso2.platform.test.core.utils.TenantListCsvReader;
 import org.wso2.carbon.system.test.core.utils.seleniumUtils.SeleniumScreenCapture;
+import org.wso2.platform.test.core.utils.UserInfo;
+import org.wso2.platform.test.core.utils.UserListCsvReader;
 import org.wso2.platform.test.core.utils.gregutils.GregUserIDEvaluator;
 import org.wso2.platform.test.core.utils.seleniumutils.GRegBackEndURLEvaluator;
 import org.wso2.platform.test.core.utils.seleniumutils.GregUserLogin;
@@ -52,15 +52,15 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() {
-        String userId = new GregUserIDEvaluator().getTenantID();
+        int userId = new GregUserIDEvaluator().getTenantID();
         String baseUrl = new GRegBackEndURLEvaluator().getBackEndURL();
         log.info("baseURL is " + baseUrl);
         driver = BrowserManager.getWebDriver();
         selenium = new WebDriverBackedSelenium(driver, baseUrl);
         driver.get(baseUrl);
-        TenantDetails tenantDetails = TenantListCsvReader.getTenantDetails(TenantListCsvReader.getTenantId(userId));
-        username = tenantDetails.getTenantName();
-        password = tenantDetails.getTenantPassword();
+        UserInfo tenantDetails = UserListCsvReader.getUserInfo(userId);
+        username = tenantDetails.getUserName();
+        password = tenantDetails.getPassword();
     }
 
     @Test(groups = {"wso2.greg"}, description = "add a collection to root",priority = 1)

Modified: trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegSchemaUploaderSeleniumTest.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegSchemaUploaderSeleniumTest.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegSchemaUploaderSeleniumTest.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegSchemaUploaderSeleniumTest.java	Wed Feb 29 12:08:49 2012
@@ -28,9 +28,9 @@
 //import org.wso2.carbon.admin.service.utils.ProductConstant;
 import org.wso2.platform.test.core.BrowserManager;
 import org.wso2.platform.test.core.ProductConstant;
-import org.wso2.platform.test.core.utils.TenantDetails;
-import org.wso2.platform.test.core.utils.TenantListCsvReader;
 import org.wso2.carbon.system.test.core.utils.seleniumUtils.SeleniumScreenCapture;
+import org.wso2.platform.test.core.utils.UserInfo;
+import org.wso2.platform.test.core.utils.UserListCsvReader;
 import org.wso2.platform.test.core.utils.gregutils.GregUserIDEvaluator;
 import org.wso2.platform.test.core.utils.seleniumutils.GRegBackEndURLEvaluator;
 import org.wso2.platform.test.core.utils.seleniumutils.GregResourceURLUploader;
@@ -55,15 +55,15 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws MalformedURLException {
-        String userId = new GregUserIDEvaluator().getTenantID();
+        int userId = new GregUserIDEvaluator().getTenantID();
         String baseUrl = new GRegBackEndURLEvaluator().getBackEndURL();
         log.info("baseURL is " + baseUrl);
         driver = BrowserManager.getWebDriver();
         selenium = new WebDriverBackedSelenium(driver, baseUrl);
         driver.get(baseUrl);
-        TenantDetails tenantDetails = TenantListCsvReader.getTenantDetails(TenantListCsvReader.getTenantId(userId));
-        username = tenantDetails.getTenantName();
-        password = tenantDetails.getTenantPassword();
+        UserInfo tenantDetails = UserListCsvReader.getUserInfo(userId);
+        username = tenantDetails.getUserName();
+        password = tenantDetails.getPassword();
     }
 
     @Test(groups = {"wso2.greg"}, description = "add person schema from url", priority = 1)

Modified: trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegServiceCreatorSeleniumTest.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegServiceCreatorSeleniumTest.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegServiceCreatorSeleniumTest.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegServiceCreatorSeleniumTest.java	Wed Feb 29 12:08:49 2012
@@ -25,8 +25,8 @@
 import org.openqa.selenium.WebDriverBackedSelenium;
 import org.testng.annotations.*;
 import org.wso2.platform.test.core.BrowserManager;
-import org.wso2.platform.test.core.utils.TenantDetails;
-import org.wso2.platform.test.core.utils.TenantListCsvReader;
+import org.wso2.platform.test.core.utils.UserInfo;
+import org.wso2.platform.test.core.utils.UserListCsvReader;
 import org.wso2.platform.test.core.utils.gregutils.GregUserIDEvaluator;
 import org.wso2.platform.test.core.utils.seleniumutils.GRegBackEndURLEvaluator;
 import org.wso2.platform.test.core.utils.seleniumutils.GregUserLogin;
@@ -40,7 +40,7 @@
 public class GRegServiceCreatorSeleniumTest {
     private static final Log log = LogFactory.getLog(GRegServiceCreatorSeleniumTest.class);
     private static Selenium selenium;
-    private static TenantDetails tenantDetails;
+    private static UserInfo tenantDetails;
     private static WebDriver driver;
     String username;
     String password;
@@ -48,16 +48,16 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws MalformedURLException {
-        String userId = new GregUserIDEvaluator().getTenantID();
+        int userId = new GregUserIDEvaluator().getTenantID();
         log.info("user if is :" + userId);
         String baseUrl = new GRegBackEndURLEvaluator().getBackEndURL();
         log.info("baseURL is " + baseUrl);
         driver = BrowserManager.getWebDriver();
         selenium = new WebDriverBackedSelenium(driver, baseUrl);
         driver.get(baseUrl);
-        tenantDetails = TenantListCsvReader.getTenantDetails(TenantListCsvReader.getTenantId(userId));
-        username = tenantDetails.getTenantName();
-        password = tenantDetails.getTenantPassword();
+        tenantDetails = UserListCsvReader.getUserInfo(userId);
+        username = tenantDetails.getUserName();
+        password = tenantDetails.getPassword();
     }
 
     @Test(groups = {"wso2.greg"}, description = "add a simple service from UI", priority = 1)

Modified: trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegWSDLUploaderfromURLSeleniumTest.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegWSDLUploaderfromURLSeleniumTest.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegWSDLUploaderfromURLSeleniumTest.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GRegWSDLUploaderfromURLSeleniumTest.java	Wed Feb 29 12:08:49 2012
@@ -26,8 +26,8 @@
 import org.openqa.selenium.WebDriverBackedSelenium;
 import org.openqa.selenium.WebDriverException;
 import org.wso2.platform.test.core.BrowserManager;
-import org.wso2.platform.test.core.utils.TenantDetails;
-import org.wso2.platform.test.core.utils.TenantListCsvReader;
+import org.wso2.platform.test.core.utils.UserInfo;
+import org.wso2.platform.test.core.utils.UserListCsvReader;
 import org.wso2.platform.test.core.utils.gregutils.GregUserIDEvaluator;
 import org.wso2.platform.test.core.utils.seleniumutils.GRegBackEndURLEvaluator;
 import org.wso2.platform.test.core.utils.seleniumutils.GregResourceURLUploader;
@@ -51,15 +51,15 @@
 
     @BeforeClass(alwaysRun = true)
     public void init() throws MalformedURLException {
-        String userId = new GregUserIDEvaluator().getTenantID();
+        int userId = new GregUserIDEvaluator().getTenantID();
         String baseUrl = new GRegBackEndURLEvaluator().getBackEndURL();
         log.info("baseURL is " + baseUrl);
         driver = BrowserManager.getWebDriver();
         selenium = new WebDriverBackedSelenium(driver, baseUrl);
         driver.get(baseUrl);
-        TenantDetails tenantDetails = TenantListCsvReader.getTenantDetails(TenantListCsvReader.getTenantId(userId));
-        username = tenantDetails.getTenantName();
-        password = tenantDetails.getTenantPassword();
+        UserInfo tenantDetails = UserListCsvReader.getUserInfo(userId);
+        username = tenantDetails.getUserName();
+        password = tenantDetails.getPassword();
     }
 
 

Modified: trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GregLoginSeleniumTest.java
URL: http://wso2.org/svn/browse/wso2/trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GregLoginSeleniumTest.java?rev=121764&r1=121763&r2=121764&view=diff
==============================================================================
--- trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GregLoginSeleniumTest.java	(original)
+++ trunk/graphite/platform-integration/system-test-framework/tools/org.wso2.carbon.automation.tools.selenium/src/test/java/org/wso2/carbon/automation/selenium/test/greg/GregLoginSeleniumTest.java	Wed Feb 29 12:08:49 2012
@@ -23,8 +23,8 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebDriverBackedSelenium;
 import org.wso2.platform.test.core.BrowserManager;
-import org.wso2.platform.test.core.utils.TenantDetails;
-import org.wso2.platform.test.core.utils.TenantListCsvReader;
+import org.wso2.platform.test.core.utils.UserInfo;
+import org.wso2.platform.test.core.utils.UserListCsvReader;
 import org.wso2.platform.test.core.utils.gregutils.GregUserIDEvaluator;
 import org.wso2.platform.test.core.utils.seleniumutils.GRegBackEndURLEvaluator;
 import org.wso2.platform.test.core.utils.seleniumutils.GregUserLogin;
@@ -39,22 +39,22 @@
 public class GregLoginSeleniumTest {
     private static final Log log = LogFactory.getLog(GregLoginSeleniumTest.class);
     private static Selenium selenium;
-    private static TenantDetails tenantDetails;
+    private static UserInfo tenantDetails;
     private static WebDriver driver;
     String username;
     String password;
 
     @BeforeClass(alwaysRun = true)
     public void init() throws MalformedURLException {
-        String userId = new GregUserIDEvaluator().getTenantID();
+        int userId = new GregUserIDEvaluator().getTenantID();
         String baseUrl = new GRegBackEndURLEvaluator().getBackEndURL();
         log.info("baseURL is " + baseUrl);
         driver = BrowserManager.getWebDriver();
         selenium = new WebDriverBackedSelenium(driver, baseUrl);
         driver.get(baseUrl);
-        tenantDetails = TenantListCsvReader.getTenantDetails(TenantListCsvReader.getTenantId(userId));
-        username = tenantDetails.getTenantName();
-        password = tenantDetails.getTenantPassword();
+        tenantDetails = UserListCsvReader.getUserInfo(userId);
+        username = tenantDetails.getUserName();
+        password = tenantDetails.getPassword();
     }
 
     @Test(groups = {"wso2.greg"}, description = "G-Reg user login to system")
