diff --git a/src/main/java/org/springframework/data/cassandra/config/AbstractCassandraConfiguration.java b/src/main/java/org/springframework/data/cassandra/config/AbstractCassandraConfiguration.java index 738514b39..73ae8fd96 100644 --- a/src/main/java/org/springframework/data/cassandra/config/AbstractCassandraConfiguration.java +++ b/src/main/java/org/springframework/data/cassandra/config/AbstractCassandraConfiguration.java @@ -26,6 +26,7 @@ import org.springframework.core.type.filter.AnnotationTypeFilter; import org.springframework.data.annotation.Persistent; import org.springframework.data.cassandra.convert.CassandraConverter; import org.springframework.data.cassandra.convert.MappingCassandraConverter; +import org.springframework.data.cassandra.core.CassandraOperations; import org.springframework.data.cassandra.core.CassandraTemplate; import org.springframework.data.cassandra.core.Keyspace; import org.springframework.data.cassandra.mapping.CassandraMappingContext; @@ -116,7 +117,7 @@ public abstract class AbstractCassandraConfiguration { * @throws Exception */ @Bean - public CassandraTemplate cassandraTemplate() throws Exception { + public CassandraOperations cassandraTemplate() throws Exception { return new CassandraTemplate(keyspace()); } diff --git a/src/test/java/org/springframework/data/cassandra/config/TestConfig.java b/src/test/java/org/springframework/data/cassandra/config/TestConfig.java index cb2f23829..4369a996c 100644 --- a/src/test/java/org/springframework/data/cassandra/config/TestConfig.java +++ b/src/test/java/org/springframework/data/cassandra/config/TestConfig.java @@ -3,6 +3,7 @@ package org.springframework.data.cassandra.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.cassandra.core.CassandraKeyspaceFactoryBean; +import org.springframework.data.cassandra.core.CassandraOperations; import org.springframework.data.cassandra.core.CassandraTemplate; import com.datastax.driver.core.Cluster; @@ -51,9 +52,9 @@ public class TestConfig extends AbstractCassandraConfiguration { } @Bean - public CassandraTemplate cassandraTemplate() { + public CassandraOperations cassandraTemplate() { - CassandraTemplate template = new CassandraTemplate(keyspaceFactoryBean().getObject()); + CassandraOperations template = new CassandraTemplate(keyspaceFactoryBean().getObject()); return template; diff --git a/src/test/java/org/springframework/data/cassandra/template/CassandraOperationsTableTest.java b/src/test/java/org/springframework/data/cassandra/template/CassandraOperationsTableTest.java index 105c4afa4..349aea9c4 100644 --- a/src/test/java/org/springframework/data/cassandra/template/CassandraOperationsTableTest.java +++ b/src/test/java/org/springframework/data/cassandra/template/CassandraOperationsTableTest.java @@ -64,7 +64,7 @@ public class CassandraOperationsTableTest { * Load data file to creat the test keyspace before we init the template */ DataLoader dataLoader = new DataLoader("Test Cluster", "localhost:9160"); - dataLoader.load(new ClassPathYamlDataSet("cassandra-data.yaml")); + dataLoader.load(new ClassPathYamlDataSet("cassandra-keyspace.yaml")); } @@ -75,7 +75,7 @@ public class CassandraOperationsTableTest { * Load data file to creat the test keyspace before we init the template */ DataLoader dataLoader = new DataLoader("Test Cluster", "localhost:9160"); - dataLoader.load(new ClassPathYamlDataSet("cassandra-data.yaml")); + dataLoader.load(new ClassPathYamlDataSet("cassandra-keyspace.yaml")); log.info("Creating Table..."); diff --git a/src/test/java/org/springframework/data/cassandra/template/CassandraOperationsTest.java b/src/test/java/org/springframework/data/cassandra/template/CassandraOperationsTest.java index e875bdb8c..14d426b40 100644 --- a/src/test/java/org/springframework/data/cassandra/template/CassandraOperationsTest.java +++ b/src/test/java/org/springframework/data/cassandra/template/CassandraOperationsTest.java @@ -25,20 +25,22 @@ import junit.framework.Assert; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.thrift.transport.TTransportException; +import org.cassandraunit.CassandraCQLUnit; import org.cassandraunit.DataLoader; +import org.cassandraunit.dataset.cql.ClassPathCQLDataSet; import org.cassandraunit.dataset.yaml.ClassPathYamlDataSet; import org.cassandraunit.utils.EmbeddedCassandraServerHelper; -import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.cassandra.config.TestConfig; -import org.springframework.data.cassandra.core.CassandraTemplate; +import org.springframework.data.cassandra.core.CassandraOperations; import org.springframework.data.cassandra.core.RingMember; import org.springframework.data.cassandra.table.LogEntry; import org.springframework.data.cassandra.table.User; @@ -46,8 +48,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; -import com.datastax.driver.core.Session; - /** * @author David Webb * @@ -57,23 +57,27 @@ import com.datastax.driver.core.Session; public class CassandraOperationsTest { @Autowired - private CassandraTemplate cassandraTemplate; + private CassandraOperations cassandraTemplate; private static Logger log = LoggerFactory.getLogger(CassandraOperationsTest.class); - protected Session session; + private final static String KEYSPACE_NAME = "test"; + + @Rule + public CassandraCQLUnit cassandraCQLUnit = new CassandraCQLUnit(new ClassPathCQLDataSet("cql-dataload.cql", "test"), + "cassandra.yaml", "localhost", 9042); @BeforeClass public static void startCassandra() throws IOException, TTransportException, ConfigurationException, InterruptedException { + EmbeddedCassandraServerHelper.startEmbeddedCassandra("cassandra.yaml"); /* * Load data file to creat the test keyspace before we init the template */ DataLoader dataLoader = new DataLoader("Test Cluster", "localhost:9160"); - dataLoader.load(new ClassPathYamlDataSet("cassandra-data.yaml")); - + dataLoader.load(new ClassPathYamlDataSet("cassandra-keyspace.yaml")); } @Before @@ -82,15 +86,20 @@ public class CassandraOperationsTest { /* * Load data file to creat the test keyspace before we init the template */ - DataLoader dataLoader = new DataLoader("Test Cluster", "localhost:9160"); - dataLoader.load(new ClassPathYamlDataSet("cassandra-data.yaml")); + // DataLoader dataLoader = new DataLoader("Test Cluster", "localhost:9160"); + // dataLoader.load(new ClassPathYamlDataSet("cassandra-keyspace.yaml")); log.info("Creating Table..."); + createTables(); - // cassandraTemplate.createTable(User.class); + } - // cassandraTemplate.createTable(LogEntry.class); + private void createTables() { + // cassandraTemplate + // .executeQuery("create table users (username text, firstName text, lastName text, PRIMARY KEY (username));"); + + // cassandraCQLUnit. } @Test @@ -109,16 +118,7 @@ public class CassandraOperationsTest { } } - /** - * This test inserts and selects users from the test.users table This is testing the CassandraTemplate: - * - */ - // @Test + @Test public void UsersTest() { User u = new User(); @@ -165,7 +165,7 @@ public class CassandraOperationsTest { } - @After + // @After public void clearCassandra() { EmbeddedCassandraServerHelper.cleanEmbeddedCassandra(); @@ -173,6 +173,7 @@ public class CassandraOperationsTest { @AfterClass public static void stopCassandra() { + EmbeddedCassandraServerHelper.cleanEmbeddedCassandra(); EmbeddedCassandraServerHelper.stopEmbeddedCassandra(); } } diff --git a/src/test/resources/cassandra-data.yaml b/src/test/resources/cassandra-keyspace.yaml similarity index 100% rename from src/test/resources/cassandra-data.yaml rename to src/test/resources/cassandra-keyspace.yaml diff --git a/src/test/resources/cql-dataload.cql b/src/test/resources/cql-dataload.cql new file mode 100644 index 000000000..1e441fc91 --- /dev/null +++ b/src/test/resources/cql-dataload.cql @@ -0,0 +1 @@ +create table users (username text, firstName text, lastName text, age int, PRIMARY KEY (username)); \ No newline at end of file