DATACASS-413 - Polishing.

Move test classes from o.s.d.c.t.integration to o.s.d.c.convert.

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

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;

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;
 

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;

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;