Author: [email protected]
Date: Fri May 6 16:11:48 2011
New Revision: 1119
Log:
[AMDATUCASSANDRA-3] Fixed failing unit tests in case they are executed in
different order then 'usual'
Modified:
branches/amdatu-cassandra-0.2.0/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/EventualConsistencyHectorTest.java
branches/amdatu-cassandra-0.2.0/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/EventualConsistencyThriftTest.java
branches/amdatu-cassandra-0.2.0/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/PersistenceManagerTest.java
branches/amdatu-cassandra-0.2.0/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/UnitTestBase.java
Modified:
branches/amdatu-cassandra-0.2.0/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/EventualConsistencyHectorTest.java
==============================================================================
---
branches/amdatu-cassandra-0.2.0/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/EventualConsistencyHectorTest.java
(original)
+++
branches/amdatu-cassandra-0.2.0/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/EventualConsistencyHectorTest.java
Fri May 6 16:11:48 2011
@@ -17,6 +17,7 @@
import junit.framework.Assert;
+import org.junit.BeforeClass;
import org.junit.Test;
public class EventualConsistencyHectorTest extends UnitTestBase {
@@ -27,16 +28,16 @@
private static final String TEST_COLUMN_BYTES = "ECHT_ColumnBytes";
private static final String DEFAULT_CHARSET = "UTF-8";
- protected void setup() throws Exception {
- super.setup();
+ @BeforeClass
+ public static void setup() throws Exception {
+ UnitTestBase.setup();
m_daemon.addColumnFamily(TEST_KEYSPACE_HECTOR, TEST_CF, "Standard",
"BytesType", null);
}
@Test
public void testAll() throws Exception {
LOG.info("Starting unit tests");
- setup();
-
+
// The test consists of writing value i into column c and then reading
the value from column c.
// We expect that the value read from c is always the same as the
value written to c just before
// reading it, however, in Cassandra this appears not to be the case.
Modified:
branches/amdatu-cassandra-0.2.0/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/EventualConsistencyThriftTest.java
==============================================================================
---
branches/amdatu-cassandra-0.2.0/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/EventualConsistencyThriftTest.java
(original)
+++
branches/amdatu-cassandra-0.2.0/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/EventualConsistencyThriftTest.java
Fri May 6 16:11:48 2011
@@ -17,6 +17,8 @@
import junit.framework.Assert;
+import org.junit.BeforeClass;
+
public class EventualConsistencyThriftTest extends UnitTestBase {
private static final org.apache.log4j.Logger LOG =
org.apache.log4j.Logger.getLogger(EventualConsistencyHectorTest.class);
@@ -26,8 +28,9 @@
private static final String TEST_COLUMN_BYTES = "ECTT_ColumnBytes";
private static final String DEFAULT_CHARSET = "UTF-8";
- protected void setup() throws Exception {
- super.setup();
+ @BeforeClass
+ public static void setup() throws Exception {
+ UnitTestBase.setup();
m_daemon.addColumnFamily(TEST_KEYSPACE_THRIFT, TEST_CF, "Super",
"BytesType", "BytesType");
}
@@ -36,7 +39,6 @@
// @Test
public void testAll() throws Exception {
LOG.info("Starting unit tests");
- setup();
// The test consists of writing value i into column c and then reading
the value from column c.
// We expect that the value read from c is always the same as the
value written to c just before
Modified:
branches/amdatu-cassandra-0.2.0/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/PersistenceManagerTest.java
==============================================================================
---
branches/amdatu-cassandra-0.2.0/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/PersistenceManagerTest.java
(original)
+++
branches/amdatu-cassandra-0.2.0/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/PersistenceManagerTest.java
Fri May 6 16:11:48 2011
@@ -29,6 +29,7 @@
import me.prettyprint.hector.api.beans.SuperRow;
import org.junit.Assert;
+import org.junit.BeforeClass;
import org.junit.Test;
@SuppressWarnings("deprecation")
@@ -40,8 +41,9 @@
private static final String TEST_SUPERCOLUMN = "PMUnitTestSuperColumn";
private static final String TEST_COLUMN = "PMUnitTestColumn";
- protected void setup() throws Exception {
- super.setup();
+ @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);
@@ -51,7 +53,6 @@
@Test
public void run() throws Exception {
LOG.info("Starting unit tests");
- setup();
// Remove all rows first
deleteAllRows(TEST_SUPER_CF);
@@ -71,10 +72,6 @@
testValueTypes(TEST_SUPER_CF, true);
testValueTypes(TEST_STANDARD_CF, false);
- // Drop the keyspaces we created
- m_daemon.dropKeyspace(TEST_KEYSPACE_HECTOR);
- m_daemon.dropKeyspace(TEST_KEYSPACE_THRIFT);
-
LOG.info("Unit tests finished");
}
Modified:
branches/amdatu-cassandra-0.2.0/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/UnitTestBase.java
==============================================================================
---
branches/amdatu-cassandra-0.2.0/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/UnitTestBase.java
(original)
+++
branches/amdatu-cassandra-0.2.0/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/UnitTestBase.java
Fri May 6 16:11:48 2011
@@ -44,7 +44,7 @@
protected static HectorCassandraPersistenceManagerImpl m_hectorPM;
protected static ThriftCassandraPersistenceManagerImpl m_thriftPM;
- protected void setup() throws Exception {
+ public static void setup() throws Exception {
if (!INITIALIZED) {
INITIALIZED = true;
@@ -58,6 +58,14 @@
startThread.start();
startThread.join();
+ // Drop keyspaces and re-create them if they exist
+ if (m_daemon.keyspaceExists(TEST_KEYSPACE_HECTOR)) {
+ m_daemon.dropKeyspace(TEST_KEYSPACE_HECTOR);
+ }
+ if (m_daemon.keyspaceExists(TEST_KEYSPACE_THRIFT)) {
+ m_daemon.dropKeyspace(TEST_KEYSPACE_THRIFT);
+ }
+
m_daemon.addKeyspace(TEST_KEYSPACE_HECTOR);
m_daemon.addKeyspace(TEST_KEYSPACE_THRIFT);
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
