[Amdatu-commits] SVN r410 - trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests

[subvers...@amdatu.org]

Author: angelo.vandersijpt at luminis.eu
Date: Thu Nov 11 17:58:45 2010
New Revision: 410

Log:
AMDATU-121 Re-enabled the Tenant tests, but we still don't use the Cassandra 
storage for this. In fact, I guess we won't.

Modified:
   
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/TenantManagementServiceTest.java

Modified: 
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/TenantManagementServiceTest.java
==============================================================================
--- 
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/TenantManagementServiceTest.java
    (original)
+++ 
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/TenantManagementServiceTest.java
    Thu Nov 11 17:58:45 2010
@@ -113,12 +113,8 @@
 
     @Test
     public void shouldCreateTenantService() throws TenantException, 
InterruptedException {
-        /*
-         * FIXME: temporary disabled this integration test since it seems to 
hang when running mvn clean install
-         * from the root. See issue 
http://jira.amdatu.org/jira/browse/AMDATU-121
-         * m_tenantManagementService.createTenant("tenant1", "Tenant1");
-         * Assert.assertTrue("Tenant service did not become available", 
waitForTenantServiceAdded());
-         */
+         m_tenantManagementService.createTenant("tenant1", "Tenant1");
+         Assert.assertTrue("Tenant service did not become available", 
waitForTenantServiceAdded());
     }
 
     @Test
@@ -129,7 +125,7 @@
         Assert.assertTrue("Tenant service did not disappear", 
waitForTenantServiceRemoved());
     }
 
-    // @Test
+    @Test
     public void shouldPublishTenantProperties() throws TenantException, 
InterruptedException, InvalidSyntaxException {
         TenantEntity tenant =
             
m_tenantManagementService.createTenant("shouldPublishTenantProperties", 
"shouldPublishTenantProperties");
@@ -140,10 +136,9 @@
             getService(Tenant.class, "(" + Tenant.SERVICE_PREFIX + 
"host=shouldPublishTenantProperties.org)"));
     }
 
-    // @Test
+    @Test
     public void shouldUpdateTenantProperties() throws TenantException, 
InterruptedException, InvalidSyntaxException {
-        TenantEntity tenant =
-            
m_tenantManagementService.createTenant("shouldUpdateTenantProperties", 
"shouldUpdateTenantProperties");
+        TenantEntity tenant = 
m_tenantManagementService.createTenant("shouldUpdateTenantProperties", 
"shouldUpdateTenantProperties");
         tenant.putProperty("host", "shouldUpdateTenantProperties.org");
         m_tenantManagementService.updateTenant(tenant);
 
@@ -157,8 +152,7 @@
             getService(Tenant.class, "(" + Tenant.SERVICE_PREFIX + 
"host=shouldPublishTenantProperties.com)"));
 
         assertNull("The service with the old property still lies around",
-            m_bundleContext
-            .getServiceReference("(" + Tenant.SERVICE_PREFIX + 
"host=shouldPublishTenantProperties.org)"));
+            m_bundleContext.getServiceReference("(" + Tenant.SERVICE_PREFIX + 
"host=shouldPublishTenantProperties.org)"));
     }
 
 }