From 6ddb9ab760adb8a885bf34a7e64e7699a48aef12 Mon Sep 17 00:00:00 2001
From: Lars Johansson <lars.johansson@ess.eu>
Date: Mon, 29 Aug 2022 11:27:14 +0200
Subject: [PATCH] Rename docker compose file for integration test
---
README.md | 4 ++--
...schema-migration.yml => docker-compose-integrationtest.yml | 0
src/test/java/org/openepics/names/docker/HealthcheckIT.java | 2 +-
src/test/java/org/openepics/names/docker/NamesIT.java | 2 +-
.../org/openepics/names/docker/StructuresDeviceGroupIT.java | 2 +-
.../org/openepics/names/docker/StructuresDeviceTypeIT.java | 2 +-
.../org/openepics/names/docker/StructuresDisciplineIT.java | 2 +-
.../org/openepics/names/docker/StructuresSubsystemIT.java | 2 +-
.../org/openepics/names/docker/StructuresSystemGroupIT.java | 2 +-
.../java/org/openepics/names/docker/StructuresSystemIT.java | 2 +-
.../openepics/names/docker/complex/NamesInstanceIndexIT.java | 2 +-
.../org/openepics/names/docker/complex/NamesMultipleIT.java | 2 +-
.../names/docker/complex/StructuresCreateLevel3IT.java | 2 +-
.../openepics/names/docker/complex/StructuresMultipleIT.java | 2 +-
.../org/openepics/names/docker/complex/StructuresNamesIT.java | 2 +-
15 files changed, 15 insertions(+), 15 deletions(-)
rename docker-compose-it-db-schema-migration.yml => docker-compose-integrationtest.yml (100%)
diff --git a/README.md b/README.md
index 42037c1f..de760d1b 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 ed799e03..0d9efd37 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 77f45e50..da8e305e 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 a4d41910..cc798168 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 ced3b2c3..9353a0c8 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 ac24e774..c4823ab4 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 2e7441cb..8f181b76 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 88da7e30..73045e7a 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 7a73beb4..51911011 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 35278b96..20ee46e1 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 24d1fa8b..43855c1e 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 aaa5f605..71a86e17 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 0795932b..3f9d0378 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 0fcccb8f..63d09878 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;
--
GitLab