diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/surety/OrganizationEmailTemplateManagerIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/surety/OrganizationEmailTemplateManagerIT.java index 7dee542270..5d464f26c8 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/surety/OrganizationEmailTemplateManagerIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/surety/OrganizationEmailTemplateManagerIT.java @@ -27,7 +27,7 @@ import org.gbif.registry.mail.organization.OrganizationEmailManager; import org.gbif.registry.mail.organization.OrganizationEmailTemplateProcessor; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import org.gbif.registry.ws.it.BaseItTest; import org.gbif.registry.ws.it.RegistryIntegrationTestsConfiguration; import org.gbif.ws.client.filter.SimplePrincipalProvider; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/test/data/Comments.java b/registry-integration-tests/src/test/java/org/gbif/registry/test/Comments.java similarity index 97% rename from registry-integration-tests/src/test/java/org/gbif/registry/test/data/Comments.java rename to registry-integration-tests/src/test/java/org/gbif/registry/test/Comments.java index 876bedb371..3a09b45886 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/test/data/Comments.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/test/Comments.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gbif.registry.test.data; +package org.gbif.registry.test; import org.gbif.api.model.registry.Comment; import org.gbif.ws.client.filter.SimplePrincipalProvider; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/test/data/Contacts.java b/registry-integration-tests/src/test/java/org/gbif/registry/test/Contacts.java similarity index 97% rename from registry-integration-tests/src/test/java/org/gbif/registry/test/data/Contacts.java rename to registry-integration-tests/src/test/java/org/gbif/registry/test/Contacts.java index ce573778a9..1f5c5bddc2 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/test/data/Contacts.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/test/Contacts.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gbif.registry.test.data; +package org.gbif.registry.test; import org.gbif.api.model.registry.Contact; import org.gbif.ws.client.filter.SimplePrincipalProvider; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/test/data/Datasets.java b/registry-integration-tests/src/test/java/org/gbif/registry/test/Datasets.java similarity index 99% rename from registry-integration-tests/src/test/java/org/gbif/registry/test/data/Datasets.java rename to registry-integration-tests/src/test/java/org/gbif/registry/test/Datasets.java index c5b2850190..4852466fd6 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/test/data/Datasets.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/test/Datasets.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gbif.registry.test.data; +package org.gbif.registry.test; import org.gbif.api.model.common.DOI; import org.gbif.api.model.registry.Citation; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/test/data/Endpoints.java b/registry-integration-tests/src/test/java/org/gbif/registry/test/Endpoints.java similarity index 97% rename from registry-integration-tests/src/test/java/org/gbif/registry/test/data/Endpoints.java rename to registry-integration-tests/src/test/java/org/gbif/registry/test/Endpoints.java index 0c3817ff50..03c369b6f0 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/test/data/Endpoints.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/test/Endpoints.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gbif.registry.test.data; +package org.gbif.registry.test; import org.gbif.api.model.registry.Endpoint; import org.gbif.ws.client.filter.SimplePrincipalProvider; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/test/data/Identifiers.java b/registry-integration-tests/src/test/java/org/gbif/registry/test/Identifiers.java similarity index 97% rename from registry-integration-tests/src/test/java/org/gbif/registry/test/data/Identifiers.java rename to registry-integration-tests/src/test/java/org/gbif/registry/test/Identifiers.java index a868c78b2a..eb4c1f74b1 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/test/data/Identifiers.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/test/Identifiers.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gbif.registry.test.data; +package org.gbif.registry.test; import org.gbif.api.model.registry.Identifier; import org.gbif.ws.client.filter.SimplePrincipalProvider; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/test/data/Installations.java b/registry-integration-tests/src/test/java/org/gbif/registry/test/Installations.java similarity index 98% rename from registry-integration-tests/src/test/java/org/gbif/registry/test/data/Installations.java rename to registry-integration-tests/src/test/java/org/gbif/registry/test/Installations.java index b6ae88339b..6ded488a8d 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/test/data/Installations.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/test/Installations.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gbif.registry.test.data; +package org.gbif.registry.test; import org.gbif.api.model.registry.Installation; import org.gbif.api.service.registry.InstallationService; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/test/data/JsonBackedData.java b/registry-integration-tests/src/test/java/org/gbif/registry/test/JsonBackedData.java similarity index 98% rename from registry-integration-tests/src/test/java/org/gbif/registry/test/data/JsonBackedData.java rename to registry-integration-tests/src/test/java/org/gbif/registry/test/JsonBackedData.java index 664465b6c7..d49b1a8972 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/test/data/JsonBackedData.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/test/JsonBackedData.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gbif.registry.test.data; +package org.gbif.registry.test; import org.gbif.ws.client.filter.SimplePrincipalProvider; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/test/data/MachineTags.java b/registry-integration-tests/src/test/java/org/gbif/registry/test/MachineTags.java similarity index 97% rename from registry-integration-tests/src/test/java/org/gbif/registry/test/data/MachineTags.java rename to registry-integration-tests/src/test/java/org/gbif/registry/test/MachineTags.java index d72b1f6171..ebb20c88a3 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/test/data/MachineTags.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/test/MachineTags.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gbif.registry.test.data; +package org.gbif.registry.test; import org.gbif.api.model.registry.MachineTag; import org.gbif.ws.client.filter.SimplePrincipalProvider; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/test/data/Networks.java b/registry-integration-tests/src/test/java/org/gbif/registry/test/Networks.java similarity index 97% rename from registry-integration-tests/src/test/java/org/gbif/registry/test/data/Networks.java rename to registry-integration-tests/src/test/java/org/gbif/registry/test/Networks.java index 608c4b168b..aa896cc982 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/test/data/Networks.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/test/Networks.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gbif.registry.test.data; +package org.gbif.registry.test; import org.gbif.api.model.registry.Network; import org.gbif.api.service.registry.NetworkService; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/test/data/Nodes.java b/registry-integration-tests/src/test/java/org/gbif/registry/test/Nodes.java similarity index 97% rename from registry-integration-tests/src/test/java/org/gbif/registry/test/data/Nodes.java rename to registry-integration-tests/src/test/java/org/gbif/registry/test/Nodes.java index e3612cae75..f092f62369 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/test/data/Nodes.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/test/Nodes.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gbif.registry.test.data; +package org.gbif.registry.test; import org.gbif.api.model.registry.Node; import org.gbif.ws.client.filter.SimplePrincipalProvider; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/test/data/Organizations.java b/registry-integration-tests/src/test/java/org/gbif/registry/test/Organizations.java similarity index 98% rename from registry-integration-tests/src/test/java/org/gbif/registry/test/data/Organizations.java rename to registry-integration-tests/src/test/java/org/gbif/registry/test/Organizations.java index 18e244b15e..9aa2de8efc 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/test/data/Organizations.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/test/Organizations.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gbif.registry.test.data; +package org.gbif.registry.test; import org.gbif.api.model.registry.Organization; import org.gbif.api.service.registry.NodeService; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/test/data/TestDataFactory.java b/registry-integration-tests/src/test/java/org/gbif/registry/test/TestDataFactory.java similarity index 99% rename from registry-integration-tests/src/test/java/org/gbif/registry/test/data/TestDataFactory.java rename to registry-integration-tests/src/test/java/org/gbif/registry/test/TestDataFactory.java index 7d20fd76a0..dc4bab39fa 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/test/data/TestDataFactory.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/test/TestDataFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gbif.registry.test.data; +package org.gbif.registry.test; import org.gbif.api.model.common.DOI; import org.gbif.api.model.registry.Comment; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/utils/EntityBuilderIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/utils/EntityBuilderIT.java index ba39e15593..a7139f02a7 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/utils/EntityBuilderIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/utils/EntityBuilderIT.java @@ -17,7 +17,7 @@ import org.gbif.api.model.registry.PrePersist; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import org.gbif.registry.ws.it.BaseItTest; import org.gbif.registry.ws.it.RegistryIntegrationTestsConfiguration; import org.gbif.ws.client.filter.SimplePrincipalProvider; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/BaseItTest.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/BaseItTest.java index 2eb1509afb..ec6ce1e3d6 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/BaseItTest.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/BaseItTest.java @@ -37,13 +37,9 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Import; -import org.springframework.context.annotation.Profile; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.context.SecurityContext; @@ -64,11 +60,10 @@ /** Base class for IT tests that initializes data sources and basic security settings. */ @ExtendWith(SpringExtension.class) @SpringBootTest( - classes = {RegistryIntegrationTestsConfiguration.class, BaseItTest.NetworkEntitiesConfig.class}, + classes = RegistryIntegrationTestsConfiguration.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -@Import(BaseItTest.NetworkEntitiesConfig.class) @ContextConfiguration(initializers = {BaseItTest.ContextInitializer.class}) -@ActiveProfiles({"test", "networkEntities"}) +@ActiveProfiles("test") @AutoConfigureMockMvc @DirtiesContext public class BaseItTest { @@ -217,9 +212,4 @@ protected T getService(ServiceType param, T resource, T client) { throw new IllegalStateException("Must be resource or client"); } } - - @TestConfiguration - @Profile("networkEntities") - @ComponentScan(basePackages = {"org.gbif.registry.ws.it.fixtures", "org.gbif.registry.test.data"}) - public static class NetworkEntitiesConfig {} } diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/BootstrapIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/BootstrapIT.java index 7c29b424bf..7427323544 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/BootstrapIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/BootstrapIT.java @@ -20,7 +20,7 @@ import org.gbif.api.service.registry.NodeService; import org.gbif.api.service.registry.OrganizationService; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import org.gbif.ws.client.filter.SimplePrincipalProvider; import org.junit.jupiter.api.Test; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/CommentTests.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/CommentTests.java index ed5f1b679e..47af18434c 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/CommentTests.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/CommentTests.java @@ -18,7 +18,7 @@ import org.gbif.api.model.registry.Comment; import org.gbif.api.model.registry.NetworkEntity; import org.gbif.api.service.registry.CommentService; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import java.util.List; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/ContactTests.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/ContactTests.java index 1e532df881..99c84b5d42 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/ContactTests.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/ContactTests.java @@ -20,7 +20,7 @@ import org.gbif.api.model.registry.NetworkEntity; import org.gbif.api.service.registry.ContactService; import org.gbif.api.service.registry.NetworkEntityService; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import java.util.List; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DatasetIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DatasetIT.java index 3e50506ba9..ca515b43cf 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DatasetIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DatasetIT.java @@ -42,8 +42,8 @@ import org.gbif.registry.search.test.DatasetSearchUpdateUtils; import org.gbif.registry.search.test.ElasticsearchInitializer; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.Datasets; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.Datasets; +import org.gbif.registry.test.TestDataFactory; import org.gbif.registry.ws.client.DatasetClient; import org.gbif.registry.ws.client.InstallationClient; import org.gbif.registry.ws.client.NodeClient; @@ -81,7 +81,7 @@ import com.google.common.io.CharStreams; import static org.assertj.core.api.Assertions.assertThat; -import static org.gbif.registry.test.data.Datasets.buildExpectedProcessedProperties; +import static org.gbif.registry.test.Datasets.buildExpectedProcessedProperties; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DatasetOccurrenceDownloadIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DatasetOccurrenceDownloadIT.java index dd1ebd1225..c4d5367a81 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DatasetOccurrenceDownloadIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DatasetOccurrenceDownloadIT.java @@ -27,7 +27,7 @@ import org.gbif.api.service.registry.OccurrenceDownloadService; import org.gbif.api.service.registry.OrganizationService; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import org.gbif.registry.ws.client.DatasetOccurrenceDownloadUsageClient; import org.gbif.registry.ws.client.OccurrenceDownloadClient; import org.gbif.ws.client.filter.SimplePrincipalProvider; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DatasetProcessStatusIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DatasetProcessStatusIT.java index 0a903cc02b..42eb7d5cec 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DatasetProcessStatusIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DatasetProcessStatusIT.java @@ -32,7 +32,7 @@ import org.gbif.api.vocabulary.EndpointType; import org.gbif.registry.database.TestCaseDatabaseInitializer; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import org.gbif.registry.ws.client.DatasetProcessStatusClient; import org.gbif.ws.client.filter.SimplePrincipalProvider; import org.gbif.ws.security.KeyStore; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DerivedDatasetIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DerivedDatasetIT.java index dc7a7bb2e8..7a65ec25b7 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DerivedDatasetIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DerivedDatasetIT.java @@ -27,7 +27,7 @@ import org.gbif.registry.domain.ws.DerivedDatasetUsage; import org.gbif.registry.persistence.mapper.DerivedDatasetMapper; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import org.gbif.registry.ws.it.fixtures.RequestTestFixture; import org.gbif.registry.ws.resources.DerivedDatasetResource; import org.gbif.registry.ws.resources.OccurrenceDownloadResource; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/EndpointTests.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/EndpointTests.java index af42f9f4a3..cbb945899b 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/EndpointTests.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/EndpointTests.java @@ -18,7 +18,7 @@ import org.gbif.api.model.registry.Endpoint; import org.gbif.api.model.registry.NetworkEntity; import org.gbif.api.service.registry.EndpointService; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import java.util.List; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/IdentifierTests.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/IdentifierTests.java index 8852a4fda9..bc5d032462 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/IdentifierTests.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/IdentifierTests.java @@ -21,7 +21,7 @@ import org.gbif.api.model.registry.NetworkEntity; import org.gbif.api.service.registry.IdentifierService; import org.gbif.api.service.registry.NetworkEntityService; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import java.util.List; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/InstallationIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/InstallationIT.java index 61c307dbd6..4745e0573c 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/InstallationIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/InstallationIT.java @@ -23,7 +23,7 @@ import org.gbif.api.service.registry.OrganizationService; import org.gbif.api.vocabulary.InstallationType; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import org.gbif.registry.ws.client.InstallationClient; import org.gbif.registry.ws.client.NodeClient; import org.gbif.registry.ws.client.OrganizationClient; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/LenientAssertIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/LenientAssertIT.java index ff5b022ca7..c4abf5f5b1 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/LenientAssertIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/LenientAssertIT.java @@ -17,7 +17,7 @@ import org.gbif.api.model.registry.Contact; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import org.gbif.ws.client.filter.SimplePrincipalProvider; import javax.annotation.Nullable; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/MachineTagTests.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/MachineTagTests.java index 954141dbdf..95f5b0264e 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/MachineTagTests.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/MachineTagTests.java @@ -18,7 +18,7 @@ import org.gbif.api.model.registry.MachineTag; import org.gbif.api.model.registry.NetworkEntity; import org.gbif.api.service.registry.MachineTagService; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import java.util.List; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/MetasyncHistoryIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/MetasyncHistoryIT.java index a52ce01f97..ea5f146127 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/MetasyncHistoryIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/MetasyncHistoryIT.java @@ -27,7 +27,7 @@ import org.gbif.api.service.registry.NodeService; import org.gbif.api.service.registry.OrganizationService; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import org.gbif.registry.ws.client.InstallationClient; import org.gbif.registry.ws.client.NodeClient; import org.gbif.registry.ws.client.OrganizationClient; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/NetworkEntityIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/NetworkEntityIT.java index 9f112b8d11..d8943af3e5 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/NetworkEntityIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/NetworkEntityIT.java @@ -32,7 +32,7 @@ import org.gbif.api.vocabulary.UserRole; import org.gbif.registry.database.TestCaseDatabaseInitializer; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import org.gbif.registry.ws.client.NetworkEntityClient; import org.gbif.registry.ws.it.fixtures.TestConstants; import org.gbif.ws.client.filter.SimplePrincipalProvider; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/NetworkIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/NetworkIT.java index 236601475f..a5363b7c8d 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/NetworkIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/NetworkIT.java @@ -25,7 +25,7 @@ import org.gbif.api.service.registry.NetworkService; import org.gbif.registry.identity.service.IdentityService; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import org.gbif.registry.ws.client.NetworkClient; import org.gbif.registry.ws.it.fixtures.RequestTestFixture; import org.gbif.registry.ws.it.fixtures.TestConstants; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/NodeIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/NodeIT.java index 5fea22b5d5..76df9d442c 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/NodeIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/NodeIT.java @@ -33,7 +33,7 @@ import org.gbif.api.vocabulary.NodeType; import org.gbif.api.vocabulary.ParticipationStatus; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import org.gbif.registry.ws.client.DatasetClient; import org.gbif.registry.ws.client.InstallationClient; import org.gbif.registry.ws.client.NodeClient; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/OrganizationCreationIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/OrganizationCreationIT.java index 11b8a1e54a..3936e925cf 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/OrganizationCreationIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/OrganizationCreationIT.java @@ -28,7 +28,7 @@ import org.gbif.registry.persistence.mapper.UserMapper; import org.gbif.registry.persistence.mapper.surety.ChallengeCodeMapper; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import org.gbif.registry.ws.client.NodeClient; import org.gbif.registry.ws.client.OrganizationClient; import org.gbif.registry.ws.resources.OrganizationResource; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/OrganizationIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/OrganizationIT.java index 49c4f46221..365eba6059 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/OrganizationIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/OrganizationIT.java @@ -22,14 +22,13 @@ import org.gbif.api.model.registry.Network; import org.gbif.api.model.registry.Node; import org.gbif.api.model.registry.Organization; -import org.gbif.api.service.registry.DatasetService; import org.gbif.api.service.registry.NetworkService; import org.gbif.api.service.registry.NodeService; import org.gbif.api.service.registry.OrganizationService; import org.gbif.api.vocabulary.Country; import org.gbif.registry.domain.ws.OrganizationRequestSearchParams; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import org.gbif.registry.ws.client.NodeClient; import org.gbif.registry.ws.client.OrganizationClient; import org.gbif.registry.ws.resources.OrganizationResource; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/RegistryIntegrationTestsConfiguration.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/RegistryIntegrationTestsConfiguration.java index 5ebf0a9d24..6b9071908a 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/RegistryIntegrationTestsConfiguration.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/RegistryIntegrationTestsConfiguration.java @@ -89,6 +89,7 @@ "org.gbif.registry.ws.config", "org.gbif.registry.ws.resources", "org.gbif.registry.ws.surety", + "org.gbif.registry.ws.it.fixtures", "org.gbif.registry.security", "org.gbif.registry.persistence", "org.gbif.registry.identity", @@ -100,7 +101,7 @@ "org.gbif.registry.events", "org.gbif.registry.oaipmh", "org.gbif.registry.service", - "org.gbif.registry.test.mocks" + "org.gbif.registry.test" }, excludeFilters = { @ComponentScan.Filter( diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/BaseCollectionEntityResourceIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/BaseCollectionEntityResourceIT.java index 1112d5dd72..5ab5961994 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/BaseCollectionEntityResourceIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/BaseCollectionEntityResourceIT.java @@ -16,6 +16,7 @@ import org.gbif.registry.ws.client.collections.BaseCollectionEntityClient; import org.gbif.registry.ws.it.collections.data.TestData; import org.gbif.registry.ws.it.collections.data.TestDataFactory; +import org.gbif.registry.ws.it.fixtures.RequestTestFixture; import org.gbif.registry.ws.it.fixtures.TestConstants; import org.gbif.ws.client.filter.SimplePrincipalProvider; @@ -26,8 +27,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; -import org.springframework.test.web.servlet.MockMvc; import com.fasterxml.jackson.databind.ObjectMapper; @@ -36,32 +35,28 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.when; -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; abstract class BaseCollectionEntityResourceIT< T extends CollectionEntity & Identifiable & Taggable & MachineTaggable & Commentable & LenientEquals> - extends BaseResourceTest { + extends BaseResourceIT { protected final BaseCollectionEntityClient baseClient; protected final TestData testData; protected final Class paramType; - @Autowired protected MockMvc mockMvc; - @Autowired protected ObjectMapper objectMapper; public BaseCollectionEntityResourceIT( Class> cls, SimplePrincipalProvider simplePrincipalProvider, EsManageServer esServer, + RequestTestFixture requestTestFixture, Class paramType, int localServerPort) { - super(simplePrincipalProvider, esServer); + super(simplePrincipalProvider, esServer, requestTestFixture); this.baseClient = prepareClient(TestConstants.TEST_GRSCICOLL_ADMIN, localServerPort, cls); this.testData = TestDataFactory.create(paramType); this.paramType = paramType; @@ -106,17 +101,15 @@ public void updateKeysMismatchTest() throws Exception { T entity = testData.newEntity(); entity.setKey(UUID.randomUUID()); - mockMvc - .perform( - put("/grscicoll/" - + paramType.getSimpleName().toLowerCase() - + "/" - + UUID.randomUUID().toString()) - .contentType(MediaType.APPLICATION_JSON) - .content(objectMapper.writeValueAsString(entity)) - .with( - httpBasic( - TestConstants.TEST_GRSCICOLL_ADMIN, TestConstants.TEST_GRSCICOLL_ADMIN))) + String path = + "/grscicoll/" + + paramType.getSimpleName().toLowerCase() + + "/" + + UUID.randomUUID().toString(); + + requestTestFixture + .putRequest( + TestConstants.TEST_GRSCICOLL_ADMIN, TestConstants.TEST_GRSCICOLL_ADMIN, entity, path) .andExpect(status().isBadRequest()); } @@ -125,13 +118,12 @@ public void getMissingEntity() throws Exception { UUID key = UUID.randomUUID(); mockGetEntity(key, null); - mockMvc - .perform( - get( - "/grscicoll/" - + paramType.getSimpleName().toLowerCase() - + "/" - + UUID.randomUUID().toString())) + requestTestFixture + .getRequest( + "/grscicoll/" + + paramType.getSimpleName().toLowerCase() + + "/" + + UUID.randomUUID().toString()) .andExpect(status().isNotFound()); } diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/BaseResourceTest.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/BaseResourceIT.java similarity index 92% rename from registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/BaseResourceTest.java rename to registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/BaseResourceIT.java index 654a984af3..9df1bbf872 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/BaseResourceTest.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/BaseResourceIT.java @@ -19,6 +19,7 @@ import org.gbif.registry.search.test.EsManageServer; import org.gbif.registry.test.mocks.IdentityServiceMock; import org.gbif.registry.ws.it.RegistryIntegrationTestsConfiguration; +import org.gbif.registry.ws.it.fixtures.RequestTestFixture; import org.gbif.registry.ws.it.fixtures.TestConstants; import org.gbif.ws.client.ClientBuilder; import org.gbif.ws.client.filter.SimplePrincipalProvider; @@ -61,13 +62,13 @@ /** Base class for IT tests that initializes data sources and basic security settings. */ @ExtendWith(SpringExtension.class) @SpringBootTest( - classes = {RegistryIntegrationTestsConfiguration.class, BaseResourceTest.MockConfig.class}, + classes = {RegistryIntegrationTestsConfiguration.class, BaseResourceIT.MockConfig.class}, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -@ContextConfiguration(initializers = {BaseResourceTest.EsContainerContextInitializer.class}) +@ContextConfiguration(initializers = {BaseResourceIT.EsContainerContextInitializer.class}) @ActiveProfiles({"test", "mock"}) @AutoConfigureMockMvc @DirtiesContext -public class BaseResourceTest { +public class BaseResourceIT { public static class EsContainerContextInitializer implements ApplicationContextInitializer { @@ -79,13 +80,17 @@ public void initialize(ConfigurableApplicationContext configurableApplicationCon } } - private final SimplePrincipalProvider simplePrincipalProvider; protected static EsManageServer esServer; + private final SimplePrincipalProvider simplePrincipalProvider; + protected final RequestTestFixture requestTestFixture; - public BaseResourceTest( - SimplePrincipalProvider simplePrincipalProvider, EsManageServer esServer) { + public BaseResourceIT( + SimplePrincipalProvider simplePrincipalProvider, + EsManageServer esServer, + RequestTestFixture requestTestFixture) { this.simplePrincipalProvider = simplePrincipalProvider; - BaseResourceTest.esServer = esServer; + BaseResourceIT.esServer = esServer; + this.requestTestFixture = requestTestFixture; } @BeforeEach diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/CollectionResourceIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/CollectionResourceIT.java index 2d61277838..17dbd6f377 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/CollectionResourceIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/CollectionResourceIT.java @@ -21,6 +21,7 @@ import org.gbif.registry.service.collections.merge.MergeService; import org.gbif.registry.service.collections.suggestions.CollectionChangeSuggestionService; import org.gbif.registry.ws.client.collections.CollectionClient; +import org.gbif.registry.ws.it.fixtures.RequestTestFixture; import org.gbif.ws.client.filter.SimplePrincipalProvider; import java.util.Arrays; @@ -54,11 +55,13 @@ public class CollectionResourceIT public CollectionResourceIT( SimplePrincipalProvider simplePrincipalProvider, EsManageServer esServer, + RequestTestFixture requestTestFixture, @LocalServerPort int localServerPort) { super( CollectionClient.class, simplePrincipalProvider, esServer, + requestTestFixture, Collection.class, localServerPort); } diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/InstitutionResourceIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/InstitutionResourceIT.java index 83d7744735..8938a4328e 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/InstitutionResourceIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/InstitutionResourceIT.java @@ -21,6 +21,7 @@ import org.gbif.registry.service.collections.merge.MergeService; import org.gbif.registry.service.collections.suggestions.InstitutionChangeSuggestionService; import org.gbif.registry.ws.client.collections.InstitutionClient; +import org.gbif.registry.ws.it.fixtures.RequestTestFixture; import org.gbif.ws.client.filter.SimplePrincipalProvider; import java.util.Arrays; @@ -53,11 +54,13 @@ public class InstitutionResourceIT public InstitutionResourceIT( SimplePrincipalProvider simplePrincipalProvider, EsManageServer esServer, + RequestTestFixture requestTestFixture, @LocalServerPort int localServerPort) { super( InstitutionClient.class, simplePrincipalProvider, esServer, + requestTestFixture, Institution.class, localServerPort); } diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/PersonResourceIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/PersonResourceIT.java index c7d2d6a8cb..81038577c5 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/PersonResourceIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/PersonResourceIT.java @@ -13,6 +13,7 @@ import org.gbif.api.vocabulary.IdentifierType; import org.gbif.registry.search.test.EsManageServer; import org.gbif.registry.ws.client.collections.PersonClient; +import org.gbif.registry.ws.it.fixtures.RequestTestFixture; import org.gbif.ws.client.filter.SimplePrincipalProvider; import java.util.Arrays; @@ -42,8 +43,15 @@ public class PersonResourceIT extends BaseCollectionEntityResourceIT { public PersonResourceIT( SimplePrincipalProvider simplePrincipalProvider, EsManageServer esServer, + RequestTestFixture requestTestFixture, @LocalServerPort int localServerPort) { - super(PersonClient.class, simplePrincipalProvider, esServer, Person.class, localServerPort); + super( + PersonClient.class, + simplePrincipalProvider, + esServer, + requestTestFixture, + Person.class, + localServerPort); } @Test diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/PrimaryCollectionEntityResourceIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/PrimaryCollectionEntityResourceIT.java index d3f138064d..511de7a91e 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/PrimaryCollectionEntityResourceIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/PrimaryCollectionEntityResourceIT.java @@ -45,6 +45,7 @@ import org.gbif.registry.service.collections.merge.MergeService; import org.gbif.registry.ws.client.collections.BaseCollectionEntityClient; import org.gbif.registry.ws.client.collections.PrimaryCollectionEntityClient; +import org.gbif.registry.ws.it.fixtures.RequestTestFixture; import org.gbif.ws.client.filter.SimplePrincipalProvider; import java.time.LocalDateTime; @@ -77,9 +78,10 @@ public PrimaryCollectionEntityResourceIT( Class> cls, SimplePrincipalProvider principalProvider, EsManageServer esServer, + RequestTestFixture requestTestFixture, Class paramType, int localServerPort) { - super(cls, principalProvider, esServer, paramType, localServerPort); + super(cls, principalProvider, esServer, requestTestFixture, paramType, localServerPort); } @Test diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/BaseServiceIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/BaseServiceIT.java index 367e9cb177..529972d9e1 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/BaseServiceIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/BaseServiceIT.java @@ -19,6 +19,7 @@ import org.gbif.registry.database.RegistryDatabaseInitializer; import org.gbif.registry.search.test.EsManageServer; import org.gbif.registry.ws.it.RegistryIntegrationTestsConfiguration; +import org.gbif.registry.ws.it.fixtures.RequestTestFixture; import org.gbif.registry.ws.it.fixtures.TestConstants; import org.gbif.ws.client.filter.SimplePrincipalProvider; @@ -35,9 +36,12 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.Profile; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.context.SecurityContext; @@ -54,13 +58,14 @@ /** Base class for IT tests that initializes data sources and basic security settings. */ @ExtendWith(SpringExtension.class) -@SpringBootTest(classes = RegistryIntegrationTestsConfiguration.class) +@SpringBootTest( + classes = {RegistryIntegrationTestsConfiguration.class, BaseServiceIT.MockConfig.class}) @ContextConfiguration( initializers = { BaseServiceIT.ContextInitializer.class, BaseServiceIT.EsContainerContextInitializer.class }) -@ActiveProfiles("test") +@ActiveProfiles({"test", "mock"}) public class BaseServiceIT { public static class EsContainerContextInitializer @@ -173,4 +178,11 @@ protected void resetSecurityContext(String principal, UserRole role) { public SimplePrincipalProvider getSimplePrincipalProvider() { return simplePrincipalProvider; } + + @TestConfiguration + @Profile("mock") + public static class MockConfig { + + @MockBean RequestTestFixture requestTestFixture; + } } diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/legacy/IptResourceIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/legacy/IptResourceIT.java index 5b0fd679f8..0a22034450 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/legacy/IptResourceIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/legacy/IptResourceIT.java @@ -30,9 +30,9 @@ import org.gbif.registry.database.TestCaseDatabaseInitializer; import org.gbif.registry.domain.ws.IptEntityResponse; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.Datasets; -import org.gbif.registry.test.data.Organizations; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.Datasets; +import org.gbif.registry.test.Organizations; +import org.gbif.registry.test.TestDataFactory; import org.gbif.registry.ws.it.BaseItTest; import org.gbif.registry.ws.it.fixtures.RequestTestFixture; import org.gbif.registry.ws.it.fixtures.TestConstants; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/legacy/LegacyDatasetResourceIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/legacy/LegacyDatasetResourceIT.java index 06a89becdb..c7eb4dc504 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/legacy/LegacyDatasetResourceIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/legacy/LegacyDatasetResourceIT.java @@ -32,9 +32,9 @@ import org.gbif.registry.domain.ws.LegacyDatasetResponse; import org.gbif.registry.domain.ws.LegacyDatasetResponseListWrapper; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.Datasets; -import org.gbif.registry.test.data.Organizations; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.Datasets; +import org.gbif.registry.test.Organizations; +import org.gbif.registry.test.TestDataFactory; import org.gbif.registry.ws.it.BaseItTest; import org.gbif.registry.ws.it.fixtures.RequestTestFixture; import org.gbif.registry.ws.it.fixtures.TestConstants; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/legacy/LegacyEndpointResourceIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/legacy/LegacyEndpointResourceIT.java index 5d13e0c4f8..f13879566f 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/legacy/LegacyEndpointResourceIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/legacy/LegacyEndpointResourceIT.java @@ -25,7 +25,7 @@ import org.gbif.registry.domain.ws.LegacyEndpointResponse; import org.gbif.registry.domain.ws.LegacyEndpointResponseListWrapper; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import org.gbif.registry.ws.it.BaseItTest; import org.gbif.registry.ws.it.fixtures.RequestTestFixture; import org.gbif.ws.client.filter.SimplePrincipalProvider; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/legacy/LegacyOrganizationResourceIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/legacy/LegacyOrganizationResourceIT.java index 0a9bd24fd9..3582840f50 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/legacy/LegacyOrganizationResourceIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/legacy/LegacyOrganizationResourceIT.java @@ -26,7 +26,7 @@ import org.gbif.registry.domain.ws.LegacyOrganizationBriefResponseListWrapper; import org.gbif.registry.domain.ws.LegacyOrganizationResponse; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import org.gbif.registry.ws.it.BaseItTest; import org.gbif.registry.ws.it.fixtures.RequestTestFixture; import org.gbif.ws.client.filter.SimplePrincipalProvider; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/AbstractOaipmhEndpointIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/AbstractOaipmhEndpointIT.java index 672bcf23e5..9cd484b8e4 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/AbstractOaipmhEndpointIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/AbstractOaipmhEndpointIT.java @@ -26,7 +26,7 @@ import org.gbif.api.vocabulary.DatasetType; import org.gbif.registry.database.TestCaseDatabaseInitializer; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import org.gbif.registry.ws.it.BaseItTest; import org.gbif.ws.client.filter.SimplePrincipalProvider; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhGetRecordIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhGetRecordIT.java index 7aa762b4fc..fa1afe4232 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhGetRecordIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhGetRecordIT.java @@ -25,7 +25,7 @@ import org.gbif.api.vocabulary.Country; import org.gbif.api.vocabulary.DatasetType; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import org.gbif.utils.file.FileUtils; import org.gbif.ws.client.filter.SimplePrincipalProvider; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhIdentifyIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhIdentifyIT.java index 364e5c063e..6834b833d3 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhIdentifyIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhIdentifyIT.java @@ -20,7 +20,7 @@ import org.gbif.api.service.registry.NodeService; import org.gbif.api.service.registry.OrganizationService; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import org.gbif.ws.client.filter.SimplePrincipalProvider; import javax.sql.DataSource; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhListMetadataFormatsIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhListMetadataFormatsIT.java index 72b28c93a3..ffd532c252 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhListMetadataFormatsIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhListMetadataFormatsIT.java @@ -25,7 +25,7 @@ import org.gbif.api.vocabulary.Country; import org.gbif.api.vocabulary.DatasetType; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import org.gbif.ws.client.filter.SimplePrincipalProvider; import java.util.Date; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhListRecordsIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhListRecordsIT.java index f48c5ae4bc..2eff8678d9 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhListRecordsIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhListRecordsIT.java @@ -26,7 +26,7 @@ import org.gbif.api.vocabulary.DatasetType; import org.gbif.registry.oaipmh.OaipmhSetRepository; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import org.gbif.registry.utils.OaipmhTestConfiguration; import org.gbif.utils.file.FileUtils; import org.gbif.ws.client.filter.SimplePrincipalProvider; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhListSetsIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhListSetsIT.java index eb3e80c4e9..e32e0b9c7b 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhListSetsIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhListSetsIT.java @@ -25,7 +25,7 @@ import org.gbif.api.vocabulary.DatasetType; import org.gbif.registry.oaipmh.OaipmhSetRepository.SetType; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import org.gbif.ws.client.filter.SimplePrincipalProvider; import java.util.Date; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/DerivedDatasetMapperIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/DerivedDatasetMapperIT.java index ff798202db..1398d30f2c 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/DerivedDatasetMapperIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/DerivedDatasetMapperIT.java @@ -23,7 +23,7 @@ import org.gbif.registry.domain.ws.DerivedDatasetUsage; import org.gbif.registry.persistence.mapper.DerivedDatasetMapper; import org.gbif.registry.search.test.EsManageServer; -import org.gbif.registry.test.data.TestDataFactory; +import org.gbif.registry.test.TestDataFactory; import org.gbif.registry.ws.it.BaseItTest; import org.gbif.ws.client.filter.SimplePrincipalProvider;