fix: remove redundant quarkus-test-openshift-client

Signed-off-by: Marc Nuri <[email protected]>
quarkusio · Dec 24, 2024 · f6ef338 · f6ef338
1 parent 6b3c381
commit f6ef338
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 320 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -3373,11 +3373,6 @@
                 <artifactId>quarkus-test-kubernetes-client</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-test-openshift-client</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-test-amazon-lambda</artifactId>

diff --git a/integration-tests/kubernetes-client/pom.xml b/integration-tests/kubernetes-client/pom.xml
@@ -64,11 +64,6 @@
             <artifactId>quarkus-test-kubernetes-client</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-test-openshift-client</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>

diff --git a/...ernetes-client/src/test/java/io/quarkus/it/kubernetes/client/OpenShiftTestServerTest.java b/...ernetes-client/src/test/java/io/quarkus/it/kubernetes/client/OpenShiftTestServerTest.java
diff --git a/integration-tests/openshift-client/pom.xml b/integration-tests/openshift-client/pom.xml
@@ -43,7 +43,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-test-openshift-client</artifactId>
+            <artifactId>quarkus-test-kubernetes-client</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>

diff --git a/...ts/openshift-client/src/test/java/io/quarkus/it/openshift/client/OpenShiftClientTest.java b/...ts/openshift-client/src/test/java/io/quarkus/it/openshift/client/OpenShiftClientTest.java
@@ -6,22 +6,22 @@
 import org.junit.jupiter.api.Test;
 
 import io.fabric8.kubernetes.api.model.PodListBuilder;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
 import io.fabric8.openshift.api.model.Route;
 import io.fabric8.openshift.api.model.RouteBuilder;
 import io.fabric8.openshift.client.NamespacedOpenShiftClient;
-import io.fabric8.openshift.client.server.mock.OpenShiftMockServer;
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.kubernetes.client.KubernetesMockServerTestResource;
 import io.quarkus.test.kubernetes.client.MockServer;
-import io.quarkus.test.kubernetes.client.OpenShiftMockServerTestResource;
 import io.restassured.RestAssured;
 
-@QuarkusTestResource(OpenShiftMockServerTestResource.class)
+@QuarkusTestResource(KubernetesMockServerTestResource.class)
 @QuarkusTest
 public class OpenShiftClientTest {
 
     @MockServer
-    private OpenShiftMockServer mockServer;
+    private KubernetesMockServer mockServer;
 
     @Test
     void createRoute() {
@@ -36,7 +36,7 @@ void createRoute() {
                 .andReturn(200, expectedRoute)
                 .once();
 
-        NamespacedOpenShiftClient openShiftClient = mockServer.createOpenShiftClient();
+        NamespacedOpenShiftClient openShiftClient = mockServer.createClient().adapt(NamespacedOpenShiftClient.class);
         openShiftClient.routes()
                 .create(new RouteBuilder().withNewMetadata().withName("myroute").withNamespace("test").endMetadata().build());
         Route route = openShiftClient.routes().inNamespace("test").withName("myroute").get();

diff --git a/test-framework/openshift-client/pom.xml b/test-framework/openshift-client/pom.xml
diff --git a/...ient/src/main/java/io/quarkus/test/kubernetes/client/OpenShiftMockServerTestResource.java b/...ient/src/main/java/io/quarkus/test/kubernetes/client/OpenShiftMockServerTestResource.java
diff --git a/...t-client/src/main/java/io/quarkus/test/kubernetes/client/OpenShiftServerTestResource.java b/...t-client/src/main/java/io/quarkus/test/kubernetes/client/OpenShiftServerTestResource.java
diff --git a/...openshift-client/src/main/java/io/quarkus/test/kubernetes/client/OpenShiftTestServer.java b/...openshift-client/src/main/java/io/quarkus/test/kubernetes/client/OpenShiftTestServer.java
diff --git a/...shift-client/src/main/java/io/quarkus/test/kubernetes/client/WithOpenShiftTestServer.java b/...shift-client/src/main/java/io/quarkus/test/kubernetes/client/WithOpenShiftTestServer.java
diff --git a/test-framework/pom.xml b/test-framework/pom.xml
@@ -20,7 +20,6 @@
         <module>grpc</module>
         <module>derby</module>
         <module>kubernetes-client</module>
-        <module>openshift-client</module>
         <module>junit5-config</module>
         <module>junit5-internal</module>
         <module>junit5</module>