diff --git a/src/integration-test/java/org/openlmis/referencedata/AuditLogInitializerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/AuditLogInitializerIntegrationTest.java index 6539b532..d0a836b0 100644 --- a/src/integration-test/java/org/openlmis/referencedata/AuditLogInitializerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/AuditLogInitializerIntegrationTest.java @@ -91,7 +91,7 @@ import org.springframework.transaction.annotation.Transactional; @Transactional -@ActiveProfiles({"test", "init-audit-log"}) +@ActiveProfiles({"test", "init-audit-log", "test-run"}) @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @SuppressWarnings({"PMD.TooManyMethods"}) diff --git a/src/integration-test/java/org/openlmis/referencedata/JaVersIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/JaVersIntegrationTest.java index 1b4e893c..805b8ad6 100644 --- a/src/integration-test/java/org/openlmis/referencedata/JaVersIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/JaVersIntegrationTest.java @@ -38,7 +38,7 @@ import org.springframework.transaction.annotation.Transactional; @RunWith(SpringRunner.class) -@ActiveProfiles("test") +@ActiveProfiles({"test", "test-run"}) @SpringBootTest @Transactional public class JaVersIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/repository/BaseCrudRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/repository/BaseCrudRepositoryIntegrationTest.java index 3794c8e5..1929cb74 100644 --- a/src/integration-test/java/org/openlmis/referencedata/repository/BaseCrudRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/repository/BaseCrudRepositoryIntegrationTest.java @@ -30,7 +30,7 @@ @RunWith(SpringRunner.class) @SpringBootTest -@ActiveProfiles("test") +@ActiveProfiles({"test", "test-run"}) @Transactional public abstract class BaseCrudRepositoryIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/service/DataImportServiceIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/service/DataImportServiceIntegrationTest.java index 0b888f2d..256e624a 100644 --- a/src/integration-test/java/org/openlmis/referencedata/service/DataImportServiceIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/service/DataImportServiceIntegrationTest.java @@ -69,7 +69,7 @@ @RunWith(SpringRunner.class) @SpringBootTest(classes = {Application.class, DataImportService.class}) -@ActiveProfiles("test") +@ActiveProfiles({"test", "test-run"}) @Transactional @SuppressWarnings({"PMD.TooManyMethods"}) public class DataImportServiceIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/web/BaseWebIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/BaseWebIntegrationTest.java index 721259f3..d8724c14 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/BaseWebIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/BaseWebIntegrationTest.java @@ -124,7 +124,7 @@ @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -@ActiveProfiles("test") +@ActiveProfiles({"test", "test-run"}) @SuppressWarnings({"PMD.TooManyMethods"}) public abstract class BaseWebIntegrationTest { diff --git a/src/main/java/org/openlmis/referencedata/TestDataInitializer.java b/src/main/java/org/openlmis/referencedata/TestDataInitializer.java index b35a70ce..768b7ac5 100644 --- a/src/main/java/org/openlmis/referencedata/TestDataInitializer.java +++ b/src/main/java/org/openlmis/referencedata/TestDataInitializer.java @@ -29,7 +29,7 @@ import org.springframework.stereotype.Component; @Component -@Profile("demo-data") +@Profile("demo-data & !test-run") @Order(5) public class TestDataInitializer implements CommandLineRunner { private static final XLogger XLOGGER = XLoggerFactory.getXLogger(TestDataInitializer.class);