ITs

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;

registry-integration-tests/src/test/java/org/gbif/registry/test/data/Comments.java → 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;

registry-integration-tests/src/test/java/org/gbif/registry/test/data/Contacts.java → 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;

registry-integration-tests/src/test/java/org/gbif/registry/test/data/Datasets.java → 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;

registry-integration-tests/src/test/java/org/gbif/registry/test/data/Endpoints.java → 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;

registry-integration-tests/src/test/java/org/gbif/registry/test/data/Identifiers.java → 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;

registry-integration-tests/src/test/java/org/gbif/registry/test/data/Installations.java → 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;

registry-integration-tests/src/test/java/org/gbif/registry/test/data/JsonBackedData.java → 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;
 

registry-integration-tests/src/test/java/org/gbif/registry/test/data/MachineTags.java → 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;

registry-integration-tests/src/test/java/org/gbif/registry/test/data/Networks.java → 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;

registry-integration-tests/src/test/java/org/gbif/registry/test/data/Nodes.java → 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;

registry-integration-tests/src/test/java/org/gbif/registry/test/data/Organizations.java → 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;

registry-integration-tests/src/test/java/org/gbif/registry/test/data/TestDataFactory.java → 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;

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;

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> 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 {}
 }

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;

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;
 

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;
 

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;

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;

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;

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;

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;
 

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;
 

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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(