test:refactor: tests use KubernetesMockServer and EnableKubernetesMoc…

…kClient Replaced usage of OpenShiftMockServer and EnableOpenShiftMockClient with vanilla Kubernetes alternatives. Signed-off-by: Marc Nuri <marc@marcnuri.com>
fabric8io · Oct 22, 2024 · e77bf6c · e77bf6c
1 parent 5ffbaa4
commit e77bf6c
Show file tree

Hide file tree

Showing 179 changed files with 493 additions and 316 deletions.
diff --git a/.../src/test/java/io/fabric8/openclustermanagement/test/agent/KlusterletAddonConfigTest.java b/.../src/test/java/io/fabric8/openclustermanagement/test/agent/KlusterletAddonConfigTest.java
@@ -31,7 +31,7 @@
 @EnableKubernetesMockClient
 class KlusterletAddonConfigTest {
   private OpenClusterManagementClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...ement/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/ApplicationTest.java b/...ement/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/ApplicationTest.java
@@ -31,7 +31,7 @@
 @EnableKubernetesMockClient
 class ApplicationTest {
   private OpenClusterManagementClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...anagement/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/ChannelTest.java b/...anagement/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/ChannelTest.java
@@ -31,7 +31,7 @@
 @EnableKubernetesMockClient
 class ChannelTest {
   private OpenClusterManagementClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...ent/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/GitOpsClusterTest.java b/...ent/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/GitOpsClusterTest.java
@@ -31,7 +31,7 @@
 @EnableKubernetesMockClient
 class GitOpsClusterTest {
   private OpenClusterManagementClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...ement/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/HelmReleaseTest.java b/...ement/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/HelmReleaseTest.java
@@ -31,7 +31,7 @@
 @EnableKubernetesMockClient
 class HelmReleaseTest {
   private OpenClusterManagementClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...ent/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/PlacementRuleTest.java b/...ent/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/PlacementRuleTest.java
@@ -31,7 +31,7 @@
 @EnableKubernetesMockClient
 class PlacementRuleTest {
   private OpenClusterManagementClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...ment/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/SubscriptionTest.java b/...ment/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/SubscriptionTest.java
@@ -31,7 +31,7 @@
 @EnableKubernetesMockClient
 class SubscriptionTest {
   private OpenClusterManagementClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...test/java/io/fabric8/openclustermanagement/test/cluster/ManagedClusterSetBindingTest.java b/...test/java/io/fabric8/openclustermanagement/test/cluster/ManagedClusterSetBindingTest.java
@@ -31,7 +31,7 @@
 @EnableKubernetesMockClient
 class ManagedClusterSetBindingTest {
   private OpenClusterManagementClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...ts/src/test/java/io/fabric8/openclustermanagement/test/cluster/ManagedClusterSetTest.java b/...ts/src/test/java/io/fabric8/openclustermanagement/test/cluster/ManagedClusterSetTest.java
@@ -31,7 +31,7 @@
 @EnableKubernetesMockClient
 class ManagedClusterSetTest {
   private OpenClusterManagementClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...tests/src/test/java/io/fabric8/openclustermanagement/test/cluster/ManagedClusterTest.java b/...tests/src/test/java/io/fabric8/openclustermanagement/test/cluster/ManagedClusterTest.java
@@ -31,7 +31,7 @@
 @EnableKubernetesMockClient
 class ManagedClusterTest {
   private OpenClusterManagementClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...ts/src/test/java/io/fabric8/openclustermanagement/test/cluster/PlacementDecisionTest.java b/...ts/src/test/java/io/fabric8/openclustermanagement/test/cluster/PlacementDecisionTest.java
@@ -31,7 +31,7 @@
 @EnableKubernetesMockClient
 class PlacementDecisionTest {
   private OpenClusterManagementClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...ment/tests/src/test/java/io/fabric8/openclustermanagement/test/cluster/PlacementTest.java b/...ment/tests/src/test/java/io/fabric8/openclustermanagement/test/cluster/PlacementTest.java
@@ -31,7 +31,7 @@
 @EnableKubernetesMockClient
 class PlacementTest {
   private OpenClusterManagementClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...ests/src/test/java/io/fabric8/openclustermanagement/test/crud/ManagedClusterCrudTest.java b/...ests/src/test/java/io/fabric8/openclustermanagement/test/crud/ManagedClusterCrudTest.java
@@ -28,7 +28,7 @@
 @EnableKubernetesMockClient(crud = true)
 class ManagedClusterCrudTest {
   private OpenClusterManagementClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/.../src/test/java/io/fabric8/openclustermanagement/test/discovery/DiscoveredClusterTest.java b/.../src/test/java/io/fabric8/openclustermanagement/test/discovery/DiscoveredClusterTest.java
@@ -31,7 +31,7 @@
 @EnableKubernetesMockClient
 class DiscoveredClusterTest {
   private OpenClusterManagementClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...ts/src/test/java/io/fabric8/openclustermanagement/test/discovery/DiscoveryConfigTest.java b/...ts/src/test/java/io/fabric8/openclustermanagement/test/discovery/DiscoveryConfigTest.java
@@ -31,7 +31,7 @@
 @EnableKubernetesMockClient
 class DiscoveryConfigTest {
   private OpenClusterManagementClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...va/io/fabric8/openclustermanagement/test/observability/MultiClusterObservabilityTest.java b/...va/io/fabric8/openclustermanagement/test/observability/MultiClusterObservabilityTest.java
@@ -31,7 +31,7 @@
 @EnableKubernetesMockClient
 class MultiClusterObservabilityTest {
   private OpenClusterManagementClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...test/java/io/fabric8/openclustermanagement/test/observability/ObservabilityAddonTest.java b/...test/java/io/fabric8/openclustermanagement/test/observability/ObservabilityAddonTest.java
@@ -31,7 +31,7 @@
 @EnableKubernetesMockClient
 class ObservabilityAddonTest {
   private OpenClusterManagementClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...ests/src/test/java/io/fabric8/openclustermanagement/test/operator/ClusterManagerTest.java b/...ests/src/test/java/io/fabric8/openclustermanagement/test/operator/ClusterManagerTest.java
@@ -31,7 +31,7 @@
 @EnableKubernetesMockClient
 class ClusterManagerTest {
   private OpenClusterManagementClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...nt/tests/src/test/java/io/fabric8/openclustermanagement/test/operator/KlusterletTest.java b/...nt/tests/src/test/java/io/fabric8/openclustermanagement/test/operator/KlusterletTest.java
@@ -31,7 +31,7 @@
 @EnableKubernetesMockClient
 class KlusterletTest {
   private OpenClusterManagementClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...sts/src/test/java/io/fabric8/openclustermanagement/test/operator/MultiClusterHubTest.java b/...sts/src/test/java/io/fabric8/openclustermanagement/test/operator/MultiClusterHubTest.java
@@ -31,7 +31,7 @@
 @EnableKubernetesMockClient
 class MultiClusterHubTest {
   private OpenClusterManagementClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...ests/src/test/java/io/fabric8/openclustermanagement/test/policy/PlacementBindingTest.java b/...ests/src/test/java/io/fabric8/openclustermanagement/test/policy/PlacementBindingTest.java
@@ -31,7 +31,7 @@
 @EnableKubernetesMockClient
 class PlacementBindingTest {
   private OpenClusterManagementClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...ests/src/test/java/io/fabric8/openclustermanagement/test/policy/PolicyAutomationTest.java b/...ests/src/test/java/io/fabric8/openclustermanagement/test/policy/PolicyAutomationTest.java
@@ -32,7 +32,7 @@
 @EnableKubernetesMockClient
 class PolicyAutomationTest {
   private OpenClusterManagementClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...nagement/tests/src/test/java/io/fabric8/openclustermanagement/test/policy/PolicyTest.java b/...nagement/tests/src/test/java/io/fabric8/openclustermanagement/test/policy/PolicyTest.java
@@ -32,7 +32,7 @@
 @EnableKubernetesMockClient
 class PolicyTest {
   private OpenClusterManagementClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...s/src/test/java/io/fabric8/openclustermanagement/test/search/SearchCustomizationTest.java b/...s/src/test/java/io/fabric8/openclustermanagement/test/search/SearchCustomizationTest.java
@@ -31,7 +31,7 @@
 @EnableKubernetesMockClient
 class SearchCustomizationTest {
   private OpenClusterManagementClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...tests/src/test/java/io/fabric8/openclustermanagement/test/search/SearchOperationTest.java b/...tests/src/test/java/io/fabric8/openclustermanagement/test/search/SearchOperationTest.java
@@ -31,7 +31,7 @@
 @EnableKubernetesMockClient
 class SearchOperatorTest {
   private OpenClusterManagementClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...ons/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/AdaptTest.java b/...ons/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/AdaptTest.java
@@ -29,7 +29,7 @@
 @EnableKubernetesMockClient
 class AdaptTest {
   private KubernetesClient client;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @ParameterizedTest(name = "when server does not support {0}, then adapt = {1}")
   @CsvSource(value = {

diff --git a/...ing/tests/src/test/java/io/fabric8/ovn/client/mock/AdminPolicyBasedExternalRouteTest.java b/...ing/tests/src/test/java/io/fabric8/ovn/client/mock/AdminPolicyBasedExternalRouteTest.java
@@ -32,7 +32,7 @@
 @EnableKubernetesMockClient
 class AdminPolicyBasedExternalRouteTest {
   private OpenVirtualNetworkingClient ovnClient;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/EgressFirewallTest.java b/...virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/EgressFirewallTest.java
@@ -31,7 +31,7 @@
 @EnableKubernetesMockClient
 class EgressFirewallTest {
   private OpenVirtualNetworkingClient ovnClient;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/.../open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/EgressIPTest.java b/.../open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/EgressIPTest.java
@@ -32,7 +32,7 @@
 @EnableKubernetesMockClient
 class EgressIPTest {
   private OpenVirtualNetworkingClient ovnClient;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/EgressQoSTest.java b/...open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/EgressQoSTest.java
@@ -32,7 +32,7 @@
 @EnableKubernetesMockClient
 class EgressQoSTest {
   private OpenVirtualNetworkingClient ovnClient;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/EgressServiceTest.java b/...-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/EgressServiceTest.java
@@ -32,7 +32,7 @@
 @EnableKubernetesMockClient
 class EgressServiceTest {
   private OpenVirtualNetworkingClient ovnClient;
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
 
   @Test
   void get() {

diff --git a/...-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/ExpectationsTest.java b/...-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/ExpectationsTest.java
@@ -31,7 +31,7 @@
 
 @DisplayName("Kubernetes Mock Server Expectations")
 class ExpectationsTest {
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
   private KubernetesClient client;
   private HttpClient httpClient;
   private HttpRequest.Builder request;

diff --git a/...mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServerTest.java b/...mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServerTest.java
@@ -26,7 +26,7 @@
 
 class KubernetesMockServerTest {
 
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
   private KubernetesClient client;
 
   @BeforeEach

diff --git a/.../openshift/client/server/mock/OpenShiftMockServerExtensionClientAndServerStaticTests.java b/.../openshift/client/server/mock/OpenShiftMockServerExtensionClientAndServerStaticTests.java
@@ -15,14 +15,16 @@
  */
 package io.fabric8.openshift.client.server.mock;
 
+import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
 import io.fabric8.openshift.client.OpenShiftClient;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-@EnableOpenShiftMockClient
+@EnableKubernetesMockClient
 class OpenShiftMockServerExtensionClientAndServerStaticTests {
-  private static OpenShiftMockServer openShiftMockServer;
+  private static KubernetesMockServer openShiftMockServer;
   private static OpenShiftClient openShiftClient;
 
   @Test

diff --git a/...abric8/openshift/client/server/mock/OpenShiftMockServerExtensionClientAndServerTests.java b/...abric8/openshift/client/server/mock/OpenShiftMockServerExtensionClientAndServerTests.java
@@ -15,15 +15,17 @@
  */
 package io.fabric8.openshift.client.server.mock;
 
+import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
 import io.fabric8.openshift.client.OpenShiftClient;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-@EnableOpenShiftMockClient
+@EnableKubernetesMockClient
 class OpenShiftMockServerExtensionClientAndServerTests {
-  private OpenShiftMockServer openShiftMockServer;
-  private OpenShiftClient openShiftClient;
+  KubernetesMockServer openShiftMockServer;
+  OpenShiftClient openShiftClient;
 
   @Test
   void testMockServerAndClientAreInitialized() {

diff --git a/...java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtensionStaticTests.java b/...java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtensionStaticTests.java
@@ -16,12 +16,13 @@
 package io.fabric8.openshift.client.server.mock;
 
 import io.fabric8.kubernetes.client.Client;
+import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
 import io.fabric8.openshift.client.OpenShiftClient;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@EnableOpenShiftMockClient(crud = true)
+@EnableKubernetesMockClient(crud = true)
 class OpenShiftMockServerExtensionStaticTests {
   static OpenShiftClient openShiftClient;
 

diff --git a/.../test/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtensionTests.java b/.../test/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtensionTests.java
@@ -16,12 +16,13 @@
 package io.fabric8.openshift.client.server.mock;
 
 import io.fabric8.kubernetes.client.Client;
+import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
 import io.fabric8.openshift.client.OpenShiftClient;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@EnableOpenShiftMockClient(crud = true)
+@EnableKubernetesMockClient(crud = true)
 class OpenShiftMockServerExtensionTests {
   OpenShiftClient client;
 

diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/APIServiceTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/APIServiceTest.java
@@ -33,7 +33,7 @@
 
 @EnableKubernetesMockClient
 class APIServiceTest {
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
   private KubernetesClient client;
 
   @Test

diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CSIDriverTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CSIDriverTest.java
@@ -33,7 +33,7 @@
 
 @EnableKubernetesMockClient
 class CSIDriverTest {
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
   private KubernetesClient client;
 
   @Test

diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CSINodeTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CSINodeTest.java
@@ -33,7 +33,7 @@
 
 @EnableKubernetesMockClient
 class CSINodeTest {
-  private KubernetesMockServer server;
+  KubernetesMockServer server;
   private KubernetesClient client;
 
   @Test