Author: ivol
Date: Mon Oct 18 12:47:57 2010
New Revision: 180
Log:
[AMDATU-107] Small cleanup
Removed:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tenant/
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/IntegrationTestRunner.java
trunk/integration-tests/src/test/java/org/amdatu/test/integration/TenantManagementServiceTest.java
trunk/integration-tests/src/test/java/org/amdatu/test/integration/UserAdminStoreTest.java
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/IntegrationTestRunner.java
==============================================================================
---
trunk/integration-tests/src/test/java/org/amdatu/test/integration/IntegrationTestRunner.java
(original)
+++
trunk/integration-tests/src/test/java/org/amdatu/test/integration/IntegrationTestRunner.java
Mon Oct 18 12:47:57 2010
@@ -28,22 +28,15 @@
import java.io.File;
import java.io.FileFilter;
-import org.ops4j.pax.exam.Inject;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.osgi.framework.BundleContext;
/**
* Base class for integration tests.
* @author ivol
*/
-public abstract class IntegrationTestRunner {
+abstract class IntegrationTestRunner {
public final static String TEST_PREFIX = "> TESTING: ";
- @Inject
- protected BundleContext m_bundleContext;
-
- @Configuration
public Option[] configure() {
// First get our own JAR
FileFilter ff = new FileFilter (){
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/TenantManagementServiceTest.java
==============================================================================
---
trunk/integration-tests/src/test/java/org/amdatu/test/integration/TenantManagementServiceTest.java
(original)
+++
trunk/integration-tests/src/test/java/org/amdatu/test/integration/TenantManagementServiceTest.java
Mon Oct 18 12:47:57 2010
@@ -30,6 +30,9 @@
import org.apache.felix.dm.DependencyManager;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Inject;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -42,14 +45,22 @@
*/
@RunWith(JUnit4TestRunner.class)
public class TenantManagementServiceTest extends IntegrationTestRunner {
+ @Inject
+ protected BundleContext m_bundleContext;
+
+ @Configuration
+ public Option[] configure() {
+ return super.configure();
+ }
+
@Test
public void testTenantManagementService() {
System.out.println(TEST_PREFIX + "************ Running Tenant
Management Service test ************");
- run(m_bundleContext);
+ run();
System.out.println(TEST_PREFIX + "************ Finished Tenant
Management Service test ************");
}
- public void run(BundleContext bundleContext) {
+ public void run() {
// TODO: in the integration test we should use the regular
TenantManagementService. With the current Cassandra
// implementation, this however cannot work because of the way the
dynamic registration of ColumnFamily's was
// implemented. However, since this will be replaced by Cassandra 0.7
which supports dynamic registration of
@@ -57,7 +68,7 @@
// First we register a new Mocked TenantDAO service and register it
with a higher service rank then the default
// Cassandra DAO such that our test framework will pick it up
- DependencyManager depMgr = new DependencyManager(bundleContext);
+ DependencyManager depMgr = new DependencyManager(m_bundleContext);
Hashtable<String, Integer> ht = new Hashtable<String, Integer>();
ht.put(Constants.SERVICE_RANKING, 1);
depMgr.add(depMgr.createComponent().setImplementation(TenantDAOMock.class).setInterface(
@@ -65,15 +76,15 @@
System.out.println(TEST_PREFIX + "TenantDAOMock service registered");
try {
- ServiceReference[] tenantDAOs =
bundleContext.getServiceReferences(TenantDAO.class.getName(), null);
+ ServiceReference[] tenantDAOs =
m_bundleContext.getServiceReferences(TenantDAO.class.getName(), null);
for (ServiceReference ref : tenantDAOs) {
- System.out.println(TEST_PREFIX + "Tenant DAO = " +
bundleContext.getService(ref));
+ System.out.println(TEST_PREFIX + "Tenant DAO = " +
m_bundleContext.getService(ref));
}
} catch (InvalidSyntaxException e) {
}
- ServiceReference tenantMgrSR =
bundleContext.getServiceReference(TenantManagementService.class.getName());
- TenantManagementService tenantService = (TenantManagementService)
bundleContext.getService(tenantMgrSR);
+ ServiceReference tenantMgrSR =
m_bundleContext.getServiceReference(TenantManagementService.class.getName());
+ TenantManagementService tenantService = (TenantManagementService)
m_bundleContext.getService(tenantMgrSR);
System.out.println(TEST_PREFIX + "Testing " + tenantService);
try {
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/UserAdminStoreTest.java
==============================================================================
---
trunk/integration-tests/src/test/java/org/amdatu/test/integration/UserAdminStoreTest.java
(original)
+++
trunk/integration-tests/src/test/java/org/amdatu/test/integration/UserAdminStoreTest.java
Mon Oct 18 12:47:57 2010
@@ -22,6 +22,9 @@
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Inject;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
@@ -38,8 +41,16 @@
*/
@RunWith(JUnit4TestRunner.class)
public class UserAdminStoreTest extends IntegrationTestRunner {
+ @Inject
+ protected BundleContext m_bundleContext;
+
private UserAdmin m_userAdmin;
+ @Configuration
+ public Option[] configure() {
+ return super.configure();
+ }
+
@Test
public void testUserAdminStore() {
System.out.println(TEST_PREFIX + "************ Running User Admin
Store test ************");
