diff --git a/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheManagerTest.java b/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheManagerTests.java similarity index 98% rename from src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheManagerTest.java rename to src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheManagerTests.java index fef50835..9110aa5b 100644 --- a/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheManagerTest.java +++ b/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheManagerTests.java @@ -41,7 +41,7 @@ import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestApplicationConfig.class) @TestExecutionListeners(BucketCreationListener.class) -public class CouchbaseCacheManagerTest { +public class CouchbaseCacheManagerTests { /** * Contains a reference to the actual CouchbaseClient. diff --git a/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheTest.java b/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheTests.java similarity index 98% rename from src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheTest.java rename to src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheTests.java index 55835848..8f54effa 100644 --- a/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheTest.java +++ b/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheTests.java @@ -41,7 +41,7 @@ import static org.junit.Assert.*; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestApplicationConfig.class) @TestExecutionListeners(BucketCreationListener.class) -public class CouchbaseCacheTest { +public class CouchbaseCacheTests { /** * Contains a reference to the actual CouchbaseClient. diff --git a/src/test/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfigurationTest.java b/src/test/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfigurationTests.java similarity index 98% rename from src/test/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfigurationTest.java rename to src/test/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfigurationTests.java index d7ae1e3a..d0957025 100644 --- a/src/test/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfigurationTest.java +++ b/src/test/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfigurationTests.java @@ -43,7 +43,7 @@ import static org.junit.Assert.assertTrue; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestApplicationConfig.class) @TestExecutionListeners(BucketCreationListener.class) -public class AbstractCouchbaseConfigurationTest { +public class AbstractCouchbaseConfigurationTests { /** * Contains a reference to the actual CouchbaseClient. diff --git a/src/test/java/org/springframework/data/couchbase/config/CouchbaseParserIntegrationTest.java b/src/test/java/org/springframework/data/couchbase/config/CouchbaseParserIntegrationTests.java similarity index 97% rename from src/test/java/org/springframework/data/couchbase/config/CouchbaseParserIntegrationTest.java rename to src/test/java/org/springframework/data/couchbase/config/CouchbaseParserIntegrationTests.java index c5d0f974..08c65b1d 100644 --- a/src/test/java/org/springframework/data/couchbase/config/CouchbaseParserIntegrationTest.java +++ b/src/test/java/org/springframework/data/couchbase/config/CouchbaseParserIntegrationTests.java @@ -29,7 +29,7 @@ import static org.junit.Assert.assertEquals; /** * @author Michael Nitschinger */ -public class CouchbaseParserIntegrationTest { +public class CouchbaseParserIntegrationTests { DefaultListableBeanFactory factory; BeanDefinitionReader reader; diff --git a/src/test/java/org/springframework/data/couchbase/config/CouchbaseTemplateParserIntegrationTest.java b/src/test/java/org/springframework/data/couchbase/config/CouchbaseTemplateParserIntegrationTests.java similarity index 96% rename from src/test/java/org/springframework/data/couchbase/config/CouchbaseTemplateParserIntegrationTest.java rename to src/test/java/org/springframework/data/couchbase/config/CouchbaseTemplateParserIntegrationTests.java index f83eae39..0b15e199 100644 --- a/src/test/java/org/springframework/data/couchbase/config/CouchbaseTemplateParserIntegrationTest.java +++ b/src/test/java/org/springframework/data/couchbase/config/CouchbaseTemplateParserIntegrationTests.java @@ -29,7 +29,7 @@ import static org.junit.Assert.assertEquals; /** * @author Michael Nitschinger */ -public class CouchbaseTemplateParserIntegrationTest { +public class CouchbaseTemplateParserIntegrationTests { DefaultListableBeanFactory factory; BeanDefinitionReader reader; diff --git a/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateTest.java b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateTests.java similarity index 99% rename from src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateTest.java rename to src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateTests.java index b5589300..bbebda99 100644 --- a/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateTest.java +++ b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateTests.java @@ -43,7 +43,7 @@ import static org.junit.Assert.*; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestApplicationConfig.class) @TestExecutionListeners({BucketCreationListener.class, CouchbaseTemplateViewListener.class}) -public class CouchbaseTemplateTest { +public class CouchbaseTemplateTests { private CouchbaseClient client; diff --git a/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentPropertyTest.java b/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentPropertyTests.java similarity index 98% rename from src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentPropertyTest.java rename to src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentPropertyTests.java index 7184ad1a..70e97eb5 100644 --- a/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentPropertyTest.java +++ b/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentPropertyTests.java @@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals; * * @author Michael Nitschinger */ -public class BasicCouchbasePersistentPropertyTest { +public class BasicCouchbasePersistentPropertyTests { /** * Holds the entity to test against (contains the properties). diff --git a/src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTest.java b/src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java similarity index 99% rename from src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTest.java rename to src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java index 31eae4f6..99c4e415 100644 --- a/src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTest.java +++ b/src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java @@ -35,7 +35,7 @@ import static org.junit.Assert.*; */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestApplicationConfig.class) -public class MappingCouchbaseConverterTest { +public class MappingCouchbaseConverterTests { @Autowired private MappingCouchbaseConverter converter; diff --git a/src/test/java/org/springframework/data/couchbase/monitor/ClientInfoTest.java b/src/test/java/org/springframework/data/couchbase/monitor/ClientInfoTests.java similarity index 98% rename from src/test/java/org/springframework/data/couchbase/monitor/ClientInfoTest.java rename to src/test/java/org/springframework/data/couchbase/monitor/ClientInfoTests.java index 75e406b4..6c7c8a8e 100644 --- a/src/test/java/org/springframework/data/couchbase/monitor/ClientInfoTest.java +++ b/src/test/java/org/springframework/data/couchbase/monitor/ClientInfoTests.java @@ -39,7 +39,7 @@ import static org.junit.Assert.assertFalse; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestApplicationConfig.class) @TestExecutionListeners(BucketCreationListener.class) -public class ClientInfoTest { +public class ClientInfoTests { /** * Contains a reference to the actual CouchbaseClient. diff --git a/src/test/java/org/springframework/data/couchbase/monitor/ClusterInfoTest.java b/src/test/java/org/springframework/data/couchbase/monitor/ClusterInfoTests.java similarity index 98% rename from src/test/java/org/springframework/data/couchbase/monitor/ClusterInfoTest.java rename to src/test/java/org/springframework/data/couchbase/monitor/ClusterInfoTests.java index 9e7489b5..109640db 100644 --- a/src/test/java/org/springframework/data/couchbase/monitor/ClusterInfoTest.java +++ b/src/test/java/org/springframework/data/couchbase/monitor/ClusterInfoTests.java @@ -38,7 +38,7 @@ import static junit.framework.Assert.assertTrue; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestApplicationConfig.class) @TestExecutionListeners(BucketCreationListener.class) -public class ClusterInfoTest { +public class ClusterInfoTests { /** * Contains a reference to the actual CouchbaseClient. diff --git a/src/test/java/org/springframework/data/couchbase/repository/SimpleCouchbaseRepositoryTest.java b/src/test/java/org/springframework/data/couchbase/repository/SimpleCouchbaseRepositoryTests.java similarity index 98% rename from src/test/java/org/springframework/data/couchbase/repository/SimpleCouchbaseRepositoryTest.java rename to src/test/java/org/springframework/data/couchbase/repository/SimpleCouchbaseRepositoryTests.java index 2c37852a..c2b3831c 100644 --- a/src/test/java/org/springframework/data/couchbase/repository/SimpleCouchbaseRepositoryTest.java +++ b/src/test/java/org/springframework/data/couchbase/repository/SimpleCouchbaseRepositoryTests.java @@ -43,7 +43,7 @@ import static org.junit.Assert.*; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestApplicationConfig.class) @TestExecutionListeners({BucketCreationListener.class, CouchbaseRepositoryViewListener.class}) -public class SimpleCouchbaseRepositoryTest { +public class SimpleCouchbaseRepositoryTests { private CouchbaseClient client; diff --git a/src/test/java/org/springframework/data/couchbase/util/BucketManager.java b/src/test/java/org/springframework/data/couchbase/util/BucketManager.java index 3f94fd4e..4f0175ef 100644 --- a/src/test/java/org/springframework/data/couchbase/util/BucketManager.java +++ b/src/test/java/org/springframework/data/couchbase/util/BucketManager.java @@ -36,8 +36,8 @@ import java.util.Map.Entry; */ public class BucketManager extends SpyObject { - private static final long TIMEOUT = 120000; - private static final long SLEEP_TIME = 2000; + private static final long TIMEOUT = 2000; + private static final long SLEEP_TIME = 1000; private final ClusterManager manager; diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml new file mode 100644 index 00000000..6b4d4d87 --- /dev/null +++ b/src/test/resources/logback.xml @@ -0,0 +1,18 @@ + + + + + + %d %5p %40.40c:%4L - %m%n + + + + + + + + + + \ No newline at end of file