From 77971cf281232f0f7108de4be5dbd035a89861ad Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 14 Mar 2017 18:12:36 +0100 Subject: [PATCH] DATACASS-413 - Polishing. Move test classes from o.s.d.c.t.integration to o.s.d.c.convert. --- .../CassandraTypeMappingIntegrationTest.java | 7 ++++--- .../mapping/types => convert}/CounterEntity.java | 2 +- .../CustomConversionIntegrationTests.java} | 12 +++++------- .../mapping/types => convert}/TimeEntity.java | 2 +- .../data/cassandra/domain/AllPossibleTypes.java | 2 +- 5 files changed, 12 insertions(+), 13 deletions(-) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{test/integration/mapping/types => convert}/CassandraTypeMappingIntegrationTest.java (98%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{test/integration/mapping/types => convert}/CounterEntity.java (94%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{test/integration/mapping/customconversion/CustomConversionTests.java => convert/CustomConversionIntegrationTests.java} (94%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{test/integration/mapping/types => convert}/TimeEntity.java (94%) diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/types/CassandraTypeMappingIntegrationTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/CassandraTypeMappingIntegrationTest.java similarity index 98% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/types/CassandraTypeMappingIntegrationTest.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/CassandraTypeMappingIntegrationTest.java index 008ceb3cd..8973416db 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/types/CassandraTypeMappingIntegrationTest.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/CassandraTypeMappingIntegrationTest.java @@ -10,10 +10,10 @@ * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * see the License for the specific language governing permissions and + * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.mapping.types; +package org.springframework.data.cassandra.convert; import static org.assertj.core.api.Assertions.*; @@ -28,6 +28,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.UUID; +import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -399,7 +400,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(entity.getId(), AllPossibleTypes.class); - assertThat(loaded.getAnEnum()).isEqualTo(entity.getAnEnum()); + Assertions.assertThat(loaded.getAnEnum()).isEqualTo(entity.getAnEnum()); } @Test // DATACASS-280 diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/types/CounterEntity.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/CounterEntity.java similarity index 94% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/types/CounterEntity.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/CounterEntity.java index 9bbcae339..47bbcdecd 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/types/CounterEntity.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/CounterEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.mapping.types; +package org.springframework.data.cassandra.convert; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/customconversion/CustomConversionTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/CustomConversionIntegrationTests.java similarity index 94% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/customconversion/CustomConversionTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/CustomConversionIntegrationTests.java index 605cbe31c..435f071f5 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/customconversion/CustomConversionTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/CustomConversionIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.mapping.customconversion; +package org.springframework.data.cassandra.convert; import static org.assertj.core.api.Assertions.*; @@ -34,8 +34,6 @@ import org.junit.Test; import org.springframework.cassandra.test.integration.AbstractKeyspaceCreatingIntegrationTest; import org.springframework.core.convert.converter.Converter; import org.springframework.data.annotation.Id; -import org.springframework.data.cassandra.convert.CustomConversions; -import org.springframework.data.cassandra.convert.MappingCassandraConverter; import org.springframework.data.cassandra.core.CassandraTemplate; import org.springframework.data.cassandra.mapping.BasicCassandraMappingContext; import org.springframework.data.cassandra.mapping.Table; @@ -46,12 +44,12 @@ import com.datastax.driver.core.Row; import com.datastax.driver.core.querybuilder.QueryBuilder; /** - * Test suite for applying {@link CustomConversions} to - * {@link org.springframework.data.cassandra.mapping.BasicCassandraMappingContext}. - * + * Test suite for applying {@link CustomConversions} to {@link MappingCassandraConverter} and + * {@link BasicCassandraMappingContext}. + * * @author Mark Paluch */ -public class CustomConversionTests extends AbstractKeyspaceCreatingIntegrationTest { +public class CustomConversionIntegrationTests extends AbstractKeyspaceCreatingIntegrationTest { CassandraTemplate cassandraOperations; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/types/TimeEntity.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/TimeEntity.java similarity index 94% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/types/TimeEntity.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/TimeEntity.java index 627d52758..8583d6200 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/types/TimeEntity.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/TimeEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.mapping.types; +package org.springframework.data.cassandra.convert; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/AllPossibleTypes.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/AllPossibleTypes.java index e8f2f6149..79891d617 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/AllPossibleTypes.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/AllPossibleTypes.java @@ -30,10 +30,10 @@ import java.util.Map; import java.util.Set; import java.util.UUID; +import org.springframework.data.cassandra.convert.CassandraTypeMappingIntegrationTest.Condition; import org.springframework.data.cassandra.mapping.CassandraType; import org.springframework.data.cassandra.mapping.PrimaryKey; import org.springframework.data.cassandra.mapping.Table; -import org.springframework.data.cassandra.test.integration.mapping.types.CassandraTypeMappingIntegrationTest.Condition; import com.datastax.driver.core.DataType.Name;