diff --git a/README.md b/README.md index 42037c1f3fa8309b354c0c7c4bd350dd135ee570..de760d1bf8e405d5e1a9225d3db572f421051029 100644 --- a/README.md +++ b/README.md @@ -54,12 +54,12 @@ See ```src/test/java``` and packages * ```org.openepics.names.docker``` * ```org.openepics.names.docker.complex``` -JUnit tests start a docker container for the application (Naming backend) and another docker container for the database (Postgresql) through ```docker-compose-it-db-schema-migration.yml```. +JUnit tests start a docker container for the application (Naming backend) and another docker container for the database (Postgresql) through ```docker-compose-integrationtest.yml```. ``` @Container public static final DockerComposeContainer<?> ENVIRONMENT = - new DockerComposeContainer<>(new File("docker-compose-it-db-schema-migration.yml")) + new DockerComposeContainer<>(new File("docker-compose-integrationtest.yml")) .waitingFor(ITUtil.NAMING, Wait.forLogMessage(".*Started NamingApplication.*", 1)); ``` diff --git a/docker-compose-it-db-schema-migration.yml b/docker-compose-integrationtest.yml similarity index 100% rename from docker-compose-it-db-schema-migration.yml rename to docker-compose-integrationtest.yml diff --git a/src/test/java/org/openepics/names/docker/HealthcheckIT.java b/src/test/java/org/openepics/names/docker/HealthcheckIT.java index ed799e03504d473039b63b54eabc382784119373..0d9efd37a45e1d3a8eb1dfeaa9032de6286abf2b 100644 --- a/src/test/java/org/openepics/names/docker/HealthcheckIT.java +++ b/src/test/java/org/openepics/names/docker/HealthcheckIT.java @@ -47,7 +47,7 @@ class HealthcheckIT { @Container public static final DockerComposeContainer<?> ENVIRONMENT = - new DockerComposeContainer<>(new File("docker-compose-it-db-schema-migration.yml")) + new DockerComposeContainer<>(new File("docker-compose-integrationtest.yml")) .waitingFor(ITUtil.NAMING, Wait.forLogMessage(".*Started NamingApplication.*", 1)); @Test diff --git a/src/test/java/org/openepics/names/docker/NamesIT.java b/src/test/java/org/openepics/names/docker/NamesIT.java index 77f45e504b1d3cfdb8be1ed64e37f079ca2012c4..da8e305eeb422ffe3aefddc9bee5f62b32603422 100644 --- a/src/test/java/org/openepics/names/docker/NamesIT.java +++ b/src/test/java/org/openepics/names/docker/NamesIT.java @@ -61,7 +61,7 @@ class NamesIT { @Container public static final DockerComposeContainer<?> ENVIRONMENT = - new DockerComposeContainer<>(new File("docker-compose-it-db-schema-migration.yml")) + new DockerComposeContainer<>(new File("docker-compose-integrationtest.yml")) .waitingFor(ITUtil.NAMING, Wait.forLogMessage(".*Started NamingApplication.*", 1)); private static UUID systemGroupAcc = null; diff --git a/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java b/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java index a4d4191043a85a827109ad8b2993b54c7392f416..cc79816801975fb4726bbd0bd94e68e64dbb0d0a 100644 --- a/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java +++ b/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java @@ -75,7 +75,7 @@ class StructuresDeviceGroupIT { @Container public static final DockerComposeContainer<?> ENVIRONMENT = - new DockerComposeContainer<>(new File("docker-compose-it-db-schema-migration.yml")) + new DockerComposeContainer<>(new File("docker-compose-integrationtest.yml")) .waitingFor(ITUtil.NAMING, Wait.forLogMessage(".*Started NamingApplication.*", 1)); private static UUID disciplineUuid = null; diff --git a/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java b/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java index ced3b2c3ecd3403cac1e115c0b50ee7ec61bd101..9353a0c8bc69041ea3807c8d52d57e10328b6205 100644 --- a/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java +++ b/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java @@ -75,7 +75,7 @@ class StructuresDeviceTypeIT { @Container public static final DockerComposeContainer<?> ENVIRONMENT = - new DockerComposeContainer<>(new File("docker-compose-it-db-schema-migration.yml")) + new DockerComposeContainer<>(new File("docker-compose-integrationtest.yml")) .waitingFor(ITUtil.NAMING, Wait.forLogMessage(".*Started NamingApplication.*", 1)); private static UUID disciplineUuid = null; diff --git a/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java b/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java index ac24e77479274fc2b02fe6a5666a1d7d753a210d..c4823ab4c6b6f9f148363fe31f1f213240079b5b 100644 --- a/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java +++ b/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java @@ -74,7 +74,7 @@ class StructuresDisciplineIT { @Container public static final DockerComposeContainer<?> ENVIRONMENT = - new DockerComposeContainer<>(new File("docker-compose-it-db-schema-migration.yml")) + new DockerComposeContainer<>(new File("docker-compose-integrationtest.yml")) .waitingFor(ITUtil.NAMING, Wait.forLogMessage(".*Started NamingApplication.*", 1)); @Test diff --git a/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java b/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java index 2e7441cb9dec9e17c81cfcb6d7446a17b122cf2c..8f181b762b3d8cb4a4eeb6011dc60639f1569b9f 100644 --- a/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java +++ b/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java @@ -75,7 +75,7 @@ class StructuresSubsystemIT { @Container public static final DockerComposeContainer<?> ENVIRONMENT = - new DockerComposeContainer<>(new File("docker-compose-it-db-schema-migration.yml")) + new DockerComposeContainer<>(new File("docker-compose-integrationtest.yml")) .waitingFor(ITUtil.NAMING, Wait.forLogMessage(".*Started NamingApplication.*", 1)); private static UUID systemGroupUuid = null; diff --git a/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java b/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java index 88da7e30e5cdf4c0a49049013bb57adf30839f25..73045e7abdba180262429fb035b99105488297fa 100644 --- a/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java +++ b/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java @@ -75,7 +75,7 @@ class StructuresSystemGroupIT { @Container public static final DockerComposeContainer<?> ENVIRONMENT = - new DockerComposeContainer<>(new File("docker-compose-it-db-schema-migration.yml")) + new DockerComposeContainer<>(new File("docker-compose-integrationtest.yml")) .waitingFor(ITUtil.NAMING, Wait.forLogMessage(".*Started NamingApplication.*", 1)); @Test diff --git a/src/test/java/org/openepics/names/docker/StructuresSystemIT.java b/src/test/java/org/openepics/names/docker/StructuresSystemIT.java index 7a73beb48782f6b75a23c1b01fe965c63537d42c..51911011f02b8eda0c13d358388f1b2d68a1faa1 100644 --- a/src/test/java/org/openepics/names/docker/StructuresSystemIT.java +++ b/src/test/java/org/openepics/names/docker/StructuresSystemIT.java @@ -75,7 +75,7 @@ class StructuresSystemIT { @Container public static final DockerComposeContainer<?> ENVIRONMENT = - new DockerComposeContainer<>(new File("docker-compose-it-db-schema-migration.yml")) + new DockerComposeContainer<>(new File("docker-compose-integrationtest.yml")) .waitingFor(ITUtil.NAMING, Wait.forLogMessage(".*Started NamingApplication.*", 1)); private static UUID systemGroupUuid = null; diff --git a/src/test/java/org/openepics/names/docker/complex/NamesInstanceIndexIT.java b/src/test/java/org/openepics/names/docker/complex/NamesInstanceIndexIT.java index 35278b96132ac33c52a1e35560851867960742a6..20ee46e199eee067eb6cf5169945cd8284c45599 100644 --- a/src/test/java/org/openepics/names/docker/complex/NamesInstanceIndexIT.java +++ b/src/test/java/org/openepics/names/docker/complex/NamesInstanceIndexIT.java @@ -68,7 +68,7 @@ class NamesInstanceIndexIT { @Container public static final DockerComposeContainer<?> ENVIRONMENT = - new DockerComposeContainer<>(new File("docker-compose-it-db-schema-migration.yml")) + new DockerComposeContainer<>(new File("docker-compose-integrationtest.yml")) .waitingFor(ITUtil.NAMING, Wait.forLogMessage(".*Started NamingApplication.*", 1)); private static UUID systemGroupAcc = null; diff --git a/src/test/java/org/openepics/names/docker/complex/NamesMultipleIT.java b/src/test/java/org/openepics/names/docker/complex/NamesMultipleIT.java index 24d1fa8bd45763531e05249f44e226f2e0c5594d..43855c1ec0552c70ccae7c77eda3d7d939698572 100644 --- a/src/test/java/org/openepics/names/docker/complex/NamesMultipleIT.java +++ b/src/test/java/org/openepics/names/docker/complex/NamesMultipleIT.java @@ -65,7 +65,7 @@ class NamesMultipleIT { @Container public static final DockerComposeContainer<?> ENVIRONMENT = - new DockerComposeContainer<>(new File("docker-compose-it-db-schema-migration.yml")) + new DockerComposeContainer<>(new File("docker-compose-integrationtest.yml")) .waitingFor(ITUtil.NAMING, Wait.forLogMessage(".*Started NamingApplication.*", 1)); private static UUID systemGroupAcc = null; diff --git a/src/test/java/org/openepics/names/docker/complex/StructuresCreateLevel3IT.java b/src/test/java/org/openepics/names/docker/complex/StructuresCreateLevel3IT.java index aaa5f605e4c84d419919ddb7013e73e094b07d5c..71a86e1771b226ff3d2d51732ce7bfb403c758b2 100644 --- a/src/test/java/org/openepics/names/docker/complex/StructuresCreateLevel3IT.java +++ b/src/test/java/org/openepics/names/docker/complex/StructuresCreateLevel3IT.java @@ -60,7 +60,7 @@ class StructuresCreateLevel3IT { @Container public static final DockerComposeContainer<?> ENVIRONMENT = - new DockerComposeContainer<>(new File("docker-compose-it-db-schema-migration.yml")) + new DockerComposeContainer<>(new File("docker-compose-integrationtest.yml")) .waitingFor(ITUtil.NAMING, Wait.forLogMessage(".*Started NamingApplication.*", 1)); private static UUID systemGroupAcc = null; diff --git a/src/test/java/org/openepics/names/docker/complex/StructuresMultipleIT.java b/src/test/java/org/openepics/names/docker/complex/StructuresMultipleIT.java index 0795932b5fac1517625392be6d8d3ddcc6faec90..3f9d0378124e21aed0edb7706839ca19ca6e5bce 100644 --- a/src/test/java/org/openepics/names/docker/complex/StructuresMultipleIT.java +++ b/src/test/java/org/openepics/names/docker/complex/StructuresMultipleIT.java @@ -54,7 +54,7 @@ class StructuresMultipleIT { @Container public static final DockerComposeContainer<?> ENVIRONMENT = - new DockerComposeContainer<>(new File("docker-compose-it-db-schema-migration.yml")) + new DockerComposeContainer<>(new File("docker-compose-integrationtest.yml")) .waitingFor(ITUtil.NAMING, Wait.forLogMessage(".*Started NamingApplication.*", 1)); private static UUID systemGroupUuid = null; diff --git a/src/test/java/org/openepics/names/docker/complex/StructuresNamesIT.java b/src/test/java/org/openepics/names/docker/complex/StructuresNamesIT.java index 0fcccb8f97ad3b8ff69a63b58a76128b627250ce..63d09878c0ea97e78f3faafaf64aad948591657a 100644 --- a/src/test/java/org/openepics/names/docker/complex/StructuresNamesIT.java +++ b/src/test/java/org/openepics/names/docker/complex/StructuresNamesIT.java @@ -59,7 +59,7 @@ class StructuresNamesIT { @Container public static final DockerComposeContainer<?> ENVIRONMENT = - new DockerComposeContainer<>(new File("docker-compose-it-db-schema-migration.yml")) + new DockerComposeContainer<>(new File("docker-compose-integrationtest.yml")) .waitingFor(ITUtil.NAMING, Wait.forLogMessage(".*Started NamingApplication.*", 1)); private static UUID systemGroupUuid = null;