From 2230370101594955ebf1a4c1b2837e00bdf4e28f Mon Sep 17 00:00:00 2001 From: Matthew Adams Date: Wed, 20 Nov 2013 16:30:39 -0600 Subject: [PATCH] separated integration tests from unit tests --- .../support}/CassandraExceptionTranslatorTest.java | 2 +- .../config/CassandraNamespaceTests.java | 2 +- .../test/{unit => integration}/config/DriverTests.java | 2 +- .../test/{unit => integration}/config/TestConfig.java | 2 +- ...asicCassandraPersistentEntityIntegrationTests.java} | 6 +++--- ...icCassandraPersistentPropertyIntegrationTests.java} | 6 +++--- .../test/{unit => integration}/table/Book.java | 2 +- .../test/{unit => integration}/table/Comment.java | 2 +- .../test/{unit => integration}/table/LogEntry.java | 2 +- .../test/{unit => integration}/table/Notification.java | 2 +- .../test/{unit => integration}/table/Post.java | 2 +- .../test/{unit => integration}/table/Timeline.java | 2 +- .../test/{unit => integration}/table/User.java | 2 +- .../test/{unit => integration}/table/UserAlter.java | 2 +- .../template/CassandraAdminTest.java | 4 ++-- .../template/CassandraDataOperationsTest.java | 6 +++--- .../template/CassandraOperationsTest.java | 4 ++-- .../config/CassandraNamespaceTests-context.xml | 10 +++++----- .../{unit => integration}/config/cassandra.properties | 0 19 files changed, 30 insertions(+), 30 deletions(-) rename src/test/java/org/springframework/{data/cassandra/test/unit/core => cassandra/test/unit/support}/CassandraExceptionTranslatorTest.java (98%) rename src/test/java/org/springframework/data/cassandra/test/{unit => integration}/config/CassandraNamespaceTests.java (96%) rename src/test/java/org/springframework/data/cassandra/test/{unit => integration}/config/DriverTests.java (94%) rename src/test/java/org/springframework/data/cassandra/test/{unit => integration}/config/TestConfig.java (97%) rename src/test/java/org/springframework/data/cassandra/test/{unit/mapping/BasicCassandraPersistentEntityUnitTests.java => integration/mapping/BasicCassandraPersistentEntityIntegrationTests.java} (94%) rename src/test/java/org/springframework/data/cassandra/test/{unit/mapping/BasicCassandraPersistentPropertyUnitTests.java => integration/mapping/BasicCassandraPersistentPropertyIntegrationTests.java} (94%) rename src/test/java/org/springframework/data/cassandra/test/{unit => integration}/table/Book.java (96%) rename src/test/java/org/springframework/data/cassandra/test/{unit => integration}/table/Comment.java (97%) rename src/test/java/org/springframework/data/cassandra/test/{unit => integration}/table/LogEntry.java (96%) rename src/test/java/org/springframework/data/cassandra/test/{unit => integration}/table/Notification.java (97%) rename src/test/java/org/springframework/data/cassandra/test/{unit => integration}/table/Post.java (97%) rename src/test/java/org/springframework/data/cassandra/test/{unit => integration}/table/Timeline.java (96%) rename src/test/java/org/springframework/data/cassandra/test/{unit => integration}/table/User.java (97%) rename src/test/java/org/springframework/data/cassandra/test/{unit => integration}/table/UserAlter.java (97%) rename src/test/java/org/springframework/data/cassandra/test/{unit => integration}/template/CassandraAdminTest.java (95%) rename src/test/java/org/springframework/data/cassandra/test/{unit => integration}/template/CassandraDataOperationsTest.java (99%) rename src/test/java/org/springframework/data/cassandra/test/{unit => integration}/template/CassandraOperationsTest.java (96%) rename src/test/resources/org/springframework/data/cassandra/test/{unit => integration}/config/CassandraNamespaceTests-context.xml (92%) rename src/test/resources/org/springframework/data/cassandra/test/{unit => integration}/config/cassandra.properties (100%) diff --git a/src/test/java/org/springframework/data/cassandra/test/unit/core/CassandraExceptionTranslatorTest.java b/src/test/java/org/springframework/cassandra/test/unit/support/CassandraExceptionTranslatorTest.java similarity index 98% rename from src/test/java/org/springframework/data/cassandra/test/unit/core/CassandraExceptionTranslatorTest.java rename to src/test/java/org/springframework/cassandra/test/unit/support/CassandraExceptionTranslatorTest.java index f08ae9ab7..255947c18 100644 --- a/src/test/java/org/springframework/data/cassandra/test/unit/core/CassandraExceptionTranslatorTest.java +++ b/src/test/java/org/springframework/cassandra/test/unit/support/CassandraExceptionTranslatorTest.java @@ -1,4 +1,4 @@ -package org.springframework.data.cassandra.test.unit.core; +package org.springframework.cassandra.test.unit.support; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/src/test/java/org/springframework/data/cassandra/test/unit/config/CassandraNamespaceTests.java b/src/test/java/org/springframework/data/cassandra/test/integration/config/CassandraNamespaceTests.java similarity index 96% rename from src/test/java/org/springframework/data/cassandra/test/unit/config/CassandraNamespaceTests.java rename to src/test/java/org/springframework/data/cassandra/test/integration/config/CassandraNamespaceTests.java index 25d18a79c..e5fa75a91 100644 --- a/src/test/java/org/springframework/data/cassandra/test/unit/config/CassandraNamespaceTests.java +++ b/src/test/java/org/springframework/data/cassandra/test/integration/config/CassandraNamespaceTests.java @@ -1,4 +1,4 @@ -package org.springframework.data.cassandra.test.unit.config; +package org.springframework.data.cassandra.test.integration.config; import java.io.IOException; diff --git a/src/test/java/org/springframework/data/cassandra/test/unit/config/DriverTests.java b/src/test/java/org/springframework/data/cassandra/test/integration/config/DriverTests.java similarity index 94% rename from src/test/java/org/springframework/data/cassandra/test/unit/config/DriverTests.java rename to src/test/java/org/springframework/data/cassandra/test/integration/config/DriverTests.java index c34c59feb..7ccbdf563 100644 --- a/src/test/java/org/springframework/data/cassandra/test/unit/config/DriverTests.java +++ b/src/test/java/org/springframework/data/cassandra/test/integration/config/DriverTests.java @@ -1,4 +1,4 @@ -package org.springframework.data.cassandra.test.unit.config; +package org.springframework.data.cassandra.test.integration.config; import java.io.IOException; diff --git a/src/test/java/org/springframework/data/cassandra/test/unit/config/TestConfig.java b/src/test/java/org/springframework/data/cassandra/test/integration/config/TestConfig.java similarity index 97% rename from src/test/java/org/springframework/data/cassandra/test/unit/config/TestConfig.java rename to src/test/java/org/springframework/data/cassandra/test/integration/config/TestConfig.java index e12c4a76b..c7302288a 100644 --- a/src/test/java/org/springframework/data/cassandra/test/unit/config/TestConfig.java +++ b/src/test/java/org/springframework/data/cassandra/test/integration/config/TestConfig.java @@ -1,4 +1,4 @@ -package org.springframework.data.cassandra.test.unit.config; +package org.springframework.data.cassandra.test.integration.config; import org.springframework.cassandra.core.CassandraOperations; import org.springframework.cassandra.core.CassandraTemplate; diff --git a/src/test/java/org/springframework/data/cassandra/test/unit/mapping/BasicCassandraPersistentEntityUnitTests.java b/src/test/java/org/springframework/data/cassandra/test/integration/mapping/BasicCassandraPersistentEntityIntegrationTests.java similarity index 94% rename from src/test/java/org/springframework/data/cassandra/test/unit/mapping/BasicCassandraPersistentEntityUnitTests.java rename to src/test/java/org/springframework/data/cassandra/test/integration/mapping/BasicCassandraPersistentEntityIntegrationTests.java index 1abdc7aab..8fbd88315 100644 --- a/src/test/java/org/springframework/data/cassandra/test/unit/mapping/BasicCassandraPersistentEntityUnitTests.java +++ b/src/test/java/org/springframework/data/cassandra/test/integration/mapping/BasicCassandraPersistentEntityIntegrationTests.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.unit.mapping; +package org.springframework.data.cassandra.test.integration.mapping; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -37,12 +37,12 @@ import org.springframework.data.cassandra.mapping.Table; import org.springframework.data.util.ClassTypeInformation; /** - * Unit tests for {@link BasicCassandraPersistentEntity}. + * Integration tests for {@link BasicCassandraPersistentEntity}. * * @author Alex Shvid */ @RunWith(MockitoJUnitRunner.class) -public class BasicCassandraPersistentEntityUnitTests { +public class BasicCassandraPersistentEntityIntegrationTests { @Mock ApplicationContext context; diff --git a/src/test/java/org/springframework/data/cassandra/test/unit/mapping/BasicCassandraPersistentPropertyUnitTests.java b/src/test/java/org/springframework/data/cassandra/test/integration/mapping/BasicCassandraPersistentPropertyIntegrationTests.java similarity index 94% rename from src/test/java/org/springframework/data/cassandra/test/unit/mapping/BasicCassandraPersistentPropertyUnitTests.java rename to src/test/java/org/springframework/data/cassandra/test/integration/mapping/BasicCassandraPersistentPropertyIntegrationTests.java index a67d3333d..dcc25c126 100644 --- a/src/test/java/org/springframework/data/cassandra/test/unit/mapping/BasicCassandraPersistentPropertyUnitTests.java +++ b/src/test/java/org/springframework/data/cassandra/test/integration/mapping/BasicCassandraPersistentPropertyIntegrationTests.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.unit.mapping; +package org.springframework.data.cassandra.test.integration.mapping; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -42,11 +42,11 @@ import org.springframework.data.util.ClassTypeInformation; import org.springframework.util.ReflectionUtils; /** - * Unit test for {@link BasicCassandraPersistentProperty}. + * Integration test for {@link BasicCassandraPersistentProperty}. * * @author Alex Shvid */ -public class BasicCassandraPersistentPropertyUnitTests { +public class BasicCassandraPersistentPropertyIntegrationTests { CassandraPersistentEntity entity; diff --git a/src/test/java/org/springframework/data/cassandra/test/unit/table/Book.java b/src/test/java/org/springframework/data/cassandra/test/integration/table/Book.java similarity index 96% rename from src/test/java/org/springframework/data/cassandra/test/unit/table/Book.java rename to src/test/java/org/springframework/data/cassandra/test/integration/table/Book.java index c058ab5cb..a3bb9d68d 100644 --- a/src/test/java/org/springframework/data/cassandra/test/unit/table/Book.java +++ b/src/test/java/org/springframework/data/cassandra/test/integration/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.test.unit.table; +package org.springframework.data.cassandra.test.integration.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/test/unit/table/Comment.java b/src/test/java/org/springframework/data/cassandra/test/integration/table/Comment.java similarity index 97% rename from src/test/java/org/springframework/data/cassandra/test/unit/table/Comment.java rename to src/test/java/org/springframework/data/cassandra/test/integration/table/Comment.java index 6d8ce37f3..ff0fd3f6b 100644 --- a/src/test/java/org/springframework/data/cassandra/test/unit/table/Comment.java +++ b/src/test/java/org/springframework/data/cassandra/test/integration/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.test.unit.table; +package org.springframework.data.cassandra.test.integration.table; import java.util.Date; import java.util.Set; diff --git a/src/test/java/org/springframework/data/cassandra/test/unit/table/LogEntry.java b/src/test/java/org/springframework/data/cassandra/test/integration/table/LogEntry.java similarity index 96% rename from src/test/java/org/springframework/data/cassandra/test/unit/table/LogEntry.java rename to src/test/java/org/springframework/data/cassandra/test/integration/table/LogEntry.java index 0927a4842..5797dec9f 100644 --- a/src/test/java/org/springframework/data/cassandra/test/unit/table/LogEntry.java +++ b/src/test/java/org/springframework/data/cassandra/test/integration/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.test.unit.table; +package org.springframework.data.cassandra.test.integration.table; import java.util.Date; diff --git a/src/test/java/org/springframework/data/cassandra/test/unit/table/Notification.java b/src/test/java/org/springframework/data/cassandra/test/integration/table/Notification.java similarity index 97% rename from src/test/java/org/springframework/data/cassandra/test/unit/table/Notification.java rename to src/test/java/org/springframework/data/cassandra/test/integration/table/Notification.java index 8edafd91c..6bde2543d 100644 --- a/src/test/java/org/springframework/data/cassandra/test/unit/table/Notification.java +++ b/src/test/java/org/springframework/data/cassandra/test/integration/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.test.unit.table; +package org.springframework.data.cassandra.test.integration.table; import java.util.Date; diff --git a/src/test/java/org/springframework/data/cassandra/test/unit/table/Post.java b/src/test/java/org/springframework/data/cassandra/test/integration/table/Post.java similarity index 97% rename from src/test/java/org/springframework/data/cassandra/test/unit/table/Post.java rename to src/test/java/org/springframework/data/cassandra/test/integration/table/Post.java index cc22437ac..ea3de9f3d 100644 --- a/src/test/java/org/springframework/data/cassandra/test/unit/table/Post.java +++ b/src/test/java/org/springframework/data/cassandra/test/integration/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.test.unit.table; +package org.springframework.data.cassandra.test.integration.table; import java.util.Date; import java.util.Map; diff --git a/src/test/java/org/springframework/data/cassandra/test/unit/table/Timeline.java b/src/test/java/org/springframework/data/cassandra/test/integration/table/Timeline.java similarity index 96% rename from src/test/java/org/springframework/data/cassandra/test/unit/table/Timeline.java rename to src/test/java/org/springframework/data/cassandra/test/integration/table/Timeline.java index c7e84bfcb..ce670b0c1 100644 --- a/src/test/java/org/springframework/data/cassandra/test/unit/table/Timeline.java +++ b/src/test/java/org/springframework/data/cassandra/test/integration/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.test.unit.table; +package org.springframework.data.cassandra.test.integration.table; import java.util.Date; diff --git a/src/test/java/org/springframework/data/cassandra/test/unit/table/User.java b/src/test/java/org/springframework/data/cassandra/test/integration/table/User.java similarity index 97% rename from src/test/java/org/springframework/data/cassandra/test/unit/table/User.java rename to src/test/java/org/springframework/data/cassandra/test/integration/table/User.java index 7aa497101..91349c4ac 100644 --- a/src/test/java/org/springframework/data/cassandra/test/unit/table/User.java +++ b/src/test/java/org/springframework/data/cassandra/test/integration/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.test.unit.table; +package org.springframework.data.cassandra.test.integration.table; import java.util.Set; diff --git a/src/test/java/org/springframework/data/cassandra/test/unit/table/UserAlter.java b/src/test/java/org/springframework/data/cassandra/test/integration/table/UserAlter.java similarity index 97% rename from src/test/java/org/springframework/data/cassandra/test/unit/table/UserAlter.java rename to src/test/java/org/springframework/data/cassandra/test/integration/table/UserAlter.java index 3748575c4..7baad7368 100644 --- a/src/test/java/org/springframework/data/cassandra/test/unit/table/UserAlter.java +++ b/src/test/java/org/springframework/data/cassandra/test/integration/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.test.unit.table; +package org.springframework.data.cassandra.test.integration.table; import java.util.Set; diff --git a/src/test/java/org/springframework/data/cassandra/test/unit/template/CassandraAdminTest.java b/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraAdminTest.java similarity index 95% rename from src/test/java/org/springframework/data/cassandra/test/unit/template/CassandraAdminTest.java rename to src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraAdminTest.java index ce4de0761..ff1b8f81e 100644 --- a/src/test/java/org/springframework/data/cassandra/test/unit/template/CassandraAdminTest.java +++ b/src/test/java/org/springframework/data/cassandra/test/integration/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.test.unit.template; +package org.springframework.data.cassandra.test.integration.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.test.unit.config.TestConfig; +import org.springframework.data.cassandra.test.integration.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/test/unit/template/CassandraDataOperationsTest.java b/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraDataOperationsTest.java similarity index 99% rename from src/test/java/org/springframework/data/cassandra/test/unit/template/CassandraDataOperationsTest.java rename to src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraDataOperationsTest.java index 377542b46..8034645ad 100644 --- a/src/test/java/org/springframework/data/cassandra/test/unit/template/CassandraDataOperationsTest.java +++ b/src/test/java/org/springframework/data/cassandra/test/integration/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.test.unit.template; +package org.springframework.data.cassandra.test.integration.template; import java.io.IOException; import java.util.ArrayList; @@ -44,8 +44,8 @@ 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.test.unit.config.TestConfig; -import org.springframework.data.cassandra.test.unit.table.Book; +import org.springframework.data.cassandra.test.integration.config.TestConfig; +import org.springframework.data.cassandra.test.integration.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/test/unit/template/CassandraOperationsTest.java b/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraOperationsTest.java similarity index 96% rename from src/test/java/org/springframework/data/cassandra/test/unit/template/CassandraOperationsTest.java rename to src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraOperationsTest.java index c8ef9088d..f3dd9b5cd 100644 --- a/src/test/java/org/springframework/data/cassandra/test/unit/template/CassandraOperationsTest.java +++ b/src/test/java/org/springframework/data/cassandra/test/integration/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.test.unit.template; +package org.springframework.data.cassandra.test.integration.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.test.unit.config.TestConfig; +import org.springframework.data.cassandra.test.integration.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/test/unit/config/CassandraNamespaceTests-context.xml b/src/test/resources/org/springframework/data/cassandra/test/integration/config/CassandraNamespaceTests-context.xml similarity index 92% rename from src/test/resources/org/springframework/data/cassandra/test/unit/config/CassandraNamespaceTests-context.xml rename to src/test/resources/org/springframework/data/cassandra/test/integration/config/CassandraNamespaceTests-context.xml index 925c0a854..4a603238c 100644 --- a/src/test/resources/org/springframework/data/cassandra/test/unit/config/CassandraNamespaceTests-context.xml +++ b/src/test/resources/org/springframework/data/cassandra/test/integration/config/CassandraNamespaceTests-context.xml @@ -37,12 +37,12 @@ - + - - - + entity="org.springframework.data.cassandra.test.integration.table.Notification" /> + + + diff --git a/src/test/resources/org/springframework/data/cassandra/test/unit/config/cassandra.properties b/src/test/resources/org/springframework/data/cassandra/test/integration/config/cassandra.properties similarity index 100% rename from src/test/resources/org/springframework/data/cassandra/test/unit/config/cassandra.properties rename to src/test/resources/org/springframework/data/cassandra/test/integration/config/cassandra.properties