From 9080c2dedeb7b82416555847825c55ebdee42ff7 Mon Sep 17 00:00:00 2001 From: David Nault Date: Mon, 20 May 2019 18:46:21 -0700 Subject: [PATCH] DATACOUCH-451 - Should be able to run integration tests and all unit tests This change enables running the integration tests with the command: mvn verify Update the integration tests so they compile and pass. Rename them according to Spring Data convention (*IntegrationTests.java) so they are executed by the failsafe plugin instead of the surefire plugin. Move them to same folder as unit tests according to Spring Data convention. Update the surefire plugin configuration to include unit tests in classes named `*Test` as well as `*Tests`. Prior to this change about half of the unit tests were being ignored. Integration test changes ======================== Use static factory methods for Sort and PageRequest instead of calling the constructors which are now private. Import EvaluationContextExtension from its new package. Remove reference to deprecated EvaluationContextExtensionSupport. Retry all calls to `getRepository` because otherwise they may fail due to concurrent index creation. Fix test `shouldDeriveViewParameters` to assume results are unordered. Fail fast if the `server.properties` resource is missing. Increase query and view timeouts; container is a big sluggish sometimes. --- pom.xml | 34 +++++++++++++++ .../couchbase/ContainerResourceRunner.java | 0 .../CouchbaseHttpPortListeningCheck.java | 0 .../data/couchbase/CouchbaseTestHelper.java | 43 +++++++++++++++++++ .../data/couchbase/CouchbaseWaitStrategy.java | 0 .../IntegrationTestApplicationConfig.java | 4 +- .../IntegrationTestCustomKeySettings.java | 0 .../IntegrationTestCustomTypeKeyConfig.java | 0 ...rationTestNoShutdownApplicationConfig.java | 0 ...ctiveIntegrationTestApplicationConfig.java | 0 .../data/couchbase/TestContainerResource.java | 9 ++-- ...aseDataConfigurationIntegrationTests.java} | 8 ++-- ...nmentNoShutdownProxyIntegrationTests.java} | 4 +- .../CouchbaseSingleEnvironmentParserTest.java | 17 ++++---- ...uchbaseTemplateParserIntegrationTests.java | 2 +- .../data/couchbase/core/AsyncUtils.java | 0 ...TemplateIdGenerationIntegrationTests.java} | 4 +- .../CouchbaseTemplateIntegrationTests.java} | 2 +- ...eTemplateKeySettingsIntegrationTests.java} | 4 +- .../core/CouchbaseTemplateQueryListener.java | 1 - .../RxCouchbaseTemplateQueryListener.java | 0 ...avaCouchbaseTemplateIntegrationTests.java} | 2 +- .../core/TypeKeyIntegrationTests.java} | 2 +- .../CustomConverterIntegrationTests.java} | 6 ++- .../data/couchbase/core/mapping/TestUUID.java | 0 .../core/mapping/TestUUIDRepository.java | 0 .../monitor/ClientInfoIntegrationTests.java} | 2 +- .../monitor/ClusterInfoIntegrationTests.java} | 2 +- ...ouchbaseIdGenerationIntegrationTests.java} | 2 +- ...chbaseRepositoryViewIntegrationTests.java} | 39 +++++++---------- .../CouchbaseRepositoryViewListener.java | 0 .../repository/CustomUserRepository.java | 0 .../DimensionalPartyRepository.java | 0 .../DimensionalQueryIntegrationTests.java} | 5 ++- .../data/couchbase/repository/Item.java | 0 .../couchbase/repository/ItemRepository.java | 0 ...lCouchbaseRepositoryIntegrationTests.java} | 25 ++++++----- .../N1qlCrudRepositoryIntegrationTests.java} | 9 ++-- .../N1qlPlaceholderIntegrationTests.java} | 5 ++- .../PageAndSliceIntegrationTests.java} | 9 ++-- .../data/couchbase/repository/Party.java | 0 .../repository/PartyPagingRepository.java | 0 .../repository/PartyPopulatorListener.java | 0 .../couchbase/repository/PartyRepository.java | 0 ...DerivationConversionIntegrationTests.java} | 2 +- ...lCouchbaseRepositoryIntegrationTests.java} | 15 ++++--- .../repository/ReactivePartyRepository.java | 0 .../ReactivePartySortingRepository.java | 0 .../couchbase/repository/ReactiveUser.java | 0 .../repository/ReactiveUserRepository.java | 0 .../repository/RepositoryIndexUsageTest.java | 4 +- ...eCouchbaseRepositoryIntegrationTests.java} | 7 +-- .../SimpleCouchbaseRepositoryListener.java | 0 ...eCouchbaseRepositoryIntegrationTests.java} | 5 ++- ...leReactiveCouchbaseRepositoryListener.java | 0 .../data/couchbase/repository/User.java | 0 .../couchbase/repository/UserRepository.java | 0 .../auditing/AuditedApplicationConfig.java | 0 .../auditing/AuditedAuditorAware.java | 0 .../repository/auditing/AuditedItem.java | 0 .../auditing/AuditedRepository.java | 0 .../auditing/AuditingIntegrationTests.java} | 2 +- .../repository/cdi/CdiPersonFragment.java | 0 .../repository/cdi/CdiPersonFragmentImpl.java | 0 .../repository/cdi/CdiPersonRepository.java | 0 .../repository/cdi/CdiRepositoryClient.java | 0 .../cdi/CdiRepositoryIntegrationTests.java} | 4 +- .../cdi/CouchbaseClientProducer.java | 0 .../cdi/CouchbaseClusterInfoProducer.java | 0 .../cdi/CouchbaseOperationsProducer.java | 0 .../repository/cdi/OtherQualifier.java | 0 .../data/couchbase/repository/cdi/Person.java | 0 .../couchbase/repository/cdi/PersonDB.java | 0 .../cdi/QualifiedPersonRepository.java | 0 .../base/RepositoryBaseIntegrationTests.java} | 2 +- .../extending/base/impl/MyRepository.java | 0 .../extending/base/impl/MyRepositoryImpl.java | 0 .../repository/extending/method/MyItem.java | 0 .../extending/method/MyRepository.java | 0 .../extending/method/MyRepositoryCustom.java | 0 .../extending/method/MyRepositoryImpl.java | 0 ...positoryCustomMethodIntegrationTests.java} | 2 +- ...eDetectionRepositoryIntegrationTests.java} | 5 ++- ...FeatureDetectionTestApplicationConfig.java | 0 .../feature/ViewOnlyUserRepository.java | 0 .../index/AnotherIndexedUserRepository.java | 4 +- .../index/IndexedFooRepository.java | 0 .../IndexedRepositoryIntegrationTests.java} | 16 +++---- .../index/IndexedRepositoryTestListener.java | 6 +-- .../index/IndexedUserRepository.java | 4 +- .../couchbase/repository/join/Address.java | 0 .../repository/join/AddressRepository.java | 0 .../couchbase/repository/join/Author.java | 0 .../join/AuthorAndBookPopulatorListener.java | 0 .../repository/join/AuthorRepository.java | 0 .../data/couchbase/repository/join/Book.java | 0 .../repository/join/BookRepository.java | 0 .../join/N1qlJoinIntegrationTests.java} | 11 ++--- .../couchbase/repository/spel/SpelConfig.java | 5 +-- .../repository/spel/SpelRepository.java | 0 .../spel/SpelRepositoryIntegrationTests.java} | 2 +- ...sitoryTemplateWiringIntegrationTests.java} | 4 +- .../xmlconfig/XmlItemRepository.java | 0 ...ositoryConfigurationIntegrationTests.java} | 4 +- ...aseOperationsExtensionsIntegrationTest.kt} | 4 +- ...aseOperationsExtensionsIntegrationTest.kt} | 2 +- .../configurations/couchbase-consistency.xml | 0 .../couchbase-multi-bucket-bean.xml | 0 .../couchbase-repository-bean.xml | 0 .../couchbase-template-bean.xml | 0 ...template-with-translation-service-bean.xml | 0 .../configurations/couchbase-typekey.xml | 0 .../resources/server.properties | 0 113 files changed, 217 insertions(+), 133 deletions(-) rename src/{integration => test}/java/org/springframework/data/couchbase/ContainerResourceRunner.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/CouchbaseHttpPortListeningCheck.java (100%) create mode 100644 src/test/java/org/springframework/data/couchbase/CouchbaseTestHelper.java rename src/{integration => test}/java/org/springframework/data/couchbase/CouchbaseWaitStrategy.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/IntegrationTestApplicationConfig.java (97%) rename src/{integration => test}/java/org/springframework/data/couchbase/IntegrationTestCustomKeySettings.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/IntegrationTestCustomTypeKeyConfig.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/IntegrationTestNoShutdownApplicationConfig.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/ReactiveIntegrationTestApplicationConfig.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/TestContainerResource.java (92%) rename src/{integration/java/org/springframework/data/couchbase/config/AbstractCouchbaseDataConfigurationTest.java => test/java/org/springframework/data/couchbase/config/AbstractCouchbaseDataConfigurationIntegrationTests.java} (96%) rename src/{integration/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentNoShutdownProxyTest.java => test/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentNoShutdownProxyIntegrationTests.java} (92%) rename src/{integration => test}/java/org/springframework/data/couchbase/config/CouchbaseTemplateParserIntegrationTests.java (98%) rename src/{integration => test}/java/org/springframework/data/couchbase/core/AsyncUtils.java (100%) rename src/{integration/java/org/springframework/data/couchbase/core/CouchbaseTemplateIdGenerationTests.java => test/java/org/springframework/data/couchbase/core/CouchbaseTemplateIdGenerationIntegrationTests.java} (98%) rename src/{integration/java/org/springframework/data/couchbase/core/CouchbaseTemplateTests.java => test/java/org/springframework/data/couchbase/core/CouchbaseTemplateIntegrationTests.java} (99%) rename src/{integration/java/org/springframework/data/couchbase/core/CouchbaseTemplateKeySettingsTests.java => test/java/org/springframework/data/couchbase/core/CouchbaseTemplateKeySettingsIntegrationTests.java} (96%) rename src/{integration => test}/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryListener.java (97%) rename src/{integration => test}/java/org/springframework/data/couchbase/core/RxCouchbaseTemplateQueryListener.java (100%) rename src/{integration/java/org/springframework/data/couchbase/core/RxJavaCouchbaseTemplateTests.java => test/java/org/springframework/data/couchbase/core/RxJavaCouchbaseTemplateIntegrationTests.java} (99%) rename src/{integration/java/org/springframework/data/couchbase/core/TypeKeyTests.java => test/java/org/springframework/data/couchbase/core/TypeKeyIntegrationTests.java} (98%) rename src/{integration/java/org/springframework/data/couchbase/core/mapping/CustomConverterTests.java => test/java/org/springframework/data/couchbase/core/mapping/CustomConverterIntegrationTests.java} (93%) rename src/{integration => test}/java/org/springframework/data/couchbase/core/mapping/TestUUID.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/core/mapping/TestUUIDRepository.java (100%) rename src/{integration/java/org/springframework/data/couchbase/monitor/ClientInfoTests.java => test/java/org/springframework/data/couchbase/monitor/ClientInfoIntegrationTests.java} (97%) rename src/{integration/java/org/springframework/data/couchbase/monitor/ClusterInfoTests.java => test/java/org/springframework/data/couchbase/monitor/ClusterInfoIntegrationTests.java} (97%) rename src/{integration/java/org/springframework/data/couchbase/repository/CouchbaseIdGenerationTests.java => test/java/org/springframework/data/couchbase/repository/CouchbaseIdGenerationIntegrationTests.java} (98%) rename src/{integration/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryViewTests.java => test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryViewIntegrationTests.java} (90%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryViewListener.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/CustomUserRepository.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/DimensionalPartyRepository.java (100%) rename src/{integration/java/org/springframework/data/couchbase/repository/DimensionalQueryTests.java => test/java/org/springframework/data/couchbase/repository/DimensionalQueryIntegrationTests.java} (98%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/Item.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/ItemRepository.java (100%) rename src/{integration/java/org/springframework/data/couchbase/repository/N1qlCouchbaseRepositoryTests.java => test/java/org/springframework/data/couchbase/repository/N1qlCouchbaseRepositoryIntegrationTests.java} (88%) rename src/{integration/java/org/springframework/data/couchbase/repository/N1qlCrudRepositoryTests.java => test/java/org/springframework/data/couchbase/repository/N1qlCrudRepositoryIntegrationTests.java} (93%) rename src/{integration/java/org/springframework/data/couchbase/repository/N1qlPlaceholderTests.java => test/java/org/springframework/data/couchbase/repository/N1qlPlaceholderIntegrationTests.java} (95%) rename src/{integration/java/org/springframework/data/couchbase/repository/PageAndSliceTests.java => test/java/org/springframework/data/couchbase/repository/PageAndSliceIntegrationTests.java} (87%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/Party.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/PartyPagingRepository.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/PartyPopulatorListener.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/PartyRepository.java (100%) rename src/{integration/java/org/springframework/data/couchbase/repository/QueryDerivationConversionTests.java => test/java/org/springframework/data/couchbase/repository/QueryDerivationConversionIntegrationTests.java} (98%) rename src/{integration/java/org/springframework/data/couchbase/repository/ReactiveN1qlCouchbaseRepositoryTests.java => test/java/org/springframework/data/couchbase/repository/ReactiveN1qlCouchbaseRepositoryIntegrationTests.java} (87%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/ReactivePartyRepository.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/ReactivePartySortingRepository.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/ReactiveUser.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/ReactiveUserRepository.java (100%) rename src/{integration/java/org/springframework/data/couchbase/repository/SimpleCouchbaseRepositoryTests.java => test/java/org/springframework/data/couchbase/repository/SimpleCouchbaseRepositoryIntegrationTests.java} (97%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/SimpleCouchbaseRepositoryListener.java (100%) rename src/{integration/java/org/springframework/data/couchbase/repository/SimpleReactiveCouchbaseRepositoryTests.java => test/java/org/springframework/data/couchbase/repository/SimpleReactiveCouchbaseRepositoryIntegrationTests.java} (96%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/SimpleReactiveCouchbaseRepositoryListener.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/User.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/UserRepository.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/auditing/AuditedApplicationConfig.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/auditing/AuditedAuditorAware.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/auditing/AuditedItem.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/auditing/AuditedRepository.java (100%) rename src/{integration/java/org/springframework/data/couchbase/repository/auditing/AuditingTests.java => test/java/org/springframework/data/couchbase/repository/auditing/AuditingIntegrationTests.java} (98%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/cdi/CdiPersonFragment.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/cdi/CdiPersonFragmentImpl.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/cdi/CdiPersonRepository.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/cdi/CdiRepositoryClient.java (100%) rename src/{integration/java/org/springframework/data/couchbase/repository/cdi/CdiRepositoryTests.java => test/java/org/springframework/data/couchbase/repository/cdi/CdiRepositoryIntegrationTests.java} (97%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/cdi/CouchbaseClientProducer.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/cdi/CouchbaseClusterInfoProducer.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/cdi/CouchbaseOperationsProducer.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/cdi/OtherQualifier.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/cdi/Person.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/cdi/PersonDB.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/cdi/QualifiedPersonRepository.java (100%) rename src/{integration/java/org/springframework/data/couchbase/repository/extending/base/RepositoryBaseTest.java => test/java/org/springframework/data/couchbase/repository/extending/base/RepositoryBaseIntegrationTests.java} (98%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/extending/base/impl/MyRepository.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/extending/base/impl/MyRepositoryImpl.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/extending/method/MyItem.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/extending/method/MyRepository.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/extending/method/MyRepositoryCustom.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/extending/method/MyRepositoryImpl.java (100%) rename src/{integration/java/org/springframework/data/couchbase/repository/extending/method/RepositoryCustomMethodTest.java => test/java/org/springframework/data/couchbase/repository/extending/method/RepositoryCustomMethodIntegrationTests.java} (98%) rename src/{integration/java/org/springframework/data/couchbase/repository/feature/FeatureDetectionRepositoryTests.java => test/java/org/springframework/data/couchbase/repository/feature/FeatureDetectionRepositoryIntegrationTests.java} (94%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/feature/FeatureDetectionTestApplicationConfig.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/feature/ViewOnlyUserRepository.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/index/AnotherIndexedUserRepository.java (69%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/index/IndexedFooRepository.java (100%) rename src/{integration/java/org/springframework/data/couchbase/repository/index/IndexedRepositoryTests.java => test/java/org/springframework/data/couchbase/repository/index/IndexedRepositoryIntegrationTests.java} (88%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/index/IndexedRepositoryTestListener.java (89%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/index/IndexedUserRepository.java (71%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/join/Address.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/join/AddressRepository.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/join/Author.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/join/AuthorAndBookPopulatorListener.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/join/AuthorRepository.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/join/Book.java (100%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/join/BookRepository.java (100%) rename src/{integration/java/org/springframework/data/couchbase/repository/join/N1qlJoinTests.java => test/java/org/springframework/data/couchbase/repository/join/N1qlJoinIntegrationTests.java} (88%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/spel/SpelConfig.java (81%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/spel/SpelRepository.java (100%) rename src/{integration/java/org/springframework/data/couchbase/repository/spel/SpelRepositoryTests.java => test/java/org/springframework/data/couchbase/repository/spel/SpelRepositoryIntegrationTests.java} (98%) rename src/{integration/java/org/springframework/data/couchbase/repository/wiring/RepositoryTemplateWiringTests.java => test/java/org/springframework/data/couchbase/repository/wiring/RepositoryTemplateWiringIntegrationTests.java} (97%) rename src/{integration => test}/java/org/springframework/data/couchbase/repository/xmlconfig/XmlItemRepository.java (100%) rename src/{integration/java/org/springframework/data/couchbase/repository/xmlconfig/XmlRepositoryConfigurationTests.java => test/java/org/springframework/data/couchbase/repository/xmlconfig/XmlRepositoryConfigurationIntegrationTests.java} (92%) rename src/{integration/kotlin/org/springframework/data/couchbase/core/CouchbaseOperationsExtensionsTest.kt => test/kotlin/org/springframework/data/couchbase/core/CouchbaseOperationsExtensionsIntegrationTest.kt} (94%) rename src/{integration/kotlin/org/springframework/data/couchbase/core/RxJavaCouchbaseOperationsExtensionsTest.kt => test/kotlin/org/springframework/data/couchbase/core/RxJavaCouchbaseOperationsExtensionsIntegrationTest.kt} (95%) rename src/{integration => test}/resources/configurations/couchbase-consistency.xml (100%) rename src/{integration => test}/resources/configurations/couchbase-multi-bucket-bean.xml (100%) rename src/{integration => test}/resources/configurations/couchbase-repository-bean.xml (100%) rename src/{integration => test}/resources/configurations/couchbase-template-bean.xml (100%) rename src/{integration => test}/resources/configurations/couchbase-template-with-translation-service-bean.xml (100%) rename src/{integration => test}/resources/configurations/couchbase-typekey.xml (100%) rename src/{integration => test}/resources/server.properties (100%) diff --git a/pom.xml b/pom.xml index 523d0f04..f489a2aa 100644 --- a/pom.xml +++ b/pom.xml @@ -220,6 +220,40 @@ org.asciidoctor asciidoctor-maven-plugin + + org.apache.maven.plugins + maven-surefire-plugin + + false + false + + **/*Test.java + **/*Tests.java + + + **/*IntegrationTest.java + **/*IntegrationTests.java + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + **/*IntegrationTest.java + **/*IntegrationTests.java + + + + + + integration-test + verify + + + + diff --git a/src/integration/java/org/springframework/data/couchbase/ContainerResourceRunner.java b/src/test/java/org/springframework/data/couchbase/ContainerResourceRunner.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/ContainerResourceRunner.java rename to src/test/java/org/springframework/data/couchbase/ContainerResourceRunner.java diff --git a/src/integration/java/org/springframework/data/couchbase/CouchbaseHttpPortListeningCheck.java b/src/test/java/org/springframework/data/couchbase/CouchbaseHttpPortListeningCheck.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/CouchbaseHttpPortListeningCheck.java rename to src/test/java/org/springframework/data/couchbase/CouchbaseHttpPortListeningCheck.java diff --git a/src/test/java/org/springframework/data/couchbase/CouchbaseTestHelper.java b/src/test/java/org/springframework/data/couchbase/CouchbaseTestHelper.java new file mode 100644 index 00000000..236a9fed --- /dev/null +++ b/src/test/java/org/springframework/data/couchbase/CouchbaseTestHelper.java @@ -0,0 +1,43 @@ +/* + * Copyright 2019 Couchbase, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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 + * limitations under the License. + */ + +package org.springframework.data.couchbase; + +import org.rnorth.ducttape.unreliables.Unreliables; +import org.springframework.data.repository.core.support.RepositoryFactorySupport; + +import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; + +public class CouchbaseTestHelper { + private CouchbaseTestHelper() { + throw new AssertionError("not instantiable"); + } + + /** + * Returns a repository instance for the given interface. + *

+ * Retry because concurrent index creation throws exception. + * See https://issues.couchbase.com/browse/MB-32238 + */ + public static T getRepositoryWithRetry(RepositoryFactorySupport factory, Class repositoryInterface) { + return retryUntilSuccess(() -> factory.getRepository(repositoryInterface)); + } + + private static T retryUntilSuccess(final Callable lambda) { + return Unreliables.retryUntilSuccess(10, TimeUnit.SECONDS, lambda); + } +} diff --git a/src/integration/java/org/springframework/data/couchbase/CouchbaseWaitStrategy.java b/src/test/java/org/springframework/data/couchbase/CouchbaseWaitStrategy.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/CouchbaseWaitStrategy.java rename to src/test/java/org/springframework/data/couchbase/CouchbaseWaitStrategy.java diff --git a/src/integration/java/org/springframework/data/couchbase/IntegrationTestApplicationConfig.java b/src/test/java/org/springframework/data/couchbase/IntegrationTestApplicationConfig.java similarity index 97% rename from src/integration/java/org/springframework/data/couchbase/IntegrationTestApplicationConfig.java rename to src/test/java/org/springframework/data/couchbase/IntegrationTestApplicationConfig.java index 6e9538b9..4867530a 100644 --- a/src/integration/java/org/springframework/data/couchbase/IntegrationTestApplicationConfig.java +++ b/src/test/java/org/springframework/data/couchbase/IntegrationTestApplicationConfig.java @@ -50,8 +50,8 @@ public class IntegrationTestApplicationConfig extends AbstractCouchbaseConfigura return DefaultCouchbaseEnvironment.builder() .connectTimeout(10000) .kvTimeout(10000) - .queryTimeout(10000) - .viewTimeout(10000) + .queryTimeout(20000) + .viewTimeout(20000) .build(); } diff --git a/src/integration/java/org/springframework/data/couchbase/IntegrationTestCustomKeySettings.java b/src/test/java/org/springframework/data/couchbase/IntegrationTestCustomKeySettings.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/IntegrationTestCustomKeySettings.java rename to src/test/java/org/springframework/data/couchbase/IntegrationTestCustomKeySettings.java diff --git a/src/integration/java/org/springframework/data/couchbase/IntegrationTestCustomTypeKeyConfig.java b/src/test/java/org/springframework/data/couchbase/IntegrationTestCustomTypeKeyConfig.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/IntegrationTestCustomTypeKeyConfig.java rename to src/test/java/org/springframework/data/couchbase/IntegrationTestCustomTypeKeyConfig.java diff --git a/src/integration/java/org/springframework/data/couchbase/IntegrationTestNoShutdownApplicationConfig.java b/src/test/java/org/springframework/data/couchbase/IntegrationTestNoShutdownApplicationConfig.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/IntegrationTestNoShutdownApplicationConfig.java rename to src/test/java/org/springframework/data/couchbase/IntegrationTestNoShutdownApplicationConfig.java diff --git a/src/integration/java/org/springframework/data/couchbase/ReactiveIntegrationTestApplicationConfig.java b/src/test/java/org/springframework/data/couchbase/ReactiveIntegrationTestApplicationConfig.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/ReactiveIntegrationTestApplicationConfig.java rename to src/test/java/org/springframework/data/couchbase/ReactiveIntegrationTestApplicationConfig.java diff --git a/src/integration/java/org/springframework/data/couchbase/TestContainerResource.java b/src/test/java/org/springframework/data/couchbase/TestContainerResource.java similarity index 92% rename from src/integration/java/org/springframework/data/couchbase/TestContainerResource.java rename to src/test/java/org/springframework/data/couchbase/TestContainerResource.java index 33cbc473..72be7338 100644 --- a/src/integration/java/org/springframework/data/couchbase/TestContainerResource.java +++ b/src/test/java/org/springframework/data/couchbase/TestContainerResource.java @@ -1,5 +1,6 @@ package org.springframework.data.couchbase; +import java.io.IOException; import java.util.Properties; import java.util.concurrent.atomic.AtomicInteger; import org.junit.rules.ExternalResource; @@ -25,11 +26,11 @@ public class TestContainerResource extends ExternalResource { Properties properties = new Properties(); properties.load(Thread.currentThread().getContextClassLoader().getResourceAsStream("server.properties")); serverVersion = properties.getProperty("server.version"); - if(!properties.getProperty("server.resource").contentEquals("container")) { + if(!"container".equals(properties.getProperty("server.resource"))) { return null; } - } catch (Exception ex) { - serverVersion = "5.0.1"; + } catch (IOException ex) { + throw new RuntimeException(ex); } couchbaseContainer = new FixedHostPortGenericContainer("couchbase:" + serverVersion) .withFixedExposedPort(8091, 8091) @@ -64,4 +65,4 @@ public class TestContainerResource extends ExternalResource { currentInstance = null; } } -} \ No newline at end of file +} diff --git a/src/integration/java/org/springframework/data/couchbase/config/AbstractCouchbaseDataConfigurationTest.java b/src/test/java/org/springframework/data/couchbase/config/AbstractCouchbaseDataConfigurationIntegrationTests.java similarity index 96% rename from src/integration/java/org/springframework/data/couchbase/config/AbstractCouchbaseDataConfigurationTest.java rename to src/test/java/org/springframework/data/couchbase/config/AbstractCouchbaseDataConfigurationIntegrationTests.java index 7cd70d87..cf18b917 100644 --- a/src/integration/java/org/springframework/data/couchbase/config/AbstractCouchbaseDataConfigurationTest.java +++ b/src/test/java/org/springframework/data/couchbase/config/AbstractCouchbaseDataConfigurationIntegrationTests.java @@ -2,8 +2,6 @@ package org.springframework.data.couchbase.config; import static org.junit.Assert.*; -import javax.swing.*; - import com.couchbase.client.java.Bucket; import com.couchbase.client.java.Cluster; import com.couchbase.client.java.CouchbaseCluster; @@ -35,7 +33,7 @@ import org.springframework.test.context.ContextConfiguration; @SuppressWarnings("SpringJavaAutowiringInspection") @RunWith(ContainerResourceRunner.class) @ContextConfiguration -public class AbstractCouchbaseDataConfigurationTest { +public class AbstractCouchbaseDataConfigurationIntegrationTests { @Autowired ItemRepository repository; @@ -76,7 +74,7 @@ public class AbstractCouchbaseDataConfigurationTest { } @Configuration - @EnableCouchbaseRepositories(basePackageClasses = AbstractCouchbaseDataConfigurationTest.class, considerNestedRepositories = true) + @EnableCouchbaseRepositories(basePackageClasses = AbstractCouchbaseDataConfigurationIntegrationTests.class, considerNestedRepositories = true) static class Config extends AbstractCouchbaseDataConfiguration { @Autowired @@ -163,4 +161,4 @@ public class AbstractCouchbaseDataConfigurationTest { @Repository interface ItemRepository extends CouchbaseRepository {} -} \ No newline at end of file +} diff --git a/src/integration/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentNoShutdownProxyTest.java b/src/test/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentNoShutdownProxyIntegrationTests.java similarity index 92% rename from src/integration/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentNoShutdownProxyTest.java rename to src/test/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentNoShutdownProxyIntegrationTests.java index 2f54f694..66f6eed1 100644 --- a/src/integration/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentNoShutdownProxyTest.java +++ b/src/test/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentNoShutdownProxyIntegrationTests.java @@ -14,7 +14,7 @@ import org.springframework.test.context.ContextConfiguration; */ @RunWith(ContainerResourceRunner.class) @ContextConfiguration(classes = IntegrationTestNoShutdownApplicationConfig.class) -public class CouchbaseEnvironmentNoShutdownProxyTest { +public class CouchbaseEnvironmentNoShutdownProxyIntegrationTests { @Autowired public CouchbaseEnvironment environment; @@ -23,4 +23,4 @@ public class CouchbaseEnvironmentNoShutdownProxyTest { public void testEnvironmentShutDown() { Assert.assertEquals("Should return false", false, environment.shutdown()); } -} \ No newline at end of file +} diff --git a/src/test/java/org/springframework/data/couchbase/config/CouchbaseSingleEnvironmentParserTest.java b/src/test/java/org/springframework/data/couchbase/config/CouchbaseSingleEnvironmentParserTest.java index d63922d5..b214db95 100644 --- a/src/test/java/org/springframework/data/couchbase/config/CouchbaseSingleEnvironmentParserTest.java +++ b/src/test/java/org/springframework/data/couchbase/config/CouchbaseSingleEnvironmentParserTest.java @@ -25,7 +25,6 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.context.support.GenericApplicationContext; import org.springframework.core.io.ClassPathResource; -import org.springframework.test.util.ReflectionTestUtils; import com.couchbase.client.core.env.DefaultCoreEnvironment; import com.couchbase.client.java.env.CouchbaseEnvironment; @@ -35,15 +34,15 @@ import com.couchbase.client.java.env.DefaultCouchbaseEnvironment; * @author Simon Bland */ public class CouchbaseSingleEnvironmentParserTest { - + /** - * @see DATACOUCH-235 + * See DATACOUCH-235 */ @Test public void testSingleCouchbaseEnvironment() throws Exception { - - Integer instanceCounterBefore = (Integer) ReflectionTestUtils.getField(DefaultCoreEnvironment.class, "instanceCounter"); - + + int instanceCounterBefore = DefaultCoreEnvironment.instanceCounter(); + DefaultListableBeanFactory factory = new DefaultListableBeanFactory(); BeanDefinitionReader reader = new XmlBeanDefinitionReader(factory); reader.loadBeanDefinitions(new ClassPathResource("configurations/couchbaseSingleEnv-bean.xml")); @@ -51,9 +50,9 @@ public class CouchbaseSingleEnvironmentParserTest { context.refresh(); CouchbaseEnvironment env = context.getBean("singleEnv", CouchbaseEnvironment.class); context.close(); - - Integer instanceCounterAfter = (Integer) ReflectionTestUtils.getField(DefaultCoreEnvironment.class, "instanceCounter"); - + + int instanceCounterAfter = DefaultCoreEnvironment.instanceCounter(); + assertThat(env, is(instanceOf(DefaultCouchbaseEnvironment.class))); assertThat(instanceCounterAfter, is(instanceCounterBefore + 1)); } diff --git a/src/integration/java/org/springframework/data/couchbase/config/CouchbaseTemplateParserIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/config/CouchbaseTemplateParserIntegrationTests.java similarity index 98% rename from src/integration/java/org/springframework/data/couchbase/config/CouchbaseTemplateParserIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/config/CouchbaseTemplateParserIntegrationTests.java index fea8412e..58849fb2 100644 --- a/src/integration/java/org/springframework/data/couchbase/config/CouchbaseTemplateParserIntegrationTests.java +++ b/src/test/java/org/springframework/data/couchbase/config/CouchbaseTemplateParserIntegrationTests.java @@ -41,7 +41,7 @@ import org.springframework.test.context.ContextConfiguration; * @author Simon Baslé */ @RunWith(ContainerResourceRunner.class) -@ContextConfiguration(classes=CouchbaseTemplateParserIntegrationTests.class) +@ContextConfiguration(classes = CouchbaseTemplateParserIntegrationTests.class) public class CouchbaseTemplateParserIntegrationTests { DefaultListableBeanFactory factory; diff --git a/src/integration/java/org/springframework/data/couchbase/core/AsyncUtils.java b/src/test/java/org/springframework/data/couchbase/core/AsyncUtils.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/core/AsyncUtils.java rename to src/test/java/org/springframework/data/couchbase/core/AsyncUtils.java diff --git a/src/integration/java/org/springframework/data/couchbase/core/CouchbaseTemplateIdGenerationTests.java b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateIdGenerationIntegrationTests.java similarity index 98% rename from src/integration/java/org/springframework/data/couchbase/core/CouchbaseTemplateIdGenerationTests.java rename to src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateIdGenerationIntegrationTests.java index 8693f42a..5bb66e4c 100644 --- a/src/integration/java/org/springframework/data/couchbase/core/CouchbaseTemplateIdGenerationTests.java +++ b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateIdGenerationIntegrationTests.java @@ -25,7 +25,7 @@ import org.springframework.test.context.ContextConfiguration; */ @RunWith(ContainerResourceRunner.class) @ContextConfiguration(classes = IntegrationTestApplicationConfig.class) -public class CouchbaseTemplateIdGenerationTests { +public class CouchbaseTemplateIdGenerationIntegrationTests { @Rule public TestName testName = new TestName(); @@ -144,4 +144,4 @@ public class CouchbaseTemplateIdGenerationTests { public String value = "new"; } -} \ No newline at end of file +} diff --git a/src/integration/java/org/springframework/data/couchbase/core/CouchbaseTemplateTests.java b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateIntegrationTests.java similarity index 99% rename from src/integration/java/org/springframework/data/couchbase/core/CouchbaseTemplateTests.java rename to src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateIntegrationTests.java index ccbeca4b..297154cc 100644 --- a/src/integration/java/org/springframework/data/couchbase/core/CouchbaseTemplateTests.java +++ b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateIntegrationTests.java @@ -69,7 +69,7 @@ import org.springframework.test.context.TestExecutionListeners; @RunWith(ContainerResourceRunner.class) @ContextConfiguration(classes = IntegrationTestApplicationConfig.class) @TestExecutionListeners(CouchbaseTemplateQueryListener.class) -public class CouchbaseTemplateTests { +public class CouchbaseTemplateIntegrationTests { @Rule public TestName testName = new TestName(); diff --git a/src/integration/java/org/springframework/data/couchbase/core/CouchbaseTemplateKeySettingsTests.java b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateKeySettingsIntegrationTests.java similarity index 96% rename from src/integration/java/org/springframework/data/couchbase/core/CouchbaseTemplateKeySettingsTests.java rename to src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateKeySettingsIntegrationTests.java index 94851d8a..7df8fb5e 100644 --- a/src/integration/java/org/springframework/data/couchbase/core/CouchbaseTemplateKeySettingsTests.java +++ b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateKeySettingsIntegrationTests.java @@ -21,7 +21,7 @@ import org.springframework.test.context.ContextConfiguration; @RunWith(ContainerResourceRunner.class) @ContextConfiguration(classes = IntegrationTestCustomKeySettings.class) -public class CouchbaseTemplateKeySettingsTests { +public class CouchbaseTemplateKeySettingsIntegrationTests { @Rule public TestName testName = new TestName(); @@ -58,4 +58,4 @@ public class CouchbaseTemplateKeySettingsTests { @Id public String id = "myId"; } -} \ No newline at end of file +} diff --git a/src/integration/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryListener.java b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryListener.java similarity index 97% rename from src/integration/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryListener.java rename to src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryListener.java index 3cb8c82e..ad87b486 100644 --- a/src/integration/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryListener.java +++ b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryListener.java @@ -27,7 +27,6 @@ import com.couchbase.client.java.view.DesignDocument; import com.couchbase.client.java.view.View; import org.springframework.data.couchbase.config.BeanNames; -import org.springframework.data.couchbase.repository.index.IndexedRepositoryTests; import org.springframework.test.context.TestContext; import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; diff --git a/src/integration/java/org/springframework/data/couchbase/core/RxCouchbaseTemplateQueryListener.java b/src/test/java/org/springframework/data/couchbase/core/RxCouchbaseTemplateQueryListener.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/core/RxCouchbaseTemplateQueryListener.java rename to src/test/java/org/springframework/data/couchbase/core/RxCouchbaseTemplateQueryListener.java diff --git a/src/integration/java/org/springframework/data/couchbase/core/RxJavaCouchbaseTemplateTests.java b/src/test/java/org/springframework/data/couchbase/core/RxJavaCouchbaseTemplateIntegrationTests.java similarity index 99% rename from src/integration/java/org/springframework/data/couchbase/core/RxJavaCouchbaseTemplateTests.java rename to src/test/java/org/springframework/data/couchbase/core/RxJavaCouchbaseTemplateIntegrationTests.java index 57679e20..05c90e21 100644 --- a/src/integration/java/org/springframework/data/couchbase/core/RxJavaCouchbaseTemplateTests.java +++ b/src/test/java/org/springframework/data/couchbase/core/RxJavaCouchbaseTemplateIntegrationTests.java @@ -64,7 +64,7 @@ import rx.observers.TestSubscriber; @RunWith(ContainerResourceRunner.class) @ContextConfiguration(classes = ReactiveIntegrationTestApplicationConfig.class) @TestExecutionListeners(RxCouchbaseTemplateQueryListener.class) -public class RxJavaCouchbaseTemplateTests { +public class RxJavaCouchbaseTemplateIntegrationTests { @Rule public TestName testName = new TestName(); diff --git a/src/integration/java/org/springframework/data/couchbase/core/TypeKeyTests.java b/src/test/java/org/springframework/data/couchbase/core/TypeKeyIntegrationTests.java similarity index 98% rename from src/integration/java/org/springframework/data/couchbase/core/TypeKeyTests.java rename to src/test/java/org/springframework/data/couchbase/core/TypeKeyIntegrationTests.java index d760b876..266a4732 100644 --- a/src/integration/java/org/springframework/data/couchbase/core/TypeKeyTests.java +++ b/src/test/java/org/springframework/data/couchbase/core/TypeKeyIntegrationTests.java @@ -41,7 +41,7 @@ import org.springframework.test.context.ContextConfiguration; */ @RunWith(ContainerResourceRunner.class) @ContextConfiguration(classes = IntegrationTestCustomTypeKeyConfig.class) -public class TypeKeyTests { +public class TypeKeyIntegrationTests { @Autowired private Bucket client; diff --git a/src/integration/java/org/springframework/data/couchbase/core/mapping/CustomConverterTests.java b/src/test/java/org/springframework/data/couchbase/core/mapping/CustomConverterIntegrationTests.java similarity index 93% rename from src/integration/java/org/springframework/data/couchbase/core/mapping/CustomConverterTests.java rename to src/test/java/org/springframework/data/couchbase/core/mapping/CustomConverterIntegrationTests.java index b0122f48..7e4caf52 100644 --- a/src/integration/java/org/springframework/data/couchbase/core/mapping/CustomConverterTests.java +++ b/src/test/java/org/springframework/data/couchbase/core/mapping/CustomConverterIntegrationTests.java @@ -39,12 +39,14 @@ import org.springframework.data.repository.core.support.RepositoryFactorySupport import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.springframework.data.couchbase.CouchbaseTestHelper.getRepositoryWithRetry; + /** * @author Subhashni Balakrishnan */ @RunWith(ContainerResourceRunner.class) @ContextConfiguration(classes = IntegrationTestApplicationConfig.class) -public class CustomConverterTests { +public class CustomConverterIntegrationTests { @Autowired private MappingCouchbaseConverter converter; @@ -83,7 +85,7 @@ public class CustomConverterTests { converter.setCustomConversions(new CouchbaseCustomConversions(Arrays.asList(UUIDToStringConverter.INSTANCE, StringToUUIDConverter.INSTANCE))); converter.afterPropertiesSet(); RepositoryFactorySupport factory = new CouchbaseRepositoryFactory(operationsMapping, indexManager); - repository = factory.getRepository(TestUUIDRepository.class); + repository = getRepositoryWithRetry(factory, TestUUIDRepository.class); } @Test diff --git a/src/integration/java/org/springframework/data/couchbase/core/mapping/TestUUID.java b/src/test/java/org/springframework/data/couchbase/core/mapping/TestUUID.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/core/mapping/TestUUID.java rename to src/test/java/org/springframework/data/couchbase/core/mapping/TestUUID.java diff --git a/src/integration/java/org/springframework/data/couchbase/core/mapping/TestUUIDRepository.java b/src/test/java/org/springframework/data/couchbase/core/mapping/TestUUIDRepository.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/core/mapping/TestUUIDRepository.java rename to src/test/java/org/springframework/data/couchbase/core/mapping/TestUUIDRepository.java diff --git a/src/integration/java/org/springframework/data/couchbase/monitor/ClientInfoTests.java b/src/test/java/org/springframework/data/couchbase/monitor/ClientInfoIntegrationTests.java similarity index 97% rename from src/integration/java/org/springframework/data/couchbase/monitor/ClientInfoTests.java rename to src/test/java/org/springframework/data/couchbase/monitor/ClientInfoIntegrationTests.java index 5dc4b6a7..7964b695 100644 --- a/src/integration/java/org/springframework/data/couchbase/monitor/ClientInfoTests.java +++ b/src/test/java/org/springframework/data/couchbase/monitor/ClientInfoIntegrationTests.java @@ -34,7 +34,7 @@ import org.springframework.test.context.ContextConfiguration; */ @RunWith(ContainerResourceRunner.class) @ContextConfiguration(classes = IntegrationTestApplicationConfig.class) -public class ClientInfoTests { +public class ClientInfoIntegrationTests { /** * Contains a reference to the actual CouchbaseClient. diff --git a/src/integration/java/org/springframework/data/couchbase/monitor/ClusterInfoTests.java b/src/test/java/org/springframework/data/couchbase/monitor/ClusterInfoIntegrationTests.java similarity index 97% rename from src/integration/java/org/springframework/data/couchbase/monitor/ClusterInfoTests.java rename to src/test/java/org/springframework/data/couchbase/monitor/ClusterInfoIntegrationTests.java index 8962c560..447e4a5b 100644 --- a/src/integration/java/org/springframework/data/couchbase/monitor/ClusterInfoTests.java +++ b/src/test/java/org/springframework/data/couchbase/monitor/ClusterInfoIntegrationTests.java @@ -40,7 +40,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @Ignore(value = "Cant run get cluster info on test container") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = IntegrationTestApplicationConfig.class) -public class ClusterInfoTests { +public class ClusterInfoIntegrationTests { /** * Contains a reference to the actual CouchbaseClient. diff --git a/src/integration/java/org/springframework/data/couchbase/repository/CouchbaseIdGenerationTests.java b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseIdGenerationIntegrationTests.java similarity index 98% rename from src/integration/java/org/springframework/data/couchbase/repository/CouchbaseIdGenerationTests.java rename to src/test/java/org/springframework/data/couchbase/repository/CouchbaseIdGenerationIntegrationTests.java index 5ae8b014..28fe6615 100644 --- a/src/integration/java/org/springframework/data/couchbase/repository/CouchbaseIdGenerationTests.java +++ b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseIdGenerationIntegrationTests.java @@ -40,7 +40,7 @@ import static org.springframework.data.couchbase.core.mapping.id.GenerationStrat */ @RunWith(ContainerResourceRunner.class) @ContextConfiguration(classes = IntegrationTestApplicationConfig.class) -public class CouchbaseIdGenerationTests { +public class CouchbaseIdGenerationIntegrationTests { @Autowired private RepositoryOperationsMapping operationsMapping; diff --git a/src/integration/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryViewTests.java b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryViewIntegrationTests.java similarity index 90% rename from src/integration/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryViewTests.java rename to src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryViewIntegrationTests.java index e9e10170..8e32f3bd 100644 --- a/src/integration/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryViewTests.java +++ b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryViewIntegrationTests.java @@ -22,19 +22,23 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.*; import java.util.Arrays; +import java.util.HashSet; import java.util.List; +import java.util.Set; import com.couchbase.client.java.Bucket; import com.couchbase.client.java.document.json.JsonObject; import com.couchbase.client.java.view.Stale; import com.couchbase.client.java.view.ViewQuery; import com.couchbase.client.java.view.ViewResult; +import org.hamcrest.Matchers; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.InvalidDataAccessResourceUsageException; +import org.springframework.data.couchbase.ContainerResourceRunner; import org.springframework.data.couchbase.IntegrationTestApplicationConfig; import org.springframework.data.couchbase.repository.config.RepositoryOperationsMapping; import org.springframework.data.couchbase.repository.support.CouchbaseRepositoryFactory; @@ -42,16 +46,15 @@ import org.springframework.data.couchbase.repository.support.IndexManager; import org.springframework.data.mapping.PropertyReferenceException; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** * @author David Harrigan * @author Simon Baslé */ -@RunWith(SpringJUnit4ClassRunner.class) +@RunWith(ContainerResourceRunner.class) @ContextConfiguration(classes = IntegrationTestApplicationConfig.class) @TestExecutionListeners(CouchbaseRepositoryViewListener.class) -public class CouchbaseRepositoryViewTests { +public class CouchbaseRepositoryViewIntegrationTests { @Autowired private Bucket client; @@ -73,11 +76,7 @@ public class CouchbaseRepositoryViewTests { public void shouldFindAllWithCustomView() { client.query(ViewQuery.from("user", "customFindAllView").stale(Stale.FALSE)); Iterable allUsers = repository.findAll(); - int i = 0; - for (final User allUser : allUsers) { - i++; - } - assertThat(i, is(100)); + assertThat(allUsers, Matchers.iterableWithSize(100)); } @Test @@ -138,27 +137,21 @@ public class CouchbaseRepositoryViewTests { User u2 = repository.findByUsernameIs(middleKey).get(0); User u3 = repository.findByUsernameIs(highKey).get(0); + assertEquals(lowKey, u1.getUsername()); + assertEquals(middleKey, u2.getUsername()); + assertEquals(highKey, u3.getUsername()); List in = repository.findAllByUsernameIn(keys); List gteLte = repository.findByUsernameGreaterThanEqualAndUsernameLessThanEqual(lowKey, highKey); List between = repository.findByUsernameBetween(lowKey, highKey); List gteLimited = repository.findTop3ByUsernameGreaterThanEqual(lowKey); - assertNotNull(u1); - assertNotNull(u2); - assertNotNull(u3); - - assertEquals(lowKey, u1.getUsername()); - assertEquals(middleKey, u2.getUsername()); - assertEquals(highKey, u3.getUsername()); - - List expected = Arrays.asList(u1, u2, u3); - assertEquals(expected, in); - assertEquals(expected, gteLte); - assertEquals(expected, between); - assertTrue(gteLimited.contains(u1)); - assertTrue(gteLimited.contains(u2)); - assertTrue(gteLimited.contains(u3)); + // the results are unordered, so compare using Set + Set expected = new HashSet<>(Arrays.asList(u1, u2, u3)); + assertEquals(expected, new HashSet<>(in)); + assertEquals(expected, new HashSet<>(gteLte)); + assertEquals(expected, new HashSet<>(between)); + assertEquals(expected, new HashSet<>(gteLimited)); } @Test diff --git a/src/integration/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryViewListener.java b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryViewListener.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryViewListener.java rename to src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryViewListener.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/CustomUserRepository.java b/src/test/java/org/springframework/data/couchbase/repository/CustomUserRepository.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/CustomUserRepository.java rename to src/test/java/org/springframework/data/couchbase/repository/CustomUserRepository.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/DimensionalPartyRepository.java b/src/test/java/org/springframework/data/couchbase/repository/DimensionalPartyRepository.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/DimensionalPartyRepository.java rename to src/test/java/org/springframework/data/couchbase/repository/DimensionalPartyRepository.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/DimensionalQueryTests.java b/src/test/java/org/springframework/data/couchbase/repository/DimensionalQueryIntegrationTests.java similarity index 98% rename from src/integration/java/org/springframework/data/couchbase/repository/DimensionalQueryTests.java rename to src/test/java/org/springframework/data/couchbase/repository/DimensionalQueryIntegrationTests.java index 5746fa57..145cfaf5 100644 --- a/src/integration/java/org/springframework/data/couchbase/repository/DimensionalQueryTests.java +++ b/src/test/java/org/springframework/data/couchbase/repository/DimensionalQueryIntegrationTests.java @@ -1,6 +1,7 @@ package org.springframework.data.couchbase.repository; import static org.junit.Assert.*; +import static org.springframework.data.couchbase.CouchbaseTestHelper.getRepositoryWithRetry; import java.util.HashSet; import java.util.List; @@ -34,7 +35,7 @@ import org.springframework.test.context.TestExecutionListeners; @RunWith(ContainerResourceRunner.class) @ContextConfiguration(classes = IntegrationTestApplicationConfig.class) @TestExecutionListeners(PartyPopulatorListener.class) -public class DimensionalQueryTests { +public class DimensionalQueryIntegrationTests { @Autowired private RepositoryOperationsMapping templateMapping; @@ -47,7 +48,7 @@ public class DimensionalQueryTests { @Before public void setup() throws Exception { RepositoryFactorySupport factory = new CouchbaseRepositoryFactory(templateMapping, indexManager); - repository = factory.getRepository(DimensionalPartyRepository.class); + repository = getRepositoryWithRetry(factory, DimensionalPartyRepository.class); } @Test diff --git a/src/integration/java/org/springframework/data/couchbase/repository/Item.java b/src/test/java/org/springframework/data/couchbase/repository/Item.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/Item.java rename to src/test/java/org/springframework/data/couchbase/repository/Item.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/ItemRepository.java b/src/test/java/org/springframework/data/couchbase/repository/ItemRepository.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/ItemRepository.java rename to src/test/java/org/springframework/data/couchbase/repository/ItemRepository.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/N1qlCouchbaseRepositoryTests.java b/src/test/java/org/springframework/data/couchbase/repository/N1qlCouchbaseRepositoryIntegrationTests.java similarity index 88% rename from src/integration/java/org/springframework/data/couchbase/repository/N1qlCouchbaseRepositoryTests.java rename to src/test/java/org/springframework/data/couchbase/repository/N1qlCouchbaseRepositoryIntegrationTests.java index 6f5f9f9d..5a4203a4 100644 --- a/src/integration/java/org/springframework/data/couchbase/repository/N1qlCouchbaseRepositoryTests.java +++ b/src/test/java/org/springframework/data/couchbase/repository/N1qlCouchbaseRepositoryIntegrationTests.java @@ -17,6 +17,7 @@ package org.springframework.data.couchbase.repository; import static org.junit.Assert.*; +import static org.springframework.data.couchbase.CouchbaseTestHelper.getRepositoryWithRetry; import org.junit.After; import org.junit.Before; @@ -43,6 +44,7 @@ import org.springframework.test.context.TestExecutionListeners; import java.util.Calendar; import java.util.Date; import java.util.List; +import java.util.concurrent.TimeUnit; /** * This tests PaginAndSortingRepository features in the Couchbase connector. @@ -53,7 +55,7 @@ import java.util.List; @RunWith(ContainerResourceRunner.class) @ContextConfiguration(classes = IntegrationTestApplicationConfig.class) @TestExecutionListeners(PartyPopulatorListener.class) -public class N1qlCouchbaseRepositoryTests { +public class N1qlCouchbaseRepositoryIntegrationTests { @Autowired private RepositoryOperationsMapping operationsMapping; @@ -74,9 +76,10 @@ public class N1qlCouchbaseRepositoryTests { @Before public void setup() throws Exception { RepositoryFactorySupport factory = new CouchbaseRepositoryFactory(operationsMapping, indexManager); - repository = factory.getRepository(PartyPagingRepository.class); - partyRepository = factory.getRepository(PartyRepository.class); - itemRepository = factory.getRepository(ItemRepository.class); + repository = getRepositoryWithRetry(factory, PartyPagingRepository.class); + partyRepository = getRepositoryWithRetry(factory, PartyRepository.class); + itemRepository = getRepositoryWithRetry(factory, ItemRepository.class); + partyRepository.save(new Party(KEY_PARTY, "partyName", "MatchingDescription", null, 1, null)); itemRepository.save(new Item(KEY_ITEM, "MatchingDescription")); } @@ -89,7 +92,7 @@ public class N1qlCouchbaseRepositoryTests { @Test public void shouldFindAllWithSort() { - Iterable allByAttendanceDesc = repository.findAll(new Sort(Sort.Direction.DESC, "attendees")); + Iterable allByAttendanceDesc = repository.findAll(Sort.by(Sort.Direction.DESC, "attendees")); long previousAttendance = Long.MAX_VALUE; for (Party party : allByAttendanceDesc) { assertTrue(party.getAttendees() <= previousAttendance); @@ -100,7 +103,7 @@ public class N1qlCouchbaseRepositoryTests { @Test public void shouldSortOnRenamedFieldIfJsonNameIsProvidedInSort() { - Iterable parties = repository.findAll(new Sort(Sort.Direction.DESC, "desc")); + Iterable parties = repository.findAll(Sort.by(Sort.Direction.DESC, "desc")); String previousDesc = null; for (Party party : parties) { if (previousDesc != null) { @@ -113,7 +116,7 @@ public class N1qlCouchbaseRepositoryTests { @Test public void shouldSortWithoutCaseSensitivity() { - Iterable parties = repository.findAll(new Sort(new Sort.Order(Sort.Direction.DESC, "desc").ignoreCase())); + Iterable parties = repository.findAll(Sort.by(new Sort.Order(Sort.Direction.DESC, "desc").ignoreCase())); String previousDesc = null; for (Party party : parties) { if (previousDesc != null) { @@ -126,7 +129,7 @@ public class N1qlCouchbaseRepositoryTests { @Test public void shouldPageThroughEntities() { - Pageable pageable = new PageRequest(0, 8); + Pageable pageable = PageRequest.of(0, 8); Page page1 = repository.findAll(pageable); assertTrue("Query for parties should be atleast 12", page1.getTotalElements() >= 12); @@ -135,7 +138,7 @@ public class N1qlCouchbaseRepositoryTests { @Test public void shouldPageThroughSortedEntities() { - Pageable pageable = new PageRequest(0, 8, Sort.Direction.DESC, "attendees"); + Pageable pageable = PageRequest.of(0, 8, Sort.Direction.DESC, "attendees"); Page page1 = repository.findAll(pageable); assertTrue("Query for parties should be atleast 12", page1.getTotalElements() >= 12); @@ -159,7 +162,7 @@ public class N1qlCouchbaseRepositoryTests { @Test public void shouldPageWithStringBasedQuery() { - Pageable pageable = new PageRequest(0, 8, Sort.Direction.DESC, "attendees"); + Pageable pageable = PageRequest.of(0, 8, Sort.Direction.DESC, "attendees"); Page page1 = partyRepository.findPartiesWithAttendee(1, pageable); assertTrue("Query for parties with attendees should be atleast 12", page1.getTotalElements() >= 12); assertEquals(8, page1.getNumberOfElements()); @@ -186,7 +189,7 @@ public class N1qlCouchbaseRepositoryTests { //Fails on deserialization as a different entity item is also present @Test(expected = MappingInstantiationException.class) public void shouldFailWithMissingFilterStringBasedQuery() { - Sort sort = new Sort(Sort.Direction.DESC, "attendees"); + Sort sort = Sort.by(Sort.Direction.DESC, "attendees"); partyRepository.findParties(sort); } diff --git a/src/integration/java/org/springframework/data/couchbase/repository/N1qlCrudRepositoryTests.java b/src/test/java/org/springframework/data/couchbase/repository/N1qlCrudRepositoryIntegrationTests.java similarity index 93% rename from src/integration/java/org/springframework/data/couchbase/repository/N1qlCrudRepositoryTests.java rename to src/test/java/org/springframework/data/couchbase/repository/N1qlCrudRepositoryIntegrationTests.java index fd05291a..f3324149 100644 --- a/src/integration/java/org/springframework/data/couchbase/repository/N1qlCrudRepositoryTests.java +++ b/src/test/java/org/springframework/data/couchbase/repository/N1qlCrudRepositoryIntegrationTests.java @@ -17,6 +17,7 @@ package org.springframework.data.couchbase.repository; import static org.junit.Assert.*; +import static org.springframework.data.couchbase.CouchbaseTestHelper.getRepositoryWithRetry; import java.util.Date; import java.util.List; @@ -44,7 +45,7 @@ import org.springframework.test.context.ContextConfiguration; */ @RunWith(ContainerResourceRunner.class) @ContextConfiguration(classes = IntegrationTestApplicationConfig.class) -public class N1qlCrudRepositoryTests { +public class N1qlCrudRepositoryIntegrationTests { @Autowired private Bucket client; @@ -67,8 +68,10 @@ public class N1qlCrudRepositoryTests { @Before public void setup() throws Exception { - partyRepository = new CouchbaseRepositoryFactory(operationsMapping, indexManager).getRepository(PartyRepository.class); - itemRepository = new CouchbaseRepositoryFactory(operationsMapping, indexManager).getRepository(ItemRepository.class); + CouchbaseRepositoryFactory factory = new CouchbaseRepositoryFactory(operationsMapping, indexManager); + + partyRepository = getRepositoryWithRetry(factory, PartyRepository.class); + itemRepository = getRepositoryWithRetry(factory, ItemRepository.class); itemRepository.save(item); partyRepository.save(party); diff --git a/src/integration/java/org/springframework/data/couchbase/repository/N1qlPlaceholderTests.java b/src/test/java/org/springframework/data/couchbase/repository/N1qlPlaceholderIntegrationTests.java similarity index 95% rename from src/integration/java/org/springframework/data/couchbase/repository/N1qlPlaceholderTests.java rename to src/test/java/org/springframework/data/couchbase/repository/N1qlPlaceholderIntegrationTests.java index f6e2d966..2b3ca693 100644 --- a/src/integration/java/org/springframework/data/couchbase/repository/N1qlPlaceholderTests.java +++ b/src/test/java/org/springframework/data/couchbase/repository/N1qlPlaceholderIntegrationTests.java @@ -17,6 +17,7 @@ package org.springframework.data.couchbase.repository; import static org.junit.Assert.*; +import static org.springframework.data.couchbase.CouchbaseTestHelper.getRepositoryWithRetry; import java.util.List; @@ -42,7 +43,7 @@ import org.springframework.test.context.TestExecutionListeners; @RunWith(ContainerResourceRunner.class) @ContextConfiguration(classes = IntegrationTestApplicationConfig.class) @TestExecutionListeners(PartyPopulatorListener.class) -public class N1qlPlaceholderTests { +public class N1qlPlaceholderIntegrationTests { @Autowired private RepositoryOperationsMapping operationsMapping; @@ -56,7 +57,7 @@ public class N1qlPlaceholderTests { @Before public void setup() throws Exception { factory = new CouchbaseRepositoryFactory(operationsMapping, indexManager); - partyRepository = factory.getRepository(PartyRepository.class); + partyRepository = getRepositoryWithRetry(factory, PartyRepository.class); } @Test diff --git a/src/integration/java/org/springframework/data/couchbase/repository/PageAndSliceTests.java b/src/test/java/org/springframework/data/couchbase/repository/PageAndSliceIntegrationTests.java similarity index 87% rename from src/integration/java/org/springframework/data/couchbase/repository/PageAndSliceTests.java rename to src/test/java/org/springframework/data/couchbase/repository/PageAndSliceIntegrationTests.java index d38aabaf..26b74ba3 100644 --- a/src/integration/java/org/springframework/data/couchbase/repository/PageAndSliceTests.java +++ b/src/test/java/org/springframework/data/couchbase/repository/PageAndSliceIntegrationTests.java @@ -3,6 +3,7 @@ package org.springframework.data.couchbase.repository; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.springframework.data.couchbase.CouchbaseTestHelper.getRepositoryWithRetry; import java.util.ArrayList; import java.util.List; @@ -28,7 +29,7 @@ import org.springframework.test.context.TestExecutionListeners; @RunWith(ContainerResourceRunner.class) @ContextConfiguration(classes = IntegrationTestApplicationConfig.class) @TestExecutionListeners(SimpleCouchbaseRepositoryListener.class) -public class PageAndSliceTests { +public class PageAndSliceIntegrationTests { @Autowired private Bucket client; @@ -44,11 +45,11 @@ public class PageAndSliceTests { @Before public void setup() throws Exception { RepositoryFactorySupport factory = new CouchbaseRepositoryFactory(operationsMapping, indexManager); - repository = factory.getRepository(UserRepository.class); + repository = getRepositoryWithRetry(factory, UserRepository.class); } @Test public void shouldPageThroughResults() { - Page page1 = repository.findByAgeGreaterThan(9, new PageRequest(0, 40)); //there are 90 matching users + Page page1 = repository.findByAgeGreaterThan(9, PageRequest.of(0, 40)); //there are 90 matching users Page page2 = repository.findByAgeGreaterThan(9, page1.nextPageable()); Page page3 = repository.findByAgeGreaterThan(9, page2.nextPageable()); @@ -76,7 +77,7 @@ public class PageAndSliceTests { public void shouldSliceThroughResults() { int count = 0; List allMatching = new ArrayList(10); - Slice slice = repository.findByAgeLessThan(9, new PageRequest(0, 3)); //9 matching users (ages 0-8) + Slice slice = repository.findByAgeLessThan(9, PageRequest.of(0, 3)); //9 matching users (ages 0-8) allMatching.addAll(slice.getContent()); while(slice.hasNext()) { slice = repository.findByAgeLessThan(9, slice.nextPageable()); diff --git a/src/integration/java/org/springframework/data/couchbase/repository/Party.java b/src/test/java/org/springframework/data/couchbase/repository/Party.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/Party.java rename to src/test/java/org/springframework/data/couchbase/repository/Party.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/PartyPagingRepository.java b/src/test/java/org/springframework/data/couchbase/repository/PartyPagingRepository.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/PartyPagingRepository.java rename to src/test/java/org/springframework/data/couchbase/repository/PartyPagingRepository.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/PartyPopulatorListener.java b/src/test/java/org/springframework/data/couchbase/repository/PartyPopulatorListener.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/PartyPopulatorListener.java rename to src/test/java/org/springframework/data/couchbase/repository/PartyPopulatorListener.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/PartyRepository.java b/src/test/java/org/springframework/data/couchbase/repository/PartyRepository.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/PartyRepository.java rename to src/test/java/org/springframework/data/couchbase/repository/PartyRepository.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/QueryDerivationConversionTests.java b/src/test/java/org/springframework/data/couchbase/repository/QueryDerivationConversionIntegrationTests.java similarity index 98% rename from src/integration/java/org/springframework/data/couchbase/repository/QueryDerivationConversionTests.java rename to src/test/java/org/springframework/data/couchbase/repository/QueryDerivationConversionIntegrationTests.java index 45b0514e..131a63f1 100644 --- a/src/integration/java/org/springframework/data/couchbase/repository/QueryDerivationConversionTests.java +++ b/src/test/java/org/springframework/data/couchbase/repository/QueryDerivationConversionIntegrationTests.java @@ -32,7 +32,7 @@ import org.springframework.test.context.TestExecutionListeners; @RunWith(ContainerResourceRunner.class) @ContextConfiguration(classes = IntegrationTestApplicationConfig.class) @TestExecutionListeners(PartyPopulatorListener.class) -public class QueryDerivationConversionTests { +public class QueryDerivationConversionIntegrationTests { @Autowired private Bucket client; diff --git a/src/integration/java/org/springframework/data/couchbase/repository/ReactiveN1qlCouchbaseRepositoryTests.java b/src/test/java/org/springframework/data/couchbase/repository/ReactiveN1qlCouchbaseRepositoryIntegrationTests.java similarity index 87% rename from src/integration/java/org/springframework/data/couchbase/repository/ReactiveN1qlCouchbaseRepositoryTests.java rename to src/test/java/org/springframework/data/couchbase/repository/ReactiveN1qlCouchbaseRepositoryIntegrationTests.java index 76142d20..75a4ed62 100644 --- a/src/integration/java/org/springframework/data/couchbase/repository/ReactiveN1qlCouchbaseRepositoryTests.java +++ b/src/test/java/org/springframework/data/couchbase/repository/ReactiveN1qlCouchbaseRepositoryIntegrationTests.java @@ -17,6 +17,7 @@ package org.springframework.data.couchbase.repository; import static org.junit.Assert.*; +import static org.springframework.data.couchbase.CouchbaseTestHelper.getRepositoryWithRetry; import java.util.Calendar; import java.util.Date; @@ -47,7 +48,7 @@ import org.springframework.test.context.TestExecutionListeners; @RunWith(ContainerResourceRunner.class) @ContextConfiguration(classes = ReactiveIntegrationTestApplicationConfig.class) @TestExecutionListeners(PartyPopulatorListener.class) -public class ReactiveN1qlCouchbaseRepositoryTests { +public class ReactiveN1qlCouchbaseRepositoryIntegrationTests { @Autowired private ReactiveRepositoryOperationsMapping operationsMapping; @@ -68,9 +69,9 @@ public class ReactiveN1qlCouchbaseRepositoryTests { @Before public void setup() throws Exception { ReactiveRepositoryFactorySupport factory = new ReactiveCouchbaseRepositoryFactory(operationsMapping, indexManager); - repository = factory.getRepository(ReactivePartySortingRepository.class); - partyRepository = factory.getRepository(ReactivePartyRepository.class); - itemRepository = factory.getRepository(ItemRepository.class); + repository = getRepositoryWithRetry(factory, ReactivePartySortingRepository.class); + partyRepository = getRepositoryWithRetry(factory, ReactivePartyRepository.class); + itemRepository = getRepositoryWithRetry(factory, ItemRepository.class); } @After @@ -81,7 +82,7 @@ public class ReactiveN1qlCouchbaseRepositoryTests { @Test public void shouldFindAllWithSort() { - Iterable allByAttendanceDesc = repository.findAll(new Sort(Sort.Direction.DESC, "attendees")).collectList().block(); + Iterable allByAttendanceDesc = repository.findAll(Sort.by(Sort.Direction.DESC, "attendees")).collectList().block(); long previousAttendance = Long.MAX_VALUE; for (Party party : allByAttendanceDesc) { assertTrue(party.getAttendees() <= previousAttendance); @@ -92,7 +93,7 @@ public class ReactiveN1qlCouchbaseRepositoryTests { @Test public void shouldSortOnRenamedFieldIfJsonNameIsProvidedInSort() { - Iterable parties = repository.findAll(new Sort(Sort.Direction.DESC, "desc")).collectList().block(); + Iterable parties = repository.findAll(Sort.by(Sort.Direction.DESC, "desc")).collectList().block(); String previousDesc = null; for (Party party : parties) { if (previousDesc != null) { @@ -105,7 +106,7 @@ public class ReactiveN1qlCouchbaseRepositoryTests { @Test public void shouldSortWithoutCaseSensitivity() { - Iterable parties = repository.findAll(new Sort(new Sort.Order(Sort.Direction.DESC, "desc").ignoreCase())).collectList().block(); + Iterable parties = repository.findAll(Sort.by(new Sort.Order(Sort.Direction.DESC, "desc").ignoreCase())).collectList().block(); String previousDesc = null; for(Party party : parties) { if (previousDesc != null) { diff --git a/src/integration/java/org/springframework/data/couchbase/repository/ReactivePartyRepository.java b/src/test/java/org/springframework/data/couchbase/repository/ReactivePartyRepository.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/ReactivePartyRepository.java rename to src/test/java/org/springframework/data/couchbase/repository/ReactivePartyRepository.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/ReactivePartySortingRepository.java b/src/test/java/org/springframework/data/couchbase/repository/ReactivePartySortingRepository.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/ReactivePartySortingRepository.java rename to src/test/java/org/springframework/data/couchbase/repository/ReactivePartySortingRepository.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/ReactiveUser.java b/src/test/java/org/springframework/data/couchbase/repository/ReactiveUser.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/ReactiveUser.java rename to src/test/java/org/springframework/data/couchbase/repository/ReactiveUser.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/ReactiveUserRepository.java b/src/test/java/org/springframework/data/couchbase/repository/ReactiveUserRepository.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/ReactiveUserRepository.java rename to src/test/java/org/springframework/data/couchbase/repository/ReactiveUserRepository.java diff --git a/src/test/java/org/springframework/data/couchbase/repository/RepositoryIndexUsageTest.java b/src/test/java/org/springframework/data/couchbase/repository/RepositoryIndexUsageTest.java index 05a5e988..322e2491 100644 --- a/src/test/java/org/springframework/data/couchbase/repository/RepositoryIndexUsageTest.java +++ b/src/test/java/org/springframework/data/couchbase/repository/RepositoryIndexUsageTest.java @@ -55,6 +55,8 @@ public class RepositoryIndexUsageTest { CouchbaseConverter mockConverter = mock(CouchbaseConverter.class); when(mockConverter.getTypeKey()).thenReturn("mockType"); + when(mockConverter.convertForWriteIfNeeded(any(Object.class))).thenAnswer( + invocation -> invocation.getArgument(0)); couchbaseOperations = mock(CouchbaseOperations.class); when(couchbaseOperations.getDefaultConsistency()).thenReturn(CONSISTENCY); @@ -184,4 +186,4 @@ public class RepositoryIndexUsageTest { verify(couchbaseOperations).remove("id1"); verify(couchbaseOperations).remove("id2"); } -} \ No newline at end of file +} diff --git a/src/integration/java/org/springframework/data/couchbase/repository/SimpleCouchbaseRepositoryTests.java b/src/test/java/org/springframework/data/couchbase/repository/SimpleCouchbaseRepositoryIntegrationTests.java similarity index 97% rename from src/integration/java/org/springframework/data/couchbase/repository/SimpleCouchbaseRepositoryTests.java rename to src/test/java/org/springframework/data/couchbase/repository/SimpleCouchbaseRepositoryIntegrationTests.java index f7fe6f64..b895e1c5 100644 --- a/src/integration/java/org/springframework/data/couchbase/repository/SimpleCouchbaseRepositoryTests.java +++ b/src/test/java/org/springframework/data/couchbase/repository/SimpleCouchbaseRepositoryIntegrationTests.java @@ -17,6 +17,7 @@ package org.springframework.data.couchbase.repository; import static org.junit.Assert.*; +import static org.springframework.data.couchbase.CouchbaseTestHelper.getRepositoryWithRetry; import java.util.Arrays; import java.util.List; @@ -60,7 +61,7 @@ import com.couchbase.client.java.view.ViewQuery; @RunWith(ContainerResourceRunner.class) @ContextConfiguration(classes = IntegrationTestApplicationConfig.class) @TestExecutionListeners(SimpleCouchbaseRepositoryListener.class) -public class SimpleCouchbaseRepositoryTests { +public class SimpleCouchbaseRepositoryIntegrationTests { @Rule public TestName testName = new TestName(); @@ -80,8 +81,8 @@ public class SimpleCouchbaseRepositoryTests { @Before public void setup() throws Exception { RepositoryFactorySupport factory = new CouchbaseRepositoryFactory(operationsMapping, indexManager); - repository = factory.getRepository(UserRepository.class); - versionedDataRepository = factory.getRepository(VersionedDataRepository.class); + repository = getRepositoryWithRetry(factory, UserRepository.class); + versionedDataRepository = getRepositoryWithRetry(factory, VersionedDataRepository.class); } private void remove(String key) { diff --git a/src/integration/java/org/springframework/data/couchbase/repository/SimpleCouchbaseRepositoryListener.java b/src/test/java/org/springframework/data/couchbase/repository/SimpleCouchbaseRepositoryListener.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/SimpleCouchbaseRepositoryListener.java rename to src/test/java/org/springframework/data/couchbase/repository/SimpleCouchbaseRepositoryListener.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/SimpleReactiveCouchbaseRepositoryTests.java b/src/test/java/org/springframework/data/couchbase/repository/SimpleReactiveCouchbaseRepositoryIntegrationTests.java similarity index 96% rename from src/integration/java/org/springframework/data/couchbase/repository/SimpleReactiveCouchbaseRepositoryTests.java rename to src/test/java/org/springframework/data/couchbase/repository/SimpleReactiveCouchbaseRepositoryIntegrationTests.java index 74ef0598..d1fcfe6a 100644 --- a/src/integration/java/org/springframework/data/couchbase/repository/SimpleReactiveCouchbaseRepositoryTests.java +++ b/src/test/java/org/springframework/data/couchbase/repository/SimpleReactiveCouchbaseRepositoryIntegrationTests.java @@ -16,6 +16,7 @@ package org.springframework.data.couchbase.repository; import static org.junit.Assert.*; +import static org.springframework.data.couchbase.CouchbaseTestHelper.getRepositoryWithRetry; import java.util.Arrays; import java.util.List; @@ -47,7 +48,7 @@ import com.couchbase.client.java.view.ViewQuery; @RunWith(ContainerResourceRunner.class) @ContextConfiguration(classes = ReactiveIntegrationTestApplicationConfig.class) @TestExecutionListeners(SimpleReactiveCouchbaseRepositoryListener.class) -public class SimpleReactiveCouchbaseRepositoryTests { +public class SimpleReactiveCouchbaseRepositoryIntegrationTests { @Rule public TestName testName = new TestName(); @@ -66,7 +67,7 @@ public class SimpleReactiveCouchbaseRepositoryTests { @Before public void setup() throws Exception { ReactiveRepositoryFactorySupport factory = new ReactiveCouchbaseRepositoryFactory(operationsMapping, indexManager); - repository = factory.getRepository(ReactiveUserRepository.class); + repository = getRepositoryWithRetry(factory, ReactiveUserRepository.class); } private void remove(String key) { diff --git a/src/integration/java/org/springframework/data/couchbase/repository/SimpleReactiveCouchbaseRepositoryListener.java b/src/test/java/org/springframework/data/couchbase/repository/SimpleReactiveCouchbaseRepositoryListener.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/SimpleReactiveCouchbaseRepositoryListener.java rename to src/test/java/org/springframework/data/couchbase/repository/SimpleReactiveCouchbaseRepositoryListener.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/User.java b/src/test/java/org/springframework/data/couchbase/repository/User.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/User.java rename to src/test/java/org/springframework/data/couchbase/repository/User.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/UserRepository.java b/src/test/java/org/springframework/data/couchbase/repository/UserRepository.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/UserRepository.java rename to src/test/java/org/springframework/data/couchbase/repository/UserRepository.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/auditing/AuditedApplicationConfig.java b/src/test/java/org/springframework/data/couchbase/repository/auditing/AuditedApplicationConfig.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/auditing/AuditedApplicationConfig.java rename to src/test/java/org/springframework/data/couchbase/repository/auditing/AuditedApplicationConfig.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/auditing/AuditedAuditorAware.java b/src/test/java/org/springframework/data/couchbase/repository/auditing/AuditedAuditorAware.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/auditing/AuditedAuditorAware.java rename to src/test/java/org/springframework/data/couchbase/repository/auditing/AuditedAuditorAware.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/auditing/AuditedItem.java b/src/test/java/org/springframework/data/couchbase/repository/auditing/AuditedItem.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/auditing/AuditedItem.java rename to src/test/java/org/springframework/data/couchbase/repository/auditing/AuditedItem.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/auditing/AuditedRepository.java b/src/test/java/org/springframework/data/couchbase/repository/auditing/AuditedRepository.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/auditing/AuditedRepository.java rename to src/test/java/org/springframework/data/couchbase/repository/auditing/AuditedRepository.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/auditing/AuditingTests.java b/src/test/java/org/springframework/data/couchbase/repository/auditing/AuditingIntegrationTests.java similarity index 98% rename from src/integration/java/org/springframework/data/couchbase/repository/auditing/AuditingTests.java rename to src/test/java/org/springframework/data/couchbase/repository/auditing/AuditingIntegrationTests.java index 6a7acb0e..3e5237ab 100644 --- a/src/integration/java/org/springframework/data/couchbase/repository/auditing/AuditingTests.java +++ b/src/test/java/org/springframework/data/couchbase/repository/auditing/AuditingIntegrationTests.java @@ -23,7 +23,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; */ @RunWith(ContainerResourceRunner.class) @ContextConfiguration(classes = AuditedApplicationConfig.class) -public class AuditingTests { +public class AuditingIntegrationTests { @Autowired private AuditedRepository repository; diff --git a/src/integration/java/org/springframework/data/couchbase/repository/cdi/CdiPersonFragment.java b/src/test/java/org/springframework/data/couchbase/repository/cdi/CdiPersonFragment.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/cdi/CdiPersonFragment.java rename to src/test/java/org/springframework/data/couchbase/repository/cdi/CdiPersonFragment.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/cdi/CdiPersonFragmentImpl.java b/src/test/java/org/springframework/data/couchbase/repository/cdi/CdiPersonFragmentImpl.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/cdi/CdiPersonFragmentImpl.java rename to src/test/java/org/springframework/data/couchbase/repository/cdi/CdiPersonFragmentImpl.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/cdi/CdiPersonRepository.java b/src/test/java/org/springframework/data/couchbase/repository/cdi/CdiPersonRepository.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/cdi/CdiPersonRepository.java rename to src/test/java/org/springframework/data/couchbase/repository/cdi/CdiPersonRepository.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/cdi/CdiRepositoryClient.java b/src/test/java/org/springframework/data/couchbase/repository/cdi/CdiRepositoryClient.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/cdi/CdiRepositoryClient.java rename to src/test/java/org/springframework/data/couchbase/repository/cdi/CdiRepositoryClient.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/cdi/CdiRepositoryTests.java b/src/test/java/org/springframework/data/couchbase/repository/cdi/CdiRepositoryIntegrationTests.java similarity index 97% rename from src/integration/java/org/springframework/data/couchbase/repository/cdi/CdiRepositoryTests.java rename to src/test/java/org/springframework/data/couchbase/repository/cdi/CdiRepositoryIntegrationTests.java index 10df0ad6..f1fb01ff 100644 --- a/src/integration/java/org/springframework/data/couchbase/repository/cdi/CdiRepositoryTests.java +++ b/src/test/java/org/springframework/data/couchbase/repository/cdi/CdiRepositoryIntegrationTests.java @@ -42,8 +42,8 @@ import javax.enterprise.inject.se.SeContainerInitializer; */ @SuppressWarnings("SpringJavaAutowiringInspection") @RunWith(ContainerResourceRunner.class) -@ContextConfiguration(classes = CdiRepositoryTests.class) -public class CdiRepositoryTests { +@ContextConfiguration(classes = CdiRepositoryIntegrationTests.class) +public class CdiRepositoryIntegrationTests { private static SeContainer cdiContainer; private CdiPersonRepository repository; diff --git a/src/integration/java/org/springframework/data/couchbase/repository/cdi/CouchbaseClientProducer.java b/src/test/java/org/springframework/data/couchbase/repository/cdi/CouchbaseClientProducer.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/cdi/CouchbaseClientProducer.java rename to src/test/java/org/springframework/data/couchbase/repository/cdi/CouchbaseClientProducer.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/cdi/CouchbaseClusterInfoProducer.java b/src/test/java/org/springframework/data/couchbase/repository/cdi/CouchbaseClusterInfoProducer.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/cdi/CouchbaseClusterInfoProducer.java rename to src/test/java/org/springframework/data/couchbase/repository/cdi/CouchbaseClusterInfoProducer.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/cdi/CouchbaseOperationsProducer.java b/src/test/java/org/springframework/data/couchbase/repository/cdi/CouchbaseOperationsProducer.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/cdi/CouchbaseOperationsProducer.java rename to src/test/java/org/springframework/data/couchbase/repository/cdi/CouchbaseOperationsProducer.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/cdi/OtherQualifier.java b/src/test/java/org/springframework/data/couchbase/repository/cdi/OtherQualifier.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/cdi/OtherQualifier.java rename to src/test/java/org/springframework/data/couchbase/repository/cdi/OtherQualifier.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/cdi/Person.java b/src/test/java/org/springframework/data/couchbase/repository/cdi/Person.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/cdi/Person.java rename to src/test/java/org/springframework/data/couchbase/repository/cdi/Person.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/cdi/PersonDB.java b/src/test/java/org/springframework/data/couchbase/repository/cdi/PersonDB.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/cdi/PersonDB.java rename to src/test/java/org/springframework/data/couchbase/repository/cdi/PersonDB.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/cdi/QualifiedPersonRepository.java b/src/test/java/org/springframework/data/couchbase/repository/cdi/QualifiedPersonRepository.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/cdi/QualifiedPersonRepository.java rename to src/test/java/org/springframework/data/couchbase/repository/cdi/QualifiedPersonRepository.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/extending/base/RepositoryBaseTest.java b/src/test/java/org/springframework/data/couchbase/repository/extending/base/RepositoryBaseIntegrationTests.java similarity index 98% rename from src/integration/java/org/springframework/data/couchbase/repository/extending/base/RepositoryBaseTest.java rename to src/test/java/org/springframework/data/couchbase/repository/extending/base/RepositoryBaseIntegrationTests.java index 436d3fef..be18afa9 100644 --- a/src/integration/java/org/springframework/data/couchbase/repository/extending/base/RepositoryBaseTest.java +++ b/src/test/java/org/springframework/data/couchbase/repository/extending/base/RepositoryBaseIntegrationTests.java @@ -53,7 +53,7 @@ import org.springframework.test.context.ContextConfiguration; @SuppressWarnings("SpringJavaAutowiringInspection") @RunWith(ContainerResourceRunner.class) @ContextConfiguration -public class RepositoryBaseTest { +public class RepositoryBaseIntegrationTests { private static CouchbaseOperations mockOpsA; diff --git a/src/integration/java/org/springframework/data/couchbase/repository/extending/base/impl/MyRepository.java b/src/test/java/org/springframework/data/couchbase/repository/extending/base/impl/MyRepository.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/extending/base/impl/MyRepository.java rename to src/test/java/org/springframework/data/couchbase/repository/extending/base/impl/MyRepository.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/extending/base/impl/MyRepositoryImpl.java b/src/test/java/org/springframework/data/couchbase/repository/extending/base/impl/MyRepositoryImpl.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/extending/base/impl/MyRepositoryImpl.java rename to src/test/java/org/springframework/data/couchbase/repository/extending/base/impl/MyRepositoryImpl.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/extending/method/MyItem.java b/src/test/java/org/springframework/data/couchbase/repository/extending/method/MyItem.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/extending/method/MyItem.java rename to src/test/java/org/springframework/data/couchbase/repository/extending/method/MyItem.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/extending/method/MyRepository.java b/src/test/java/org/springframework/data/couchbase/repository/extending/method/MyRepository.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/extending/method/MyRepository.java rename to src/test/java/org/springframework/data/couchbase/repository/extending/method/MyRepository.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/extending/method/MyRepositoryCustom.java b/src/test/java/org/springframework/data/couchbase/repository/extending/method/MyRepositoryCustom.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/extending/method/MyRepositoryCustom.java rename to src/test/java/org/springframework/data/couchbase/repository/extending/method/MyRepositoryCustom.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/extending/method/MyRepositoryImpl.java b/src/test/java/org/springframework/data/couchbase/repository/extending/method/MyRepositoryImpl.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/extending/method/MyRepositoryImpl.java rename to src/test/java/org/springframework/data/couchbase/repository/extending/method/MyRepositoryImpl.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/extending/method/RepositoryCustomMethodTest.java b/src/test/java/org/springframework/data/couchbase/repository/extending/method/RepositoryCustomMethodIntegrationTests.java similarity index 98% rename from src/integration/java/org/springframework/data/couchbase/repository/extending/method/RepositoryCustomMethodTest.java rename to src/test/java/org/springframework/data/couchbase/repository/extending/method/RepositoryCustomMethodIntegrationTests.java index ac35117b..e4d1193e 100644 --- a/src/integration/java/org/springframework/data/couchbase/repository/extending/method/RepositoryCustomMethodTest.java +++ b/src/test/java/org/springframework/data/couchbase/repository/extending/method/RepositoryCustomMethodIntegrationTests.java @@ -40,7 +40,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @SuppressWarnings("SpringJavaAutowiringInspection") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration -public class RepositoryCustomMethodTest { +public class RepositoryCustomMethodIntegrationTests { @Autowired MyRepository repository; diff --git a/src/integration/java/org/springframework/data/couchbase/repository/feature/FeatureDetectionRepositoryTests.java b/src/test/java/org/springframework/data/couchbase/repository/feature/FeatureDetectionRepositoryIntegrationTests.java similarity index 94% rename from src/integration/java/org/springframework/data/couchbase/repository/feature/FeatureDetectionRepositoryTests.java rename to src/test/java/org/springframework/data/couchbase/repository/feature/FeatureDetectionRepositoryIntegrationTests.java index 2379f823..0508ecb0 100644 --- a/src/integration/java/org/springframework/data/couchbase/repository/feature/FeatureDetectionRepositoryTests.java +++ b/src/test/java/org/springframework/data/couchbase/repository/feature/FeatureDetectionRepositoryIntegrationTests.java @@ -19,6 +19,7 @@ package org.springframework.data.couchbase.repository.feature; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; +import static org.springframework.data.couchbase.CouchbaseTestHelper.getRepositoryWithRetry; import com.couchbase.client.java.cluster.ClusterInfo; import com.couchbase.client.java.query.N1qlQuery; @@ -49,7 +50,7 @@ import org.springframework.test.context.ContextConfiguration; */ @RunWith(ContainerResourceRunner.class) @ContextConfiguration(classes = FeatureDetectionTestApplicationConfig.class) -public class FeatureDetectionRepositoryTests { +public class FeatureDetectionRepositoryIntegrationTests { @Autowired private RepositoryOperationsMapping operationsMapping; @@ -79,7 +80,7 @@ public class FeatureDetectionRepositoryTests { @Test public void testN1qlIncompatibleClusterDoesntFailForViewBasedRepository() throws Exception { RepositoryFactorySupport factory = new CouchbaseRepositoryFactory(operationsMapping, indexManager); - ViewOnlyUserRepository repository = factory.getRepository(ViewOnlyUserRepository.class); + ViewOnlyUserRepository repository = getRepositoryWithRetry(factory, ViewOnlyUserRepository.class); assertNotNull(repository); } diff --git a/src/integration/java/org/springframework/data/couchbase/repository/feature/FeatureDetectionTestApplicationConfig.java b/src/test/java/org/springframework/data/couchbase/repository/feature/FeatureDetectionTestApplicationConfig.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/feature/FeatureDetectionTestApplicationConfig.java rename to src/test/java/org/springframework/data/couchbase/repository/feature/FeatureDetectionTestApplicationConfig.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/feature/ViewOnlyUserRepository.java b/src/test/java/org/springframework/data/couchbase/repository/feature/ViewOnlyUserRepository.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/feature/ViewOnlyUserRepository.java rename to src/test/java/org/springframework/data/couchbase/repository/feature/ViewOnlyUserRepository.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/index/AnotherIndexedUserRepository.java b/src/test/java/org/springframework/data/couchbase/repository/index/AnotherIndexedUserRepository.java similarity index 69% rename from src/integration/java/org/springframework/data/couchbase/repository/index/AnotherIndexedUserRepository.java rename to src/test/java/org/springframework/data/couchbase/repository/index/AnotherIndexedUserRepository.java index f1c02b37..70c68f42 100644 --- a/src/integration/java/org/springframework/data/couchbase/repository/index/AnotherIndexedUserRepository.java +++ b/src/test/java/org/springframework/data/couchbase/repository/index/AnotherIndexedUserRepository.java @@ -7,8 +7,8 @@ import org.springframework.data.couchbase.core.query.ViewIndexed; import org.springframework.data.couchbase.repository.CouchbaseRepository; import org.springframework.data.couchbase.repository.User; -@N1qlSecondaryIndexed(indexName = IndexedRepositoryTests.IGNORED_SECONDARY) -@ViewIndexed(designDoc = IndexedRepositoryTests.VIEW_DOC, viewName = IndexedRepositoryTests.IGNORED_VIEW_NAME) +@N1qlSecondaryIndexed(indexName = IndexedRepositoryIntegrationTests.IGNORED_SECONDARY) +@ViewIndexed(designDoc = IndexedRepositoryIntegrationTests.VIEW_DOC, viewName = IndexedRepositoryIntegrationTests.IGNORED_VIEW_NAME) public interface AnotherIndexedUserRepository extends CouchbaseRepository { public List findByAge(int age); diff --git a/src/integration/java/org/springframework/data/couchbase/repository/index/IndexedFooRepository.java b/src/test/java/org/springframework/data/couchbase/repository/index/IndexedFooRepository.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/index/IndexedFooRepository.java rename to src/test/java/org/springframework/data/couchbase/repository/index/IndexedFooRepository.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/index/IndexedRepositoryTests.java b/src/test/java/org/springframework/data/couchbase/repository/index/IndexedRepositoryIntegrationTests.java similarity index 88% rename from src/integration/java/org/springframework/data/couchbase/repository/index/IndexedRepositoryTests.java rename to src/test/java/org/springframework/data/couchbase/repository/index/IndexedRepositoryIntegrationTests.java index 43764f70..d3cf303e 100644 --- a/src/integration/java/org/springframework/data/couchbase/repository/index/IndexedRepositoryTests.java +++ b/src/test/java/org/springframework/data/couchbase/repository/index/IndexedRepositoryIntegrationTests.java @@ -17,6 +17,7 @@ package org.springframework.data.couchbase.repository.index; import static org.junit.Assert.*; +import static org.springframework.data.couchbase.CouchbaseTestHelper.getRepositoryWithRetry; import java.util.Arrays; @@ -30,7 +31,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -; import org.springframework.data.couchbase.ContainerResourceRunner; import org.springframework.data.couchbase.IntegrationTestApplicationConfig; import org.springframework.data.couchbase.core.CouchbaseOperations; @@ -50,7 +50,7 @@ import org.springframework.test.context.TestExecutionListeners; @RunWith(ContainerResourceRunner.class) @ContextConfiguration(classes = IntegrationTestApplicationConfig.class) @TestExecutionListeners(IndexedRepositoryTestListener.class) -public class IndexedRepositoryTests { +public class IndexedRepositoryIntegrationTests { public static final String SECONDARY = "autogeneratedIndexIndexedUserN1qlSecondary"; public static final String VIEW_DOC = "autogeneratedIndex"; @@ -80,7 +80,7 @@ public class IndexedRepositoryTests { @Test public void shouldFindN1qlPrimaryIndex() { - IndexedUserRepository repository = factory.getRepository(IndexedUserRepository.class); + IndexedUserRepository repository = getRepositoryWithRetry(factory, IndexedUserRepository.class); String bucket = template.getCouchbaseBucket().name(); N1qlQuery existQuery = N1qlQuery.simple("SELECT 1 FROM `"+ bucket +"`"); @@ -91,7 +91,7 @@ public class IndexedRepositoryTests { @Test public void shouldFindN1qlSecondaryIndex() { - IndexedUserRepository repository = factory.getRepository(IndexedUserRepository.class); + IndexedUserRepository repository = getRepositoryWithRetry(factory, IndexedUserRepository.class); String bucket = template.getCouchbaseBucket().name(); N1qlQuery existQuery = N1qlQuery.simple("SELECT 1 FROM `"+ bucket +"` USE INDEX (" + SECONDARY +")"); @@ -102,7 +102,7 @@ public class IndexedRepositoryTests { @Test public void shouldFindViewIndex() { - IndexedUserRepository repository = factory.getRepository(IndexedUserRepository.class); + IndexedUserRepository repository = getRepositoryWithRetry(factory, IndexedUserRepository.class); DesignDocument designDoc = null; try { @@ -121,7 +121,7 @@ public class IndexedRepositoryTests { } @Test public void shouldNotFindN1qlSecondaryIndexWithIgnoringIndexManager() { - AnotherIndexedUserRepository repository = ignoringIndexFactory.getRepository(AnotherIndexedUserRepository.class); + AnotherIndexedUserRepository repository = getRepositoryWithRetry(ignoringIndexFactory, AnotherIndexedUserRepository.class); String bucket = template.getCouchbaseBucket().name(); N1qlQuery existQuery = N1qlQuery.simple("SELECT 1 FROM `"+ bucket +"` USE INDEX (" + IGNORED_SECONDARY +")"); @@ -132,7 +132,7 @@ public class IndexedRepositoryTests { @Test public void shouldNotFindViewIndexWithIgnoringIndexManager() { - AnotherIndexedUserRepository repository = ignoringIndexFactory.getRepository(AnotherIndexedUserRepository.class); + AnotherIndexedUserRepository repository = getRepositoryWithRetry(ignoringIndexFactory, AnotherIndexedUserRepository.class); DesignDocument designDoc = null; try { @@ -155,7 +155,7 @@ public class IndexedRepositoryTests { IndexedFooRepository.Foo foo1 = new IndexedFooRepository.Foo("foo1", "foo", 1); IndexedFooRepository.Foo foo2 = new IndexedFooRepository.Foo("foo2", "bar", 2); - IndexedFooRepository repository = factory.getRepository(IndexedFooRepository.class); + IndexedFooRepository repository = getRepositoryWithRetry(factory, IndexedFooRepository.class); DesignDocument designDoc = template.getCouchbaseBucket() .bucketManager() diff --git a/src/integration/java/org/springframework/data/couchbase/repository/index/IndexedRepositoryTestListener.java b/src/test/java/org/springframework/data/couchbase/repository/index/IndexedRepositoryTestListener.java similarity index 89% rename from src/integration/java/org/springframework/data/couchbase/repository/index/IndexedRepositoryTestListener.java rename to src/test/java/org/springframework/data/couchbase/repository/index/IndexedRepositoryTestListener.java index dfc04efb..626ec0f0 100644 --- a/src/integration/java/org/springframework/data/couchbase/repository/index/IndexedRepositoryTestListener.java +++ b/src/test/java/org/springframework/data/couchbase/repository/index/IndexedRepositoryTestListener.java @@ -10,7 +10,7 @@ import org.springframework.test.context.TestContext; import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; /** - * A test listener that will remove the indexes created in {@link IndexedRepositoryTests} before test case is run. + * A test listener that will remove the indexes created in {@link IndexedRepositoryIntegrationTests} before test case is run. * * @author Simon Baslé */ @@ -20,12 +20,12 @@ public class IndexedRepositoryTestListener extends DependencyInjectionTestExecut public void beforeTestClass(final TestContext testContext) throws Exception { Bucket client = (Bucket) testContext.getApplicationContext().getBean(BeanNames.COUCHBASE_BUCKET); try { - client.bucketManager().removeDesignDocument(IndexedRepositoryTests.VIEW_DOC); + client.bucketManager().removeDesignDocument(IndexedRepositoryIntegrationTests.VIEW_DOC); client.bucketManager().removeDesignDocument("foo"); } catch (DesignDocumentDoesNotExistException ex) { //ignore } client.query(N1qlQuery.simple(Index.dropPrimaryIndex(client.name()))); - client.query(N1qlQuery.simple(Index.dropIndex(client.name(), IndexedRepositoryTests.SECONDARY))); + client.query(N1qlQuery.simple(Index.dropIndex(client.name(), IndexedRepositoryIntegrationTests.SECONDARY))); } } diff --git a/src/integration/java/org/springframework/data/couchbase/repository/index/IndexedUserRepository.java b/src/test/java/org/springframework/data/couchbase/repository/index/IndexedUserRepository.java similarity index 71% rename from src/integration/java/org/springframework/data/couchbase/repository/index/IndexedUserRepository.java rename to src/test/java/org/springframework/data/couchbase/repository/index/IndexedUserRepository.java index bc3645ee..a4b8e7d7 100644 --- a/src/integration/java/org/springframework/data/couchbase/repository/index/IndexedUserRepository.java +++ b/src/test/java/org/springframework/data/couchbase/repository/index/IndexedUserRepository.java @@ -7,7 +7,7 @@ import org.springframework.data.couchbase.repository.CouchbaseRepository; import org.springframework.data.couchbase.repository.User; @N1qlPrimaryIndexed -@N1qlSecondaryIndexed(indexName = IndexedRepositoryTests.SECONDARY) -@ViewIndexed(designDoc = IndexedRepositoryTests.VIEW_DOC, viewName = IndexedRepositoryTests.VIEW_NAME) +@N1qlSecondaryIndexed(indexName = IndexedRepositoryIntegrationTests.SECONDARY) +@ViewIndexed(designDoc = IndexedRepositoryIntegrationTests.VIEW_DOC, viewName = IndexedRepositoryIntegrationTests.VIEW_NAME) public interface IndexedUserRepository extends CouchbaseRepository { } diff --git a/src/integration/java/org/springframework/data/couchbase/repository/join/Address.java b/src/test/java/org/springframework/data/couchbase/repository/join/Address.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/join/Address.java rename to src/test/java/org/springframework/data/couchbase/repository/join/Address.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/join/AddressRepository.java b/src/test/java/org/springframework/data/couchbase/repository/join/AddressRepository.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/join/AddressRepository.java rename to src/test/java/org/springframework/data/couchbase/repository/join/AddressRepository.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/join/Author.java b/src/test/java/org/springframework/data/couchbase/repository/join/Author.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/join/Author.java rename to src/test/java/org/springframework/data/couchbase/repository/join/Author.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/join/AuthorAndBookPopulatorListener.java b/src/test/java/org/springframework/data/couchbase/repository/join/AuthorAndBookPopulatorListener.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/join/AuthorAndBookPopulatorListener.java rename to src/test/java/org/springframework/data/couchbase/repository/join/AuthorAndBookPopulatorListener.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/join/AuthorRepository.java b/src/test/java/org/springframework/data/couchbase/repository/join/AuthorRepository.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/join/AuthorRepository.java rename to src/test/java/org/springframework/data/couchbase/repository/join/AuthorRepository.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/join/Book.java b/src/test/java/org/springframework/data/couchbase/repository/join/Book.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/join/Book.java rename to src/test/java/org/springframework/data/couchbase/repository/join/Book.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/join/BookRepository.java b/src/test/java/org/springframework/data/couchbase/repository/join/BookRepository.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/join/BookRepository.java rename to src/test/java/org/springframework/data/couchbase/repository/join/BookRepository.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/join/N1qlJoinTests.java b/src/test/java/org/springframework/data/couchbase/repository/join/N1qlJoinIntegrationTests.java similarity index 88% rename from src/integration/java/org/springframework/data/couchbase/repository/join/N1qlJoinTests.java rename to src/test/java/org/springframework/data/couchbase/repository/join/N1qlJoinIntegrationTests.java index c9b185a8..d6789c77 100644 --- a/src/integration/java/org/springframework/data/couchbase/repository/join/N1qlJoinTests.java +++ b/src/test/java/org/springframework/data/couchbase/repository/join/N1qlJoinIntegrationTests.java @@ -29,6 +29,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; import static org.junit.Assert.*; +import static org.springframework.data.couchbase.CouchbaseTestHelper.getRepositoryWithRetry; /** * N1ql Join tests @@ -39,7 +40,7 @@ import static org.junit.Assert.*; @RunWith(ContainerResourceRunner.class) @ContextConfiguration(classes = IntegrationTestApplicationConfig.class) @TestExecutionListeners(listeners = {AuthorAndBookPopulatorListener.class}) -public class N1qlJoinTests { +public class N1qlJoinIntegrationTests { @Autowired private RepositoryOperationsMapping operationsMapping; @@ -56,9 +57,9 @@ public class N1qlJoinTests { @Before public void setup() throws Exception { RepositoryFactorySupport factory = new CouchbaseRepositoryFactory(operationsMapping, indexManager); - bookRepository = factory.getRepository(BookRepository.class); - authorRepository = factory.getRepository(AuthorRepository.class); - addressRepository = factory.getRepository(AddressRepository.class); + bookRepository = getRepositoryWithRetry(factory, BookRepository.class); + authorRepository = getRepositoryWithRetry(factory, AuthorRepository.class); + addressRepository = getRepositoryWithRetry(factory, AddressRepository.class); } @Test @@ -82,4 +83,4 @@ public class N1qlJoinTests { assertTrue(saveda.books.isEmpty()); assertNull(saveda.address); } -} \ No newline at end of file +} diff --git a/src/integration/java/org/springframework/data/couchbase/repository/spel/SpelConfig.java b/src/test/java/org/springframework/data/couchbase/repository/spel/SpelConfig.java similarity index 81% rename from src/integration/java/org/springframework/data/couchbase/repository/spel/SpelConfig.java rename to src/test/java/org/springframework/data/couchbase/repository/spel/SpelConfig.java index 76422a4e..4a159e54 100644 --- a/src/integration/java/org/springframework/data/couchbase/repository/spel/SpelConfig.java +++ b/src/test/java/org/springframework/data/couchbase/repository/spel/SpelConfig.java @@ -7,8 +7,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.couchbase.IntegrationTestApplicationConfig; import org.springframework.data.couchbase.repository.config.EnableCouchbaseRepositories; -import org.springframework.data.repository.query.spi.EvaluationContextExtension; -import org.springframework.data.repository.query.spi.EvaluationContextExtensionSupport; +import org.springframework.data.spel.spi.EvaluationContextExtension; @Configuration @EnableCouchbaseRepositories @@ -19,7 +18,7 @@ public class SpelConfig extends IntegrationTestApplicationConfig { return new CustomSpelExtension(); } - public static class CustomSpelExtension extends EvaluationContextExtensionSupport { + public static class CustomSpelExtension implements EvaluationContextExtension { /** * Returns the identifier of the extension. The id can be leveraged by users to fully qualify property lookups and diff --git a/src/integration/java/org/springframework/data/couchbase/repository/spel/SpelRepository.java b/src/test/java/org/springframework/data/couchbase/repository/spel/SpelRepository.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/spel/SpelRepository.java rename to src/test/java/org/springframework/data/couchbase/repository/spel/SpelRepository.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/spel/SpelRepositoryTests.java b/src/test/java/org/springframework/data/couchbase/repository/spel/SpelRepositoryIntegrationTests.java similarity index 98% rename from src/integration/java/org/springframework/data/couchbase/repository/spel/SpelRepositoryTests.java rename to src/test/java/org/springframework/data/couchbase/repository/spel/SpelRepositoryIntegrationTests.java index 3b3398a3..9b34e411 100644 --- a/src/integration/java/org/springframework/data/couchbase/repository/spel/SpelRepositoryTests.java +++ b/src/test/java/org/springframework/data/couchbase/repository/spel/SpelRepositoryIntegrationTests.java @@ -42,7 +42,7 @@ import org.springframework.test.context.TestExecutionListeners; @RunWith(ContainerResourceRunner.class) @ContextConfiguration(classes = SpelConfig.class) @TestExecutionListeners(SimpleCouchbaseRepositoryListener.class) -public class SpelRepositoryTests { +public class SpelRepositoryIntegrationTests { @Autowired private Bucket client; diff --git a/src/integration/java/org/springframework/data/couchbase/repository/wiring/RepositoryTemplateWiringTests.java b/src/test/java/org/springframework/data/couchbase/repository/wiring/RepositoryTemplateWiringIntegrationTests.java similarity index 97% rename from src/integration/java/org/springframework/data/couchbase/repository/wiring/RepositoryTemplateWiringTests.java rename to src/test/java/org/springframework/data/couchbase/repository/wiring/RepositoryTemplateWiringIntegrationTests.java index df8ae202..19f8774e 100644 --- a/src/integration/java/org/springframework/data/couchbase/repository/wiring/RepositoryTemplateWiringTests.java +++ b/src/test/java/org/springframework/data/couchbase/repository/wiring/RepositoryTemplateWiringIntegrationTests.java @@ -42,7 +42,7 @@ import org.springframework.test.context.ContextConfiguration; @SuppressWarnings("SpringJavaAutowiringInspection") @RunWith(ContainerResourceRunner.class) @ContextConfiguration -public class RepositoryTemplateWiringTests { +public class RepositoryTemplateWiringIntegrationTests { private static CouchbaseOperations mockOpsA; private static CouchbaseOperations mockOpsB; @@ -83,7 +83,7 @@ public class RepositoryTemplateWiringTests { BucketCRepository repositoryC; @Configuration - @EnableCouchbaseRepositories(basePackageClasses = RepositoryTemplateWiringTests.class, considerNestedRepositories = true) + @EnableCouchbaseRepositories(basePackageClasses = RepositoryTemplateWiringIntegrationTests.class, considerNestedRepositories = true) static class Config extends AbstractCouchbaseConfiguration { @Override diff --git a/src/integration/java/org/springframework/data/couchbase/repository/xmlconfig/XmlItemRepository.java b/src/test/java/org/springframework/data/couchbase/repository/xmlconfig/XmlItemRepository.java similarity index 100% rename from src/integration/java/org/springframework/data/couchbase/repository/xmlconfig/XmlItemRepository.java rename to src/test/java/org/springframework/data/couchbase/repository/xmlconfig/XmlItemRepository.java diff --git a/src/integration/java/org/springframework/data/couchbase/repository/xmlconfig/XmlRepositoryConfigurationTests.java b/src/test/java/org/springframework/data/couchbase/repository/xmlconfig/XmlRepositoryConfigurationIntegrationTests.java similarity index 92% rename from src/integration/java/org/springframework/data/couchbase/repository/xmlconfig/XmlRepositoryConfigurationTests.java rename to src/test/java/org/springframework/data/couchbase/repository/xmlconfig/XmlRepositoryConfigurationIntegrationTests.java index d365be47..80f63cec 100644 --- a/src/integration/java/org/springframework/data/couchbase/repository/xmlconfig/XmlRepositoryConfigurationTests.java +++ b/src/test/java/org/springframework/data/couchbase/repository/xmlconfig/XmlRepositoryConfigurationIntegrationTests.java @@ -20,8 +20,8 @@ import org.springframework.test.context.ContextConfiguration; */ @SuppressWarnings("SpringJavaAutowiringInspection") @RunWith(ContainerResourceRunner.class) -@ContextConfiguration(classes = XmlRepositoryConfigurationTests.class) -public class XmlRepositoryConfigurationTests { +@ContextConfiguration(classes = XmlRepositoryConfigurationIntegrationTests.class) +public class XmlRepositoryConfigurationIntegrationTests { DefaultListableBeanFactory factory; BeanDefinitionReader reader; diff --git a/src/integration/kotlin/org/springframework/data/couchbase/core/CouchbaseOperationsExtensionsTest.kt b/src/test/kotlin/org/springframework/data/couchbase/core/CouchbaseOperationsExtensionsIntegrationTest.kt similarity index 94% rename from src/integration/kotlin/org/springframework/data/couchbase/core/CouchbaseOperationsExtensionsTest.kt rename to src/test/kotlin/org/springframework/data/couchbase/core/CouchbaseOperationsExtensionsIntegrationTest.kt index efc6fd56..145f0225 100644 --- a/src/integration/kotlin/org/springframework/data/couchbase/core/CouchbaseOperationsExtensionsTest.kt +++ b/src/test/kotlin/org/springframework/data/couchbase/core/CouchbaseOperationsExtensionsIntegrationTest.kt @@ -11,7 +11,7 @@ import kotlin.test.assertEquals @RunWith(ContainerResourceRunner::class) @ContextConfiguration(classes = [IntegrationTestApplicationConfig::class]) -class CouchbaseOperationsExtensionsTest { +class CouchbaseOperationsExtensionsIntegrationTest { @Autowired lateinit var template: CouchbaseTemplate @@ -29,4 +29,4 @@ class CouchbaseOperationsExtensionsTest { @Id var id = id } -} \ No newline at end of file +} diff --git a/src/integration/kotlin/org/springframework/data/couchbase/core/RxJavaCouchbaseOperationsExtensionsTest.kt b/src/test/kotlin/org/springframework/data/couchbase/core/RxJavaCouchbaseOperationsExtensionsIntegrationTest.kt similarity index 95% rename from src/integration/kotlin/org/springframework/data/couchbase/core/RxJavaCouchbaseOperationsExtensionsTest.kt rename to src/test/kotlin/org/springframework/data/couchbase/core/RxJavaCouchbaseOperationsExtensionsIntegrationTest.kt index cf72563f..f05e34f0 100644 --- a/src/integration/kotlin/org/springframework/data/couchbase/core/RxJavaCouchbaseOperationsExtensionsTest.kt +++ b/src/test/kotlin/org/springframework/data/couchbase/core/RxJavaCouchbaseOperationsExtensionsIntegrationTest.kt @@ -13,7 +13,7 @@ import kotlin.test.assertEquals @RunWith(ContainerResourceRunner::class) @ContextConfiguration(classes = [ReactiveIntegrationTestApplicationConfig::class]) -class RxJavaCouchbaseOperationsExtensionsTest { +class RxJavaCouchbaseOperationsExtensionsIntegrationTest { @Autowired lateinit var template: RxJavaCouchbaseTemplate diff --git a/src/integration/resources/configurations/couchbase-consistency.xml b/src/test/resources/configurations/couchbase-consistency.xml similarity index 100% rename from src/integration/resources/configurations/couchbase-consistency.xml rename to src/test/resources/configurations/couchbase-consistency.xml diff --git a/src/integration/resources/configurations/couchbase-multi-bucket-bean.xml b/src/test/resources/configurations/couchbase-multi-bucket-bean.xml similarity index 100% rename from src/integration/resources/configurations/couchbase-multi-bucket-bean.xml rename to src/test/resources/configurations/couchbase-multi-bucket-bean.xml diff --git a/src/integration/resources/configurations/couchbase-repository-bean.xml b/src/test/resources/configurations/couchbase-repository-bean.xml similarity index 100% rename from src/integration/resources/configurations/couchbase-repository-bean.xml rename to src/test/resources/configurations/couchbase-repository-bean.xml diff --git a/src/integration/resources/configurations/couchbase-template-bean.xml b/src/test/resources/configurations/couchbase-template-bean.xml similarity index 100% rename from src/integration/resources/configurations/couchbase-template-bean.xml rename to src/test/resources/configurations/couchbase-template-bean.xml diff --git a/src/integration/resources/configurations/couchbase-template-with-translation-service-bean.xml b/src/test/resources/configurations/couchbase-template-with-translation-service-bean.xml similarity index 100% rename from src/integration/resources/configurations/couchbase-template-with-translation-service-bean.xml rename to src/test/resources/configurations/couchbase-template-with-translation-service-bean.xml diff --git a/src/integration/resources/configurations/couchbase-typekey.xml b/src/test/resources/configurations/couchbase-typekey.xml similarity index 100% rename from src/integration/resources/configurations/couchbase-typekey.xml rename to src/test/resources/configurations/couchbase-typekey.xml diff --git a/src/integration/resources/server.properties b/src/test/resources/server.properties similarity index 100% rename from src/integration/resources/server.properties rename to src/test/resources/server.properties