diff --git a/src/test/java/org/springframework/cassandra/cql/CqlStringUtilsTest.java b/src/test/java/org/springframework/cassandra/test/unit/core/cql/CqlStringUtilsTest.java similarity index 91% rename from src/test/java/org/springframework/cassandra/cql/CqlStringUtilsTest.java rename to src/test/java/org/springframework/cassandra/test/unit/core/cql/CqlStringUtilsTest.java index 7b2dfd8ac..a8c97c3e1 100644 --- a/src/test/java/org/springframework/cassandra/cql/CqlStringUtilsTest.java +++ b/src/test/java/org/springframework/cassandra/test/unit/core/cql/CqlStringUtilsTest.java @@ -1,4 +1,4 @@ -package org.springframework.cassandra.cql; +package org.springframework.cassandra.test.unit.core.cql; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; diff --git a/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/AlterTableCqlGeneratorTest.java b/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/AlterTableCqlGeneratorTest.java new file mode 100644 index 000000000..fff4109c1 --- /dev/null +++ b/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/AlterTableCqlGeneratorTest.java @@ -0,0 +1,27 @@ +package org.springframework.cassandra.test.unit.core.cql.generator; + +import static org.springframework.cassandra.core.keyspace.TableOperations.alterTable; + +import org.junit.Test; +import org.springframework.cassandra.core.cql.generator.AlterTableCqlGenerator; +import org.springframework.cassandra.core.keyspace.AlterTableSpecification; + +import com.datastax.driver.core.DataType; + +public class AlterTableCqlGeneratorTest { + + @Test + public void testAlterTableBuilder() throws Exception { + String name = "mytable"; + DataType addedType = DataType.timeuuid(); + String addedName = "added_column"; + DataType alteredType = DataType.text(); + String alteredName = "altered_column"; + String droppedName = "dropped"; + + AlterTableSpecification alter = alterTable().name(name).add(addedName, addedType).alter(alteredName, alteredType) + .drop(droppedName); + AlterTableCqlGenerator generator = new AlterTableCqlGenerator(alter); + System.out.println(generator.toCql()); + } +} diff --git a/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/CreateTableCqlGeneratorTest.java b/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/CreateTableCqlGeneratorTest.java new file mode 100644 index 000000000..ae04a8b8e --- /dev/null +++ b/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/CreateTableCqlGeneratorTest.java @@ -0,0 +1,47 @@ +package org.springframework.cassandra.test.unit.core.cql.generator; + +import static junit.framework.Assert.assertEquals; +import static org.springframework.cassandra.core.keyspace.MapBuilder.map; +import static org.springframework.cassandra.core.keyspace.TableOperations.createTable; +import static org.springframework.cassandra.core.keyspace.TableOption.BLOOM_FILTER_FP_CHANCE; +import static org.springframework.cassandra.core.keyspace.TableOption.CACHING; +import static org.springframework.cassandra.core.keyspace.TableOption.COMMENT; +import static org.springframework.cassandra.core.keyspace.TableOption.COMPACTION; +import static org.springframework.cassandra.core.keyspace.TableOption.CompactionOption.TOMBSTONE_THRESHOLD; + +import org.junit.Test; +import org.springframework.cassandra.core.cql.generator.CreateTableCqlGenerator; +import org.springframework.cassandra.core.keyspace.CreateTableSpecification; +import org.springframework.cassandra.core.keyspace.TableOption.CachingOption; + +import com.datastax.driver.core.DataType; + +public class CreateTableCqlGeneratorTest { + + @Test + public void createTableTest() { + String name = "my\"\"table"; + DataType type0 = DataType.text(); + String partKey0 = "partitionKey0"; + String partition1 = "partitionKey1"; + String primary0 = "primary0"; + DataType type1 = DataType.text(); + String column1 = "column1"; + DataType type2 = DataType.bigint(); + String column2 = "column2"; + Object comment = "this is a comment"; + Object bloom = "0.00075"; + Object caching = CachingOption.KEYS_ONLY; + + CreateTableSpecification create = createTable().ifNotExists().name(name).partitionKeyColumn(partKey0, type0) + .partitionKeyColumn(partition1, type0).primaryKeyColumn(primary0, type0).column(column1, type1) + .column(column2, type2).with(COMMENT, comment).with(BLOOM_FILTER_FP_CHANCE, bloom) + .with(COMPACTION, map().entry(TOMBSTONE_THRESHOLD, "0.15")).with(CACHING, caching); + + CreateTableCqlGenerator generator = new CreateTableCqlGenerator(create); + String cql = generator.toCql(); + assertEquals( + "CREATE TABLE IF NOT EXISTS \"my\"\"table\" (partitionKey0 text, partitionKey1 text, primary0 text, column1 text, column2 bigint, PRIMARY KEY ((partitionKey0, partitionKey1), primary0) WITH CLUSTERING ORDER BY (primary0 ASC) AND comment = 'this is a comment' AND bloom_filter_fp_chance = 0.00075 AND compaction = { 'tombstone_threshold' : 0.15 } AND caching = keys_only;", + cql); + } +} diff --git a/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/DropTableCqlGeneratorTest.java b/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/DropTableCqlGeneratorTest.java new file mode 100644 index 000000000..478c10922 --- /dev/null +++ b/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/DropTableCqlGeneratorTest.java @@ -0,0 +1,18 @@ +package org.springframework.cassandra.test.unit.core.cql.generator; + +import static org.springframework.cassandra.core.keyspace.TableOperations.dropTable; + +import org.junit.Test; +import org.springframework.cassandra.core.cql.generator.DropTableCqlGenerator; +import org.springframework.cassandra.core.keyspace.DropTableSpecification; + +public class DropTableCqlGeneratorTest { + + @Test + public void testDropTableBuilder() throws Exception { + DropTableSpecification drop = dropTable().ifExists().name("mytable"); + + DropTableCqlGenerator generator = new DropTableCqlGenerator(drop); + System.out.println(generator.toCql()); + } +} diff --git a/src/test/java/org/springframework/cassandra/cql/builder/OptionTest.java b/src/test/java/org/springframework/cassandra/test/unit/core/keyspace/OptionTest.java similarity index 97% rename from src/test/java/org/springframework/cassandra/cql/builder/OptionTest.java rename to src/test/java/org/springframework/cassandra/test/unit/core/keyspace/OptionTest.java index dbc652c6e..1d2eff43e 100644 --- a/src/test/java/org/springframework/cassandra/cql/builder/OptionTest.java +++ b/src/test/java/org/springframework/cassandra/test/unit/core/keyspace/OptionTest.java @@ -1,4 +1,4 @@ -package org.springframework.cassandra.cql.builder; +package org.springframework.cassandra.test.unit.core.keyspace; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; diff --git a/src/test/java/org/springframework/cassandra/cql/builder/AlterTableBuilderTest.java b/src/test/java/org/springframework/cassandra/test/unit/cql/generator/AlterTableCqlGeneratorTest.java similarity index 89% rename from src/test/java/org/springframework/cassandra/cql/builder/AlterTableBuilderTest.java rename to src/test/java/org/springframework/cassandra/test/unit/cql/generator/AlterTableCqlGeneratorTest.java index e5046729c..a153248d8 100644 --- a/src/test/java/org/springframework/cassandra/cql/builder/AlterTableBuilderTest.java +++ b/src/test/java/org/springframework/cassandra/test/unit/cql/generator/AlterTableCqlGeneratorTest.java @@ -1,4 +1,4 @@ -package org.springframework.cassandra.cql.builder; +package org.springframework.cassandra.test.unit.cql.generator; import static org.springframework.cassandra.core.keyspace.TableOperations.alterTable; @@ -8,7 +8,7 @@ import org.springframework.cassandra.core.keyspace.AlterTableSpecification; import com.datastax.driver.core.DataType; -public class AlterTableBuilderTest { +public class AlterTableCqlGeneratorTest { @Test public void testAlterTableBuilder() throws Exception { diff --git a/src/test/java/org/springframework/cassandra/cql/builder/CreateTableBuilderTest.java b/src/test/java/org/springframework/cassandra/test/unit/cql/generator/CreateTableCqlGeneratorTest.java similarity index 95% rename from src/test/java/org/springframework/cassandra/cql/builder/CreateTableBuilderTest.java rename to src/test/java/org/springframework/cassandra/test/unit/cql/generator/CreateTableCqlGeneratorTest.java index 73c2aedfe..84eb3e04d 100644 --- a/src/test/java/org/springframework/cassandra/cql/builder/CreateTableBuilderTest.java +++ b/src/test/java/org/springframework/cassandra/test/unit/cql/generator/CreateTableCqlGeneratorTest.java @@ -1,4 +1,4 @@ -package org.springframework.cassandra.cql.builder; +package org.springframework.cassandra.test.unit.cql.generator; import static junit.framework.Assert.assertEquals; import static org.springframework.cassandra.core.keyspace.MapBuilder.map; @@ -16,7 +16,7 @@ import org.springframework.cassandra.core.keyspace.TableOption.CachingOption; import com.datastax.driver.core.DataType; -public class CreateTableBuilderTest { +public class CreateTableCqlGeneratorTest { @Test public void createTableTest() { diff --git a/src/test/java/org/springframework/cassandra/cql/builder/DropTableBuilderTest.java b/src/test/java/org/springframework/cassandra/test/unit/cql/generator/DropTableCqlGeneratorTest.java similarity index 83% rename from src/test/java/org/springframework/cassandra/cql/builder/DropTableBuilderTest.java rename to src/test/java/org/springframework/cassandra/test/unit/cql/generator/DropTableCqlGeneratorTest.java index 89b5e930b..3bb17916b 100644 --- a/src/test/java/org/springframework/cassandra/cql/builder/DropTableBuilderTest.java +++ b/src/test/java/org/springframework/cassandra/test/unit/cql/generator/DropTableCqlGeneratorTest.java @@ -1,4 +1,4 @@ -package org.springframework.cassandra.cql.builder; +package org.springframework.cassandra.test.unit.cql.generator; import static org.springframework.cassandra.core.keyspace.TableOperations.dropTable; @@ -6,7 +6,7 @@ import org.junit.Test; import org.springframework.cassandra.core.cql.generator.DropTableCqlGenerator; import org.springframework.cassandra.core.keyspace.DropTableSpecification; -public class DropTableBuilderTest { +public class DropTableCqlGeneratorTest { @Test public void testDropTableBuilder() throws Exception { diff --git a/src/test/java/org/springframework/data/cassandra/config/CassandraNamespaceTests.java b/src/test/java/org/springframework/data/cassandra/test/unit/config/CassandraNamespaceTests.java similarity index 96% rename from src/test/java/org/springframework/data/cassandra/config/CassandraNamespaceTests.java rename to src/test/java/org/springframework/data/cassandra/test/unit/config/CassandraNamespaceTests.java index 1f4e29dfd..25d18a79c 100644 --- a/src/test/java/org/springframework/data/cassandra/config/CassandraNamespaceTests.java +++ b/src/test/java/org/springframework/data/cassandra/test/unit/config/CassandraNamespaceTests.java @@ -1,4 +1,4 @@ -package org.springframework.data.cassandra.config; +package org.springframework.data.cassandra.test.unit.config; import java.io.IOException; diff --git a/src/test/java/org/springframework/data/cassandra/config/DriverTests.java b/src/test/java/org/springframework/data/cassandra/test/unit/config/DriverTests.java similarity index 95% rename from src/test/java/org/springframework/data/cassandra/config/DriverTests.java rename to src/test/java/org/springframework/data/cassandra/test/unit/config/DriverTests.java index b338b0161..c34c59feb 100644 --- a/src/test/java/org/springframework/data/cassandra/config/DriverTests.java +++ b/src/test/java/org/springframework/data/cassandra/test/unit/config/DriverTests.java @@ -1,4 +1,4 @@ -package org.springframework.data.cassandra.config; +package org.springframework.data.cassandra.test.unit.config; import java.io.IOException; diff --git a/src/test/java/org/springframework/data/cassandra/config/TestConfig.java b/src/test/java/org/springframework/data/cassandra/test/unit/config/TestConfig.java similarity index 93% rename from src/test/java/org/springframework/data/cassandra/config/TestConfig.java rename to src/test/java/org/springframework/data/cassandra/test/unit/config/TestConfig.java index 12ee8f2c7..e12c4a76b 100644 --- a/src/test/java/org/springframework/data/cassandra/config/TestConfig.java +++ b/src/test/java/org/springframework/data/cassandra/test/unit/config/TestConfig.java @@ -1,10 +1,11 @@ -package org.springframework.data.cassandra.config; +package org.springframework.data.cassandra.test.unit.config; import org.springframework.cassandra.core.CassandraOperations; import org.springframework.cassandra.core.CassandraTemplate; import org.springframework.cassandra.core.SessionFactoryBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.data.cassandra.config.AbstractCassandraConfiguration; import org.springframework.data.cassandra.core.CassandraDataOperations; import org.springframework.data.cassandra.core.CassandraDataTemplate; import org.springframework.data.cassandra.core.CassandraKeyspaceFactoryBean; diff --git a/src/test/java/org/springframework/data/cassandra/core/CassandraExceptionTranslatorTest.java b/src/test/java/org/springframework/data/cassandra/test/unit/core/CassandraExceptionTranslatorTest.java similarity index 98% rename from src/test/java/org/springframework/data/cassandra/core/CassandraExceptionTranslatorTest.java rename to src/test/java/org/springframework/data/cassandra/test/unit/core/CassandraExceptionTranslatorTest.java index 931724cb5..f08ae9ab7 100644 --- a/src/test/java/org/springframework/data/cassandra/core/CassandraExceptionTranslatorTest.java +++ b/src/test/java/org/springframework/data/cassandra/test/unit/core/CassandraExceptionTranslatorTest.java @@ -1,4 +1,4 @@ -package org.springframework.data.cassandra.core; +package org.springframework.data.cassandra.test.unit.core; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntityUnitTests.java b/src/test/java/org/springframework/data/cassandra/test/unit/mapping/BasicCassandraPersistentEntityUnitTests.java similarity index 94% rename from src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntityUnitTests.java rename to src/test/java/org/springframework/data/cassandra/test/unit/mapping/BasicCassandraPersistentEntityUnitTests.java index f23c53005..1abdc7aab 100644 --- a/src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntityUnitTests.java +++ b/src/test/java/org/springframework/data/cassandra/test/unit/mapping/BasicCassandraPersistentEntityUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.test.unit.mapping; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -32,6 +32,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.springframework.context.ApplicationContext; +import org.springframework.data.cassandra.mapping.BasicCassandraPersistentEntity; +import org.springframework.data.cassandra.mapping.Table; import org.springframework.data.util.ClassTypeInformation; /** diff --git a/src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentPropertyUnitTests.java b/src/test/java/org/springframework/data/cassandra/test/unit/mapping/BasicCassandraPersistentPropertyUnitTests.java similarity index 86% rename from src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentPropertyUnitTests.java rename to src/test/java/org/springframework/data/cassandra/test/unit/mapping/BasicCassandraPersistentPropertyUnitTests.java index 71e247744..a67d3333d 100644 --- a/src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentPropertyUnitTests.java +++ b/src/test/java/org/springframework/data/cassandra/test/unit/mapping/BasicCassandraPersistentPropertyUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.test.unit.mapping; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -31,6 +31,12 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.springframework.data.annotation.Id; +import org.springframework.data.cassandra.mapping.BasicCassandraPersistentEntity; +import org.springframework.data.cassandra.mapping.BasicCassandraPersistentProperty; +import org.springframework.data.cassandra.mapping.CassandraPersistentEntity; +import org.springframework.data.cassandra.mapping.CassandraPersistentProperty; +import org.springframework.data.cassandra.mapping.Column; +import org.springframework.data.cassandra.mapping.ColumnId; import org.springframework.data.mapping.model.SimpleTypeHolder; import org.springframework.data.util.ClassTypeInformation; import org.springframework.util.ReflectionUtils; diff --git a/src/test/java/org/springframework/data/cassandra/table/Book.java b/src/test/java/org/springframework/data/cassandra/test/unit/table/Book.java similarity index 96% rename from src/test/java/org/springframework/data/cassandra/table/Book.java rename to src/test/java/org/springframework/data/cassandra/test/unit/table/Book.java index 7e88cff3d..c058ab5cb 100644 --- a/src/test/java/org/springframework/data/cassandra/table/Book.java +++ b/src/test/java/org/springframework/data/cassandra/test/unit/table/Book.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.table; +package org.springframework.data.cassandra.test.unit.table; import org.springframework.data.cassandra.mapping.RowId; import org.springframework.data.cassandra.mapping.Table; diff --git a/src/test/java/org/springframework/data/cassandra/table/Comment.java b/src/test/java/org/springframework/data/cassandra/test/unit/table/Comment.java similarity index 97% rename from src/test/java/org/springframework/data/cassandra/table/Comment.java rename to src/test/java/org/springframework/data/cassandra/test/unit/table/Comment.java index 3a5356ddf..6d8ce37f3 100644 --- a/src/test/java/org/springframework/data/cassandra/table/Comment.java +++ b/src/test/java/org/springframework/data/cassandra/test/unit/table/Comment.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.table; +package org.springframework.data.cassandra.test.unit.table; import java.util.Date; import java.util.Set; diff --git a/src/test/java/org/springframework/data/cassandra/table/LogEntry.java b/src/test/java/org/springframework/data/cassandra/test/unit/table/LogEntry.java similarity index 97% rename from src/test/java/org/springframework/data/cassandra/table/LogEntry.java rename to src/test/java/org/springframework/data/cassandra/test/unit/table/LogEntry.java index 1b8ac1c79..0927a4842 100644 --- a/src/test/java/org/springframework/data/cassandra/table/LogEntry.java +++ b/src/test/java/org/springframework/data/cassandra/test/unit/table/LogEntry.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.table; +package org.springframework.data.cassandra.test.unit.table; import java.util.Date; diff --git a/src/test/java/org/springframework/data/cassandra/table/Notification.java b/src/test/java/org/springframework/data/cassandra/test/unit/table/Notification.java similarity index 97% rename from src/test/java/org/springframework/data/cassandra/table/Notification.java rename to src/test/java/org/springframework/data/cassandra/test/unit/table/Notification.java index 989c569bf..8edafd91c 100644 --- a/src/test/java/org/springframework/data/cassandra/table/Notification.java +++ b/src/test/java/org/springframework/data/cassandra/test/unit/table/Notification.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.table; +package org.springframework.data.cassandra.test.unit.table; import java.util.Date; diff --git a/src/test/java/org/springframework/data/cassandra/table/Post.java b/src/test/java/org/springframework/data/cassandra/test/unit/table/Post.java similarity index 97% rename from src/test/java/org/springframework/data/cassandra/table/Post.java rename to src/test/java/org/springframework/data/cassandra/test/unit/table/Post.java index eee8bcdc6..cc22437ac 100644 --- a/src/test/java/org/springframework/data/cassandra/table/Post.java +++ b/src/test/java/org/springframework/data/cassandra/test/unit/table/Post.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.table; +package org.springframework.data.cassandra.test.unit.table; import java.util.Date; import java.util.Map; diff --git a/src/test/java/org/springframework/data/cassandra/table/Timeline.java b/src/test/java/org/springframework/data/cassandra/test/unit/table/Timeline.java similarity index 97% rename from src/test/java/org/springframework/data/cassandra/table/Timeline.java rename to src/test/java/org/springframework/data/cassandra/test/unit/table/Timeline.java index 6aec5dfef..c7e84bfcb 100644 --- a/src/test/java/org/springframework/data/cassandra/table/Timeline.java +++ b/src/test/java/org/springframework/data/cassandra/test/unit/table/Timeline.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.table; +package org.springframework.data.cassandra.test.unit.table; import java.util.Date; diff --git a/src/test/java/org/springframework/data/cassandra/table/User.java b/src/test/java/org/springframework/data/cassandra/test/unit/table/User.java similarity index 98% rename from src/test/java/org/springframework/data/cassandra/table/User.java rename to src/test/java/org/springframework/data/cassandra/test/unit/table/User.java index b313d0a40..7aa497101 100644 --- a/src/test/java/org/springframework/data/cassandra/table/User.java +++ b/src/test/java/org/springframework/data/cassandra/test/unit/table/User.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.table; +package org.springframework.data.cassandra.test.unit.table; import java.util.Set; diff --git a/src/test/java/org/springframework/data/cassandra/table/UserAlter.java b/src/test/java/org/springframework/data/cassandra/test/unit/table/UserAlter.java similarity index 98% rename from src/test/java/org/springframework/data/cassandra/table/UserAlter.java rename to src/test/java/org/springframework/data/cassandra/test/unit/table/UserAlter.java index 499014619..3748575c4 100644 --- a/src/test/java/org/springframework/data/cassandra/table/UserAlter.java +++ b/src/test/java/org/springframework/data/cassandra/test/unit/table/UserAlter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.table; +package org.springframework.data.cassandra.test.unit.table; import java.util.Set; diff --git a/src/test/java/org/springframework/data/cassandra/template/CassandraAdminTest.java b/src/test/java/org/springframework/data/cassandra/test/unit/template/CassandraAdminTest.java similarity index 95% rename from src/test/java/org/springframework/data/cassandra/template/CassandraAdminTest.java rename to src/test/java/org/springframework/data/cassandra/test/unit/template/CassandraAdminTest.java index cf6242e14..ce4de0761 100644 --- a/src/test/java/org/springframework/data/cassandra/template/CassandraAdminTest.java +++ b/src/test/java/org/springframework/data/cassandra/test/unit/template/CassandraAdminTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.template; +package org.springframework.data.cassandra.test.unit.template; import java.io.IOException; @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cassandra.core.CassandraOperations; import org.springframework.context.ApplicationContext; -import org.springframework.data.cassandra.config.TestConfig; +import org.springframework.data.cassandra.test.unit.config.TestConfig; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; diff --git a/src/test/java/org/springframework/data/cassandra/template/CassandraDataOperationsTest.java b/src/test/java/org/springframework/data/cassandra/test/unit/template/CassandraDataOperationsTest.java similarity index 99% rename from src/test/java/org/springframework/data/cassandra/template/CassandraDataOperationsTest.java rename to src/test/java/org/springframework/data/cassandra/test/unit/template/CassandraDataOperationsTest.java index 6e0467ffe..377542b46 100644 --- a/src/test/java/org/springframework/data/cassandra/template/CassandraDataOperationsTest.java +++ b/src/test/java/org/springframework/data/cassandra/test/unit/template/CassandraDataOperationsTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.template; +package org.springframework.data.cassandra.test.unit.template; import java.io.IOException; import java.util.ArrayList; @@ -40,12 +40,12 @@ 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.CassandraDataOperations; import org.springframework.data.cassandra.core.ConsistencyLevel; import org.springframework.data.cassandra.core.QueryOptions; import org.springframework.data.cassandra.core.RetryPolicy; -import org.springframework.data.cassandra.table.Book; +import org.springframework.data.cassandra.test.unit.config.TestConfig; +import org.springframework.data.cassandra.test.unit.table.Book; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; diff --git a/src/test/java/org/springframework/data/cassandra/template/CassandraOperationsTest.java b/src/test/java/org/springframework/data/cassandra/test/unit/template/CassandraOperationsTest.java similarity index 97% rename from src/test/java/org/springframework/data/cassandra/template/CassandraOperationsTest.java rename to src/test/java/org/springframework/data/cassandra/test/unit/template/CassandraOperationsTest.java index c71168c1b..c8ef9088d 100644 --- a/src/test/java/org/springframework/data/cassandra/template/CassandraOperationsTest.java +++ b/src/test/java/org/springframework/data/cassandra/test/unit/template/CassandraOperationsTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.template; +package org.springframework.data.cassandra.test.unit.template; import static org.junit.Assert.assertNotNull; @@ -44,7 +44,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cassandra.core.CassandraOperations; import org.springframework.cassandra.core.HostMapper; import org.springframework.cassandra.core.RingMember; -import org.springframework.data.cassandra.config.TestConfig; +import org.springframework.data.cassandra.test.unit.config.TestConfig; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; diff --git a/src/test/resources/org/springframework/data/cassandra/config/CassandraNamespaceTests-context.xml b/src/test/resources/org/springframework/data/cassandra/test/unit/config/CassandraNamespaceTests-context.xml similarity index 93% rename from src/test/resources/org/springframework/data/cassandra/config/CassandraNamespaceTests-context.xml rename to src/test/resources/org/springframework/data/cassandra/test/unit/config/CassandraNamespaceTests-context.xml index 47b10b527..925c0a854 100644 --- a/src/test/resources/org/springframework/data/cassandra/config/CassandraNamespaceTests-context.xml +++ b/src/test/resources/org/springframework/data/cassandra/test/unit/config/CassandraNamespaceTests-context.xml @@ -37,12 +37,12 @@ - + - - - + entity="org.springframework.data.cassandra.test.unit.table.Notification" /> + + + diff --git a/src/test/resources/org/springframework/data/cassandra/config/cassandra.properties b/src/test/resources/org/springframework/data/cassandra/test/unit/config/cassandra.properties similarity index 100% rename from src/test/resources/org/springframework/data/cassandra/config/cassandra.properties rename to src/test/resources/org/springframework/data/cassandra/test/unit/config/cassandra.properties