Use Image util from FW

quarkus-qe · Dec 18, 2023 · ad4eb38 · ad4eb38
1 parent 032f852
commit ad4eb38
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 124 deletions.
diff --git a/sql-db/reactive-vanilla/src/test/java/io/quarkus/ts/reactive/db/clients/DbUtil.java b/sql-db/reactive-vanilla/src/test/java/io/quarkus/ts/reactive/db/clients/DbUtil.java
diff --git a/...ava/io/quarkus/ts/reactive/db/clients/DevModeReactiveMssqlDevServiceUserExperienceIT.java b/...ava/io/quarkus/ts/reactive/db/clients/DevModeReactiveMssqlDevServiceUserExperienceIT.java
@@ -1,7 +1,7 @@
 package io.quarkus.ts.reactive.db.clients;
 
-import static io.quarkus.ts.reactive.db.clients.DbUtil.getImageName;
-import static io.quarkus.ts.reactive.db.clients.DbUtil.getImageVersion;
+import static io.quarkus.test.utils.ImageUtil.getImageName;
+import static io.quarkus.test.utils.ImageUtil.getImageVersion;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Tag;

diff --git a/...ava/io/quarkus/ts/reactive/db/clients/DevModeReactiveMysqlDevServiceUserExperienceIT.java b/...ava/io/quarkus/ts/reactive/db/clients/DevModeReactiveMysqlDevServiceUserExperienceIT.java
@@ -1,7 +1,7 @@
 package io.quarkus.ts.reactive.db.clients;
 
-import static io.quarkus.ts.reactive.db.clients.DbUtil.getImageName;
-import static io.quarkus.ts.reactive.db.clients.DbUtil.getImageVersion;
+import static io.quarkus.test.utils.ImageUtil.getImageName;
+import static io.quarkus.test.utils.ImageUtil.getImageVersion;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Tag;

diff --git a/...o/quarkus/ts/reactive/db/clients/DevModeReactivePostgresqlDevServiceUserExperienceIT.java b/...o/quarkus/ts/reactive/db/clients/DevModeReactivePostgresqlDevServiceUserExperienceIT.java
@@ -1,7 +1,7 @@
 package io.quarkus.ts.reactive.db.clients;
 
-import static io.quarkus.ts.reactive.db.clients.DbUtil.getImageName;
-import static io.quarkus.ts.reactive.db.clients.DbUtil.getImageVersion;
+import static io.quarkus.test.utils.ImageUtil.getImageName;
+import static io.quarkus.test.utils.ImageUtil.getImageVersion;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Tag;

diff --git a/sql-db/sql-app-compatibility/src/test/java/io/quarkus/ts/sqldb/compatibility/DbUtil.java b/sql-db/sql-app-compatibility/src/test/java/io/quarkus/ts/sqldb/compatibility/DbUtil.java
diff --git a/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/DbUtil.java b/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/DbUtil.java
diff --git a/...p/src/test/java/io/quarkus/ts/sqldb/sqlapp/DevModeMariadbDevServicesUserExperienceIT.java b/...p/src/test/java/io/quarkus/ts/sqldb/sqlapp/DevModeMariadbDevServicesUserExperienceIT.java
@@ -1,5 +1,8 @@
 package io.quarkus.ts.sqldb.sqlapp;
 
+import static io.quarkus.test.utils.ImageUtil.getImageName;
+import static io.quarkus.test.utils.ImageUtil.getImageVersion;
+
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Tag;
@@ -17,8 +20,8 @@
 @QuarkusScenario
 public class DevModeMariadbDevServicesUserExperienceIT {
 
-    private static final String MARIA_DB_NAME = DbUtil.getImageName("mariadb.10.image");
-    private static final String MARIA_DB_VERSION = DbUtil.getImageVersion("mariadb.10.image");
+    private static final String MARIA_DB_NAME = getImageName("mariadb.10.image");
+    private static final String MARIA_DB_VERSION = getImageVersion("mariadb.10.image");
 
     @DevModeQuarkusApplication
     static RestService app = new RestService()

diff --git a/...app/src/test/java/io/quarkus/ts/sqldb/sqlapp/DevModeMssqlDevServicesUserExperienceIT.java b/...app/src/test/java/io/quarkus/ts/sqldb/sqlapp/DevModeMssqlDevServicesUserExperienceIT.java
@@ -1,5 +1,8 @@
 package io.quarkus.ts.sqldb.sqlapp;
 
+import static io.quarkus.test.utils.ImageUtil.getImageName;
+import static io.quarkus.test.utils.ImageUtil.getImageVersion;
+
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Tag;
@@ -17,8 +20,8 @@
 @QuarkusScenario
 public class DevModeMssqlDevServicesUserExperienceIT {
 
-    private static final String MSSQL_NAME = DbUtil.getImageName("mssql.image");
-    private static final String MSSQL_VERSION = DbUtil.getImageVersion("mssql.image");
+    private static final String MSSQL_NAME = getImageName("mssql.image");
+    private static final String MSSQL_VERSION = getImageVersion("mssql.image");
 
     @DevModeQuarkusApplication
     static RestService app = new RestService()

diff --git a/...-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/DevModeMysqlDevServiceUserExperienceIT.java b/...-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/DevModeMysqlDevServiceUserExperienceIT.java
@@ -1,7 +1,7 @@
 package io.quarkus.ts.sqldb.sqlapp;
 
-import static io.quarkus.ts.sqldb.sqlapp.DbUtil.getImageName;
-import static io.quarkus.ts.sqldb.sqlapp.DbUtil.getImageVersion;
+import static io.quarkus.test.utils.ImageUtil.getImageName;
+import static io.quarkus.test.utils.ImageUtil.getImageVersion;
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;

diff --git a/...app/src/test/java/io/quarkus/ts/sqldb/sqlapp/DevModeOracleDevServiceUserExperienceIT.java b/...app/src/test/java/io/quarkus/ts/sqldb/sqlapp/DevModeOracleDevServiceUserExperienceIT.java
@@ -1,7 +1,7 @@
 package io.quarkus.ts.sqldb.sqlapp;
 
-import static io.quarkus.ts.sqldb.sqlapp.DbUtil.getImageName;
-import static io.quarkus.ts.sqldb.sqlapp.DbUtil.getImageVersion;
+import static io.quarkus.test.utils.ImageUtil.getImageName;
+import static io.quarkus.test.utils.ImageUtil.getImageVersion;
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;

diff --git a/...src/test/java/io/quarkus/ts/sqldb/sqlapp/DevModePostgresqlDevServiceUserExperienceIT.java b/...src/test/java/io/quarkus/ts/sqldb/sqlapp/DevModePostgresqlDevServiceUserExperienceIT.java
@@ -1,7 +1,7 @@
 package io.quarkus.ts.sqldb.sqlapp;
 
-import static io.quarkus.ts.sqldb.sqlapp.DbUtil.getImageName;
-import static io.quarkus.ts.sqldb.sqlapp.DbUtil.getImageVersion;
+import static io.quarkus.test.utils.ImageUtil.getImageName;
+import static io.quarkus.test.utils.ImageUtil.getImageVersion;
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;