[Amdatu-commits] SVN r1761 - in trunk/amdatu-core/itest: base/src/main/java/org/amdatu/core/itest/base tests/src/test/java/org/amdatu/core/itest/tests

[subversion]

Author: bdekrui...@gmail.com
Date: Thu Nov 24 14:28:15 2011
New Revision: 1761

Log:
AMDATU-468 Refactored itests to match tenant refactor

Modified:
   
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreFixture.java
   
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/CoreServicesTest.java

Modified: 
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreFixture.java
==============================================================================
--- 
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreFixture.java
      (original)
+++ 
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreFixture.java
      Thu Nov 24 14:28:15 2011
@@ -44,8 +44,7 @@
             CONFIG_TEMPLATES("org.amdatu.core", 
"org.amdatu.core.config.templates"),
             LOG_CONSOLE("org.amdatu.core", "org.amdatu.core.log.console"),
             LOG_FORWARDER_JDK("org.amdatu.core", 
"org.amdatu.core.log.forwarder.jdk"),
-            TENANT("org.amdatu.core", "org.amdatu.core.tenant"),
-            TENANTSTORE_INMEM("org.amdatu.core", 
"org.amdatu.core.tenantstore.inmem");
+            TENANT("org.amdatu.core", "org.amdatu.core.tenant");
 
         private final String m_groupId;
         private final String m_artifactId;
@@ -72,7 +71,7 @@
             LOGHANDLER("org.amdatu.core.loghandler", logHandlerCnf(), false),
             CONFIGTEMPLATEMANAGER("org.amdatu.core.loghandler", 
configTemplateManagerCnf(), false),
             USERADMIN_STORAGE_FS("org.amdatu.core.useradminstore.fs", 
userAdminStorageFSCnf(), false),
-            TENANT("org.amdatu.core.tenant", tenantCnf(), false);
+            TENANT("org.amdatu.core.tenant.factory", tenantCnf(), true);
 
         private final String m_pid;
         private final Properties m_properties;
@@ -118,9 +117,9 @@
 
         private static Properties tenantCnf() {
             Properties properties = new Properties();
-            properties.put("tenant1.id", "Default");
-            properties.put("tenant1.name", "Default Tenant");
-            properties.put("tenant1.properties.hostname", "localhost");
+            properties.put("id", "Default");
+            properties.put("name", "Default Tenant");
+            properties.put("host", "localhost");
             return properties;
         }
     }

Modified: 
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/CoreServicesTest.java
==============================================================================
--- 
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/CoreServicesTest.java
       (original)
+++ 
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/CoreServicesTest.java
       Thu Nov 24 14:28:15 2011
@@ -30,8 +30,6 @@
 import org.amdatu.core.itest.base.TestContext;
 import org.amdatu.core.itest.tests.mock.TestService;
 import org.amdatu.core.itest.tests.mock.TestServiceImpl;
-import org.amdatu.core.tenant.TenantManagementService;
-import org.amdatu.core.tenant.TenantStorageProvider;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.ServiceDependency;
 import org.junit.After;
@@ -89,10 +87,6 @@
         assertThat("Expected a ConfigurationAdmin to be available", 
configurationAdmin, is(notNullValue()));
         EventAdmin eventAdmin = m_testContext.getService(EventAdmin.class);
         assertThat("Expected a EventAdmin to be available", eventAdmin, 
is(notNullValue()));
-        TenantStorageProvider tenantStorageProvider = 
m_testContext.getService(TenantStorageProvider.class);
-        assertThat("Expected a TenantStorageProvider to be available", 
tenantStorageProvider, is(notNullValue()));
-        TenantManagementService tenantManagementService = 
m_testContext.getService(TenantManagementService.class);
-        assertThat("Expected a TenantManagementService to be available", 
tenantManagementService, is(notNullValue()));
     }
 
     /**
@@ -126,16 +120,19 @@
      */
     @Test
     public void testTenantAwareUserAdminAvailable() throws Exception {
+        
         Properties properties = new Properties();
-        properties.put("tenant1.id", "tenant@localhost");
-        properties.put("tenant1.name", "Tenant localhost");
-        properties.put("tenant1.properties.hostname", "localhost");
-        properties.put("tenant2.id", "tenant@127.0.0.1");
-        properties.put("tenant2.name", "Tenant 127.0.0.1");
-        properties.put("tenant2.properties.hostname", "127.0.0.1");
-
-        m_testContext.updateConfig(CoreFixture.Configs.TENANT.getPid(), 
properties);
-
+        properties.put("id", "tenant@localhost");
+        properties.put("name", "Tenant localhost");
+        properties.put("host", "localhost");
+        
+        m_testContext.updateFactoryConfig(CoreFixture.Configs.TENANT.getPid(), 
properties);
+
+        properties.put("id", "tenant@127.0.0.1");
+        properties.put("name", "Tenant 127.0.0.1");
+        properties.put("host", "127.0.0.1");
+        m_testContext.updateFactoryConfig(CoreFixture.Configs.TENANT.getPid(), 
properties);
+        
         UserAdmin userAdmin1 = m_testContext.getService(UserAdmin.class, 
"(tenant_id=tenant@localhost)");
         assertThat("Expected a UserAdmin for tenant@localhost to be 
available", userAdmin1, is(notNullValue()));
 
_______________________________________________
Amdatu-commits mailing list
Amdatu-commits@amdatu.org
http://lists.amdatu.org/mailman/listinfo/amdatu-commits