Author: [email protected]
Date: Fri Feb 17 15:44:24 2012
New Revision: 2101
Log:
[AMDATUCASSANDRA-167] Fixed cyclic reference between client and unit test
framework
Modified:
trunk/amdatu-cassandra/cassandra-client/src/test/java/org/amdatu/cassandra/test/unit/client/mock/CassandraClientTest.java
trunk/amdatu-cassandra/cassandra-listener/src/test/java/org/amdatu/cassandra/test/unit/listener/ListenerTest.java
trunk/amdatu-cassandra/cassandra-persistencemanager-hector/src/test/java/org/amdatu/cassandra/persistencemanager/hector/EventualConsistencyHectorTest.java
trunk/amdatu-cassandra/cassandra-persistencemanager-hector/src/test/java/org/amdatu/cassandra/persistencemanager/hector/PersistenceManagerTest.java
trunk/amdatu-cassandra/cassandra-persistencemanager-hector/src/test/java/org/amdatu/cassandra/persistencemanager/hector/UnitTestBase.java
trunk/amdatu-cassandra/test-unit/framework-hector/pom.xml
trunk/amdatu-cassandra/test-unit/framework-hector/src/main/java/org/amdatu/cassandra/test/unit/framework/hector/HectorUnitTestFramework.java
trunk/amdatu-cassandra/test-unit/framework/src/main/java/org/amdatu/cassandra/test/unit/framework/UnitTestFramework.java
trunk/amdatu-cassandra/test-unit/pom.xml
Modified:
trunk/amdatu-cassandra/cassandra-client/src/test/java/org/amdatu/cassandra/test/unit/client/mock/CassandraClientTest.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-client/src/test/java/org/amdatu/cassandra/test/unit/client/mock/CassandraClientTest.java
(original)
+++
trunk/amdatu-cassandra/cassandra-client/src/test/java/org/amdatu/cassandra/test/unit/client/mock/CassandraClientTest.java
Fri Feb 17 15:44:24 2012
@@ -15,8 +15,11 @@
*/
package org.amdatu.cassandra.test.unit.client.mock;
-import org.amdatu.cassandra.client.CassandraClientService;
+import org.amdatu.cassandra.client.service.CassandraClientConfigurationService;
+import
org.amdatu.cassandra.client.service.CassandraClientConfigurationServiceImpl;
+import org.amdatu.cassandra.client.service.CassandraClientServiceImpl;
import org.amdatu.cassandra.test.unit.framework.UnitTestFramework;
+import org.amdatu.cassandra.test.unit.framework.mock.EventAdminMock;
import java.nio.ByteBuffer;
import java.util.ArrayList;
@@ -29,6 +32,7 @@
import org.apache.cassandra.thrift.IndexType;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.osgi.service.cm.ConfigurationException;
public class CassandraClientTest {
// Logger for this unit test
@@ -45,14 +49,28 @@
private static final String BYTESTYPE = "BytesType";
// The Cassandra client service to test
- private static CassandraClientService m_client;
+ private static CassandraClientServiceImpl m_client;
@BeforeClass
public static void setup() throws Exception {
// Setup the test framework. This will remove the work directory and
start Cassandra
- m_client = UnitTestFramework.setup();
+ UnitTestFramework.setup();
+
+ m_client = new CassandraClientServiceImpl();
+ m_client.setLogService(UnitTestFramework.createLogService());
+ m_client.setConfiguration(createConfigurationService());
+ m_client.setEventAdmin(new EventAdminMock());
+ m_client.start();
}
+ public static CassandraClientConfigurationService
createConfigurationService() throws ConfigurationException {
+ CassandraClientConfigurationServiceImpl config = new
CassandraClientConfigurationServiceImpl();
+ config.updated(UnitTestFramework.getDefaultConfig());
+ config.setLogService(UnitTestFramework.createLogService());
+ config.start();
+ return config;
+ }
+
@Test
public void run() throws Exception {
LOG.info("Starting unit tests");
Modified:
trunk/amdatu-cassandra/cassandra-listener/src/test/java/org/amdatu/cassandra/test/unit/listener/ListenerTest.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-listener/src/test/java/org/amdatu/cassandra/test/unit/listener/ListenerTest.java
(original)
+++
trunk/amdatu-cassandra/cassandra-listener/src/test/java/org/amdatu/cassandra/test/unit/listener/ListenerTest.java
Fri Feb 17 15:44:24 2012
@@ -15,7 +15,9 @@
*/
package org.amdatu.cassandra.test.unit.listener;
-import org.amdatu.cassandra.client.CassandraClientService;
+import org.amdatu.cassandra.client.service.CassandraClientConfigurationService;
+import
org.amdatu.cassandra.client.service.CassandraClientConfigurationServiceImpl;
+import org.amdatu.cassandra.client.service.CassandraClientServiceImpl;
import org.amdatu.cassandra.listener.ColumnFamilyAvailable;
import org.amdatu.cassandra.listener.ColumnFamilyDefinition;
import org.amdatu.cassandra.listener.ColumnFamilyDefinition.ColumnType;
@@ -24,10 +26,14 @@
import org.amdatu.cassandra.listener.service.CassandraUpdateListenerImpl;
import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
import org.amdatu.cassandra.test.unit.framework.UnitTestFramework;
+import org.amdatu.cassandra.test.unit.framework.mock.EventAdminMock;
+import org.amdatu.cassandra.test.unit.framework.mock.LogServiceMock;
import org.amdatu.cassandra.test.unit.listener.mock.BundleContextMock;
import org.amdatu.cassandra.test.unit.listener.mock.CPMFactoryMock;
import java.nio.ByteBuffer;
+import java.util.Dictionary;
+import java.util.Hashtable;
import org.apache.cassandra.thrift.CfDef;
import org.apache.cassandra.thrift.ColumnDef;
@@ -38,6 +44,7 @@
import org.junit.Test;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
+import org.osgi.service.cm.ConfigurationException;
public class ListenerTest {
private static final org.apache.log4j.Logger LOG =
org.apache.log4j.Logger.getLogger(ListenerTest.class);
@@ -51,7 +58,7 @@
// Timeout for service registrations to take place after schema changes
private static final long TIMEOUT = 15000;
- protected CassandraClientService m_daemon;
+ protected static CassandraClientServiceImpl m_daemon;
// Mock objects
private BundleContext m_bundleContext;
@@ -62,15 +69,27 @@
public static void setup() throws Exception {
// Setup the test framework. This will remove the work directory and
start Cassandra
UnitTestFramework.setup();
+
+ m_daemon = new CassandraClientServiceImpl();
+ m_daemon.setLogService(UnitTestFramework.createLogService());
+ m_daemon.setConfiguration(createConfigurationService());
+ m_daemon.setEventAdmin(new EventAdminMock());
+ m_daemon.start();
+ }
+
+ public static CassandraClientConfigurationService
createConfigurationService() throws ConfigurationException {
+
+ CassandraClientConfigurationServiceImpl config = new
CassandraClientConfigurationServiceImpl();
+ config.updated(UnitTestFramework.getDefaultConfig());
+ config.setLogService(UnitTestFramework.createLogService());
+ config.start();
+ return config;
}
@Test
public void run() throws Exception {
LOG.info("Starting unit tests");
- // Retrieve daemon service
- m_daemon = UnitTestFramework.getDaemonService();
-
// Prepare mock objects
m_bundleContext = new BundleContextMock();
m_factory = new CPMFactoryMock(m_bundleContext);
@@ -79,7 +98,7 @@
// Create and initialize the listener
CassandraUpdateListenerImpl listener = new
CassandraUpdateListenerImpl();
listener.setDaemonService(m_daemon);
- listener.setLogService(UnitTestFramework.getLogService());
+ listener.setLogService(UnitTestFramework.createLogService());
listener.setPersistenceManagerFactory(m_factory);
listener.setBundleContext(m_bundleContext);
listener.setDependencyManager(m_depMgr);
@@ -95,7 +114,7 @@
// Test add global ColumnFamily
testAddGlobalColumnFamily();
-
+
// Test update ColumnFamily
testUpdateColumnFamily();
@@ -166,8 +185,8 @@
// After adding the global CF provider, the CF should be added and a
ColumnFamilyAvailable
// service should be registered for it in the test keyspace.
assertServiceAvailable(ColumnFamilyAvailable.class,
getCFAvailableFilter(TEST_CF_3));
- assertServiceAvailable(ColumnFamilyAvailable.class,
getCFAvailableFilter(TEST_CF_4));
-
+ assertServiceAvailable(ColumnFamilyAvailable.class,
getCFAvailableFilter(TEST_CF_4));
+
// Extra check: is TEST_CF_3 also added to the keyspace in Cassandra?
Assert.assertTrue(m_daemon.getColumnFamilies(TEST_KS).contains(TEST_CF_3));
}
@@ -178,15 +197,15 @@
cfDef.setColumn_type(ColumnType.STANDARD.getValue());
cfDef.setComparator_type(CompareType.BYTESTYPE.getValue());
Assert.assertFalse(m_daemon.updateColumnFamily(TEST_KS, cfDef));
-
+
// Update with change standard -> super, should throw an exception
cfDef.setColumn_type(ColumnType.SUPER.getValue());
try {
m_daemon.updateColumnFamily(TEST_KS, cfDef);
Assert.fail("Incompatible update of ColumnFamily '" + TEST_CF + "'
does not throw an exception");
- } catch (Exception e) {
}
-
+ catch (Exception e) {}
+
// Add a ColumnDefinition, should succeed
cfDef.setColumn_type(ColumnType.STANDARD.getValue());
ByteBuffer name = ByteBuffer.wrap("indexcol".getBytes("UTF-8"));
@@ -195,19 +214,19 @@
cDef.setIndex_name("indexname");
cfDef.addToColumn_metadata(cDef);
Assert.assertTrue(m_daemon.updateColumnFamily(TEST_KS, cfDef));
-
+
// Invoke update without an effective change, should return false
Assert.assertFalse(m_daemon.updateColumnFamily(TEST_KS, cfDef));
-
+
// Update the ColumnDefinition without the ColDef, the ColDef should
be removed
cfDef = new CfDef(TEST_KS, TEST_CF);
cfDef.setColumn_type(ColumnType.STANDARD.getValue());
cfDef.setComparator_type(CompareType.BYTESTYPE.getValue());
m_daemon.updateColumnFamily(TEST_KS, cfDef);
- CfDef def = m_daemon.getColumnFamily(TEST_KS, TEST_CF);
+ CfDef def = m_daemon.getColumnFamily(TEST_KS, TEST_CF);
Assert.assertTrue(def.getColumn_metadata().size() == 0);
}
-
+
private void testRemoveKeyspace() throws Exception {
// Drop the keyspace
m_daemon.dropKeyspace(TEST_KS);
Modified:
trunk/amdatu-cassandra/cassandra-persistencemanager-hector/src/test/java/org/amdatu/cassandra/persistencemanager/hector/EventualConsistencyHectorTest.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-persistencemanager-hector/src/test/java/org/amdatu/cassandra/persistencemanager/hector/EventualConsistencyHectorTest.java
(original)
+++
trunk/amdatu-cassandra/cassandra-persistencemanager-hector/src/test/java/org/amdatu/cassandra/persistencemanager/hector/EventualConsistencyHectorTest.java
Fri Feb 17 15:44:24 2012
@@ -31,7 +31,7 @@
@BeforeClass
public static void setup() throws Exception {
UnitTestBase.setup();
- m_daemon.addColumnFamily(TEST_KEYSPACE_HECTOR, TEST_CF, "Standard",
"BytesType", null);
+ m_client.addColumnFamily(TEST_KEYSPACE_HECTOR, TEST_CF, "Standard",
"BytesType", null);
}
@Test
Modified:
trunk/amdatu-cassandra/cassandra-persistencemanager-hector/src/test/java/org/amdatu/cassandra/persistencemanager/hector/PersistenceManagerTest.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-persistencemanager-hector/src/test/java/org/amdatu/cassandra/persistencemanager/hector/PersistenceManagerTest.java
(original)
+++
trunk/amdatu-cassandra/cassandra-persistencemanager-hector/src/test/java/org/amdatu/cassandra/persistencemanager/hector/PersistenceManagerTest.java
Fri Feb 17 15:44:24 2012
@@ -45,10 +45,10 @@
@BeforeClass
public static void setup() throws Exception {
UnitTestBase.setup();
- m_daemon.addColumnFamily(TEST_KEYSPACE_HECTOR, TEST_SUPER_CF, "Super",
"BytesType", "BytesType");
- m_daemon.addColumnFamily(TEST_KEYSPACE_THRIFT, TEST_SUPER_CF, "Super",
"BytesType", "BytesType");
- m_daemon.addColumnFamily(TEST_KEYSPACE_HECTOR, TEST_STANDARD_CF,
"Standard", "BytesType", null);
- m_daemon.addColumnFamily(TEST_KEYSPACE_THRIFT, TEST_STANDARD_CF,
"Standard", "BytesType", null);
+ m_client.addColumnFamily(TEST_KEYSPACE_HECTOR, TEST_SUPER_CF, "Super",
"BytesType", "BytesType");
+ m_client.addColumnFamily(TEST_KEYSPACE_THRIFT, TEST_SUPER_CF, "Super",
"BytesType", "BytesType");
+ m_client.addColumnFamily(TEST_KEYSPACE_HECTOR, TEST_STANDARD_CF,
"Standard", "BytesType", null);
+ m_client.addColumnFamily(TEST_KEYSPACE_THRIFT, TEST_STANDARD_CF,
"Standard", "BytesType", null);
}
@Test
Modified:
trunk/amdatu-cassandra/cassandra-persistencemanager-hector/src/test/java/org/amdatu/cassandra/persistencemanager/hector/UnitTestBase.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-persistencemanager-hector/src/test/java/org/amdatu/cassandra/persistencemanager/hector/UnitTestBase.java
(original)
+++
trunk/amdatu-cassandra/cassandra-persistencemanager-hector/src/test/java/org/amdatu/cassandra/persistencemanager/hector/UnitTestBase.java
Fri Feb 17 15:44:24 2012
@@ -16,12 +16,19 @@
package org.amdatu.cassandra.persistencemanager.hector;
import org.amdatu.cassandra.client.CassandraClientService;
+import org.amdatu.cassandra.client.service.CassandraClientConfigurationService;
+import
org.amdatu.cassandra.client.service.CassandraClientConfigurationServiceImpl;
+import org.amdatu.cassandra.client.service.CassandraClientServiceImpl;
import
org.amdatu.cassandra.persistencemanager.hector.service.HectorCassandraPersistenceManagerImpl;
import org.amdatu.cassandra.test.unit.framework.UnitTestFramework;
+import org.amdatu.cassandra.test.unit.framework.mock.EventAdminMock;
+import org.amdatu.cassandra.test.unit.framework.mock.LogServiceMock;
import java.util.Dictionary;
import java.util.Hashtable;
+import org.osgi.service.cm.ConfigurationException;
+
/**
* An important disadvantage of the Cassandra daemon is that is does not
support in-VM shutdown. It will
* only properly shutdown when the VM shuts down (as it is implemented by VM
shutdown hooks).
@@ -39,45 +46,55 @@
public static final String TEST_KEYSPACE_HECTOR =
"PMUnitTestHectorKeyspace";
public static final String TEST_KEYSPACE_THRIFT =
"PMUnitTestThriftKeyspace";
- protected static CassandraClientService m_daemon;
+ protected static CassandraClientServiceImpl m_client;
protected static HectorCassandraPersistenceManagerImpl m_hectorPM;
public static void setup() throws Exception {
if (!INITIALIZED) {
INITIALIZED = true;
- m_daemon = UnitTestFramework.createDaemon();
+ UnitTestFramework.createDaemon();
+ // Create the client
+ m_client = new CassandraClientServiceImpl();
+ m_client.setLogService(UnitTestFramework.createLogService());
+ m_client.setConfiguration(createConfigurationService());
+ m_client.setEventAdmin(new EventAdminMock());
+ m_client.start();
+
// Drop keyspaces and re-create them if they exist
- if (m_daemon.keyspaceExists(TEST_KEYSPACE_HECTOR)) {
- m_daemon.dropKeyspace(TEST_KEYSPACE_HECTOR);
+ if (m_client.keyspaceExists(TEST_KEYSPACE_HECTOR)) {
+ m_client.dropKeyspace(TEST_KEYSPACE_HECTOR);
}
- if (m_daemon.keyspaceExists(TEST_KEYSPACE_THRIFT)) {
- m_daemon.dropKeyspace(TEST_KEYSPACE_THRIFT);
+ if (m_client.keyspaceExists(TEST_KEYSPACE_THRIFT)) {
+ m_client.dropKeyspace(TEST_KEYSPACE_THRIFT);
}
- m_daemon.addKeyspace(TEST_KEYSPACE_HECTOR);
- m_daemon.addKeyspace(TEST_KEYSPACE_THRIFT);
+ m_client.addKeyspace(TEST_KEYSPACE_HECTOR);
+ m_client.addKeyspace(TEST_KEYSPACE_THRIFT);
// Setup Hector persistence manager
m_hectorPM = new HectorCassandraPersistenceManagerImpl();
- m_hectorPM.setDaemonService(m_daemon);
+ m_hectorPM.setDaemonService(m_client);
m_hectorPM.updated(getConfig());
m_hectorPM.setLogService(UnitTestFramework.createLogService());
m_hectorPM.setKeyspace(TEST_KEYSPACE_HECTOR);
m_hectorPM.start();
}
}
-
+
+ public static CassandraClientConfigurationService
createConfigurationService() throws ConfigurationException {
+ CassandraClientConfigurationServiceImpl config = new
CassandraClientConfigurationServiceImpl();
+ config.updated(getConfig());
+ config.setLogService(UnitTestFramework.createLogService());
+ config.start();
+ return config;
+
+ }
+
private static Dictionary<String, String> getConfig() {
- Dictionary<String, String> properties = new Hashtable<String,
String>();
- properties.put(HectorCassandraPersistenceManagerImpl.CLUSTER_NAME,
"Amdatu Unit Test Cluster");
+ Dictionary<String, String> properties =
UnitTestFramework.getDefaultConfig();
properties.put(HectorCassandraPersistenceManagerImpl.READ_CONSISTENCY_LEVEL,
"ONE");
properties.put(HectorCassandraPersistenceManagerImpl.WRITE_CONSISTENCY_LEVEL,
"ONE");
- properties.put(HectorCassandraPersistenceManagerImpl.HOSTS,
"127.0.0.1");
- properties.put(HectorCassandraPersistenceManagerImpl.PORT, "9161");
-
- // For all other properties, we use the default values
-
return properties;
}
}
Modified: trunk/amdatu-cassandra/test-unit/framework-hector/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/test-unit/framework-hector/pom.xml (original)
+++ trunk/amdatu-cassandra/test-unit/framework-hector/pom.xml Fri Feb 17
15:44:24 2012
@@ -30,6 +30,11 @@
<dependencies>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.client</artifactId>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.listener</artifactId>
<type>bundle</type>
</dependency>
Modified:
trunk/amdatu-cassandra/test-unit/framework-hector/src/main/java/org/amdatu/cassandra/test/unit/framework/hector/HectorUnitTestFramework.java
==============================================================================
---
trunk/amdatu-cassandra/test-unit/framework-hector/src/main/java/org/amdatu/cassandra/test/unit/framework/hector/HectorUnitTestFramework.java
(original)
+++
trunk/amdatu-cassandra/test-unit/framework-hector/src/main/java/org/amdatu/cassandra/test/unit/framework/hector/HectorUnitTestFramework.java
Fri Feb 17 15:44:24 2012
@@ -16,12 +16,20 @@
package org.amdatu.cassandra.test.unit.framework.hector;
import org.amdatu.cassandra.client.CassandraClientService;
+import org.amdatu.cassandra.client.service.CassandraClientConfigurationService;
+import
org.amdatu.cassandra.client.service.CassandraClientConfigurationServiceImpl;
+import org.amdatu.cassandra.client.service.CassandraClientServiceImpl;
import org.amdatu.cassandra.listener.ColumnFamilyDefinition;
import org.amdatu.cassandra.listener.ColumnFamilyProvider;
import
org.amdatu.cassandra.persistencemanager.hector.HectorCassandraPersistenceManager;
import
org.amdatu.cassandra.persistencemanager.hector.service.HectorCassandraPersistenceManagerImpl;
import org.amdatu.cassandra.test.unit.framework.UnitTestFramework;
import
org.amdatu.cassandra.test.unit.framework.hector.mock.HectorCassandraPersistenceManagerMock;
+import org.amdatu.cassandra.test.unit.framework.mock.EventAdminMock;
+import org.amdatu.cassandra.test.unit.framework.mock.LogServiceMock;
+
+import java.util.Dictionary;
+import java.util.Hashtable;
import org.osgi.service.cm.ConfigurationException;
@@ -33,12 +41,12 @@
* Downside however is that it slows down the unit test execution. Therefore
you can
* also run the unit test against with a persistence manager that mocks the
Cassandra server
* instead.
- *
+ *
* @author ivol
*/
public class HectorUnitTestFramework {
private boolean m_embedCassandra;
- private CassandraClientService m_daemon = null;
+ private CassandraClientServiceImpl m_client = null;
private HectorCassandraPersistenceManagerImpl m_embeddedPM;
private HectorCassandraPersistenceManagerMock<String, String, Object>
m_mockedPM;
@@ -46,21 +54,41 @@
* If embedCassandra is true, the unit test will embed an actual Cassandra
daemon in the persistence manager,
* making this more a kind of integration test executed from a unit test.
If embedCassandra is false, all
* method calls to Cassandra will be mocked (simulated).
- *
+ *
* @param embedCassandra
*/
public HectorUnitTestFramework(boolean embedCassandra, String keyspace)
throws Exception {
m_embedCassandra = embedCassandra;
if (embedCassandra) {
- m_daemon = UnitTestFramework.setup();
+ UnitTestFramework.setup();
}
+ createClient();
createPersistenceManager(keyspace);
}
+ private void createClient() throws Exception {
+ // Create the client
+ m_client = new CassandraClientServiceImpl();
+ m_client.setLogService(UnitTestFramework.createLogService());
+ m_client.setConfiguration(createConfigurationService());
+ m_client.setEventAdmin(new EventAdminMock());
+ m_client.start();
+
+ }
+
+ private CassandraClientConfigurationService createConfigurationService()
+ throws ConfigurationException {
+ CassandraClientConfigurationServiceImpl config = new
CassandraClientConfigurationServiceImpl();
+ config.updated(UnitTestFramework.getDefaultConfig());
+ config.setLogService(UnitTestFramework.createLogService());
+ config.start();
+ return config;
+ }
+
private void createPersistenceManager(String keyspace) throws
ConfigurationException {
if (m_embedCassandra) {
m_embeddedPM = new HectorCassandraPersistenceManagerImpl();
- m_embeddedPM.setDaemonService(m_daemon);
+ m_embeddedPM.setDaemonService(m_client);
m_embeddedPM.setLogService(UnitTestFramework.createLogService());
m_embeddedPM.updated(UnitTestFramework.getDefaultConfig());
m_embeddedPM.setKeyspace(keyspace);
@@ -68,10 +96,10 @@
// Drop test keyspace (if exists), re-create it so that each unit
test runs in
// a 'clean' environment
- if (m_daemon.keyspaceExists(keyspace)) {
- m_daemon.dropKeyspace(keyspace);
+ if (m_client.keyspaceExists(keyspace)) {
+ m_client.dropKeyspace(keyspace);
}
- m_daemon.addKeyspace(keyspace);
+ m_client.addKeyspace(keyspace);
}
else {
m_mockedPM = new HectorCassandraPersistenceManagerMock<String,
String, Object>(keyspace);
@@ -82,7 +110,7 @@
if (m_embedCassandra) {
// Add the ColumnFamily definitions
for (ColumnFamilyDefinition colDef : provider.getColumnFamilies())
{
- m_daemon.addColumnFamily(m_embeddedPM.getKeyspaceName(),
colDef.getCfDef());
+ m_client.addColumnFamily(m_embeddedPM.getKeyspaceName(),
colDef.getCfDef());
}
}
else {
@@ -93,7 +121,8 @@
public HectorCassandraPersistenceManager getPersistenceManager() {
if (m_embedCassandra) {
return m_embeddedPM;
- } else {
+ }
+ else {
return m_mockedPM;
}
}
Modified:
trunk/amdatu-cassandra/test-unit/framework/src/main/java/org/amdatu/cassandra/test/unit/framework/UnitTestFramework.java
==============================================================================
---
trunk/amdatu-cassandra/test-unit/framework/src/main/java/org/amdatu/cassandra/test/unit/framework/UnitTestFramework.java
(original)
+++
trunk/amdatu-cassandra/test-unit/framework/src/main/java/org/amdatu/cassandra/test/unit/framework/UnitTestFramework.java
Fri Feb 17 15:44:24 2012
@@ -15,11 +15,6 @@
*/
package org.amdatu.cassandra.test.unit.framework;
-import org.amdatu.cassandra.client.CassandraClientService;
-import org.amdatu.cassandra.client.service.CassandraClientConfigurationService;
-import
org.amdatu.cassandra.client.service.CassandraClientConfigurationServiceImpl;
-import org.amdatu.cassandra.client.service.CassandraClientServiceImpl;
-import org.amdatu.cassandra.test.unit.framework.mock.EventAdminMock;
import org.amdatu.cassandra.test.unit.framework.mock.LogServiceMock;
import java.io.File;
@@ -30,7 +25,6 @@
import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.thrift.CassandraDaemon;
-import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.log.LogService;
/**
@@ -47,17 +41,15 @@
public class UnitTestFramework {
private static boolean INITIALIZED = false;
- private static CassandraClientServiceImpl m_client;
private static CassandraDaemon m_daemon = null;
- private static LogService m_logService = null;
+ private static LogServiceMock m_logService = new LogServiceMock();
- public static CassandraClientService setup() throws Exception {
+ public static void setup() throws Exception {
if (!INITIALIZED) {
INITIALIZED = true;
removeWorkDir();
createDaemon();
}
- return m_client;
}
private static void removeWorkDir() throws IOException {
@@ -67,7 +59,7 @@
}
}
- public static CassandraClientService createDaemon() throws Exception {
+ public static void createDaemon() throws Exception {
// Set config files
URL yaml = UnitTestFramework.class.getResource("/cassandra.yaml");
System.setProperty("cassandra.config", yaml.toURI().toString());
@@ -83,43 +75,18 @@
startThread.setDaemon(true);
startThread.start();
startThread.join();
-
- m_logService = createLogService();
- m_client = new CassandraClientServiceImpl();
- m_client.setLogService(m_logService);
- m_client.setConfiguration(createConfigurationService());
- m_client.setEventAdmin(new EventAdminMock());
- m_client.start();
-
- return m_client;
- }
-
- public static LogService createLogService() {
- return new LogServiceMock();
- }
-
- public static LogService getLogService() {
- return m_logService;
- }
-
- public static CassandraClientConfigurationService
createConfigurationService() throws ConfigurationException {
- CassandraClientConfigurationServiceImpl config = new
CassandraClientConfigurationServiceImpl();
- config.updated(getDefaultConfig());
- config.setLogService(getLogService());
- config.start();
- return config;
}
public static Dictionary<String, String> getDefaultConfig() {
Dictionary<String, String> properties = new Hashtable<String,
String>();
- properties.put(CassandraClientConfigurationServiceImpl.CLUSTER_NAME,
"Amdatu Unit Test Cluster");
- properties.put(CassandraClientConfigurationServiceImpl.HOSTS,
"127.0.0.1");
- properties.put(CassandraClientConfigurationServiceImpl.PORT, "9161");
+ properties.put("clustername", "Amdatu Unit Test Cluster");
+ properties.put("hector.hosts", "127.0.0.1");
+ properties.put("hector.port", "9161");
return properties;
}
- public static CassandraClientService getDaemonService() {
- return m_client;
+ public static LogService createLogService() {
+ return m_logService;
}
public static class CassandraDaemonStartThread extends Thread {
Modified: trunk/amdatu-cassandra/test-unit/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/test-unit/pom.xml (original)
+++ trunk/amdatu-cassandra/test-unit/pom.xml Fri Feb 17 15:44:24 2012
@@ -33,11 +33,6 @@
<artifactId>org.amdatu.cassandra.application</artifactId>
<type>bundle</type>
</dependency>
- <dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.client</artifactId>
- <type>bundle</type>
- </dependency>
</dependencies>
<modules>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
