diff --git a/pom.xml b/pom.xml
index 335689a37..6a52dc867 100644
--- a/pom.xml
+++ b/pom.xml
@@ -227,6 +227,7 @@
org.apache.maven.plugins
maven-surefire-plugin
+ -Xmx2048m -XX:MaxPermSize=512m
methods
10
false
@@ -246,6 +247,7 @@
org.apache.maven.plugins
maven-failsafe-plugin
+ -Xmx2048m -XX:MaxPermSize=512m
false
**/test/integration/**/*.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java
index c636965fc..22dd2544d 100644
--- a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java
+++ b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java
@@ -29,7 +29,7 @@ public abstract class AbstractEmbeddedCassandraIntegrationTest {
/**
* Whether to clear the cluster before the next test.
*/
- protected boolean clear = true;
+ protected boolean clear = false;
/**
* Whether to connect to Cassandra.
*/
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/template/CassandraOperationsTest.java b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/template/CassandraOperationsTest.java
index bd413e819..7b763431d 100644
--- a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/template/CassandraOperationsTest.java
+++ b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/template/CassandraOperationsTest.java
@@ -15,14 +15,16 @@
*/
package org.springframework.cassandra.test.integration.core.template;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import java.util.Set;
-
-import junit.framework.Assert;
+import java.util.UUID;
import org.cassandraunit.CassandraCQLUnit;
import org.cassandraunit.dataset.cql.ClassPathCQLDataSet;
@@ -35,17 +37,26 @@ import org.springframework.cassandra.core.CassandraOperations;
import org.springframework.cassandra.core.CassandraTemplate;
import org.springframework.cassandra.core.HostMapper;
import org.springframework.cassandra.core.PreparedStatementBinder;
+import org.springframework.cassandra.core.PreparedStatementCallback;
+import org.springframework.cassandra.core.PreparedStatementCreator;
import org.springframework.cassandra.core.ResultSetExtractor;
+import org.springframework.cassandra.core.ResultSetFutureExtractor;
import org.springframework.cassandra.core.RingMember;
+import org.springframework.cassandra.core.RowCallbackHandler;
import org.springframework.cassandra.core.RowIterator;
+import org.springframework.cassandra.core.RowMapper;
+import org.springframework.cassandra.core.SessionCallback;
import org.springframework.cassandra.test.integration.AbstractEmbeddedCassandraIntegrationTest;
import org.springframework.dao.DataAccessException;
+import org.springframework.util.CollectionUtils;
import com.datastax.driver.core.BoundStatement;
import com.datastax.driver.core.Host;
import com.datastax.driver.core.PreparedStatement;
import com.datastax.driver.core.ResultSet;
+import com.datastax.driver.core.ResultSetFuture;
import com.datastax.driver.core.Row;
+import com.datastax.driver.core.Session;
import com.datastax.driver.core.exceptions.DriverException;
/**
@@ -63,6 +74,8 @@ public class CassandraOperationsTest extends AbstractEmbeddedCassandraIntegratio
/*
* Objects used for test data
*/
+ final String ISBN_NINES = "999999999";
+ final String TITLE_NINES = "Book of Nines";
final Object[] o1 = new Object[] { "1234", "Moby Dick", "Herman Manville", new Integer(456) };
final Object[] o2 = new Object[] { "2345", "War and Peace", "Russian Dude", new Integer(456) };
final Object[] o3 = new Object[] { "3456", "Jane Ayre", "Charlotte", new Integer(456) };
@@ -118,7 +131,7 @@ public class CassandraOperationsTest extends AbstractEmbeddedCassandraIntegratio
});
assertNotNull(ring);
- Assert.assertTrue(ring.size() > 0);
+ assertTrue(ring.size() > 0);
for (MyHost h : ring) {
log.info("hostMapperTest Host -> " + h.someName);
@@ -133,32 +146,20 @@ public class CassandraOperationsTest extends AbstractEmbeddedCassandraIntegratio
List> values = new LinkedList>();
- List