test:refactor: replaced deprecated i.f.k.c.s.mock.KubernetesServer wi…

…th KubernetesMockServer
eclipse-che · Mar 5, 2025 · b9d3cc6 · b9d3cc6
1 parent 494796b
commit b9d3cc6
Show file tree

Hide file tree

Showing 15 changed files with 304 additions and 162 deletions.
diff --git a/core/che-core-metrics-core/pom.xml b/core/che-core-metrics-core/pom.xml
@@ -35,8 +35,8 @@
             <artifactId>okhttp</artifactId>
             <exclusions>
                 <exclusion>
-                    <artifactId>kotlin-stdlib-jdk8</artifactId>
-                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>okio</artifactId>
+                    <groupId>com.squareup.okio</groupId>
                 </exclusion>
             </exclusions>
         </dependency>

diff --git a/infrastructures/kubernetes/pom.xml b/infrastructures/kubernetes/pom.xml
@@ -204,11 +204,6 @@
             <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>mockwebserver</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>io.fabric8</groupId>
             <artifactId>kubernetes-client</artifactId>
@@ -239,21 +234,6 @@
             <artifactId>che-core-sql-schema</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-security</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlet</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-util</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>org.eclipse.persistence.core</artifactId>
@@ -268,12 +248,6 @@
             <groupId>org.everrest</groupId>
             <artifactId>everrest-assured</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <artifactId>jetty-util</artifactId>
-                    <groupId>org.eclipse.jetty</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.everrest</groupId>

diff --git a/.../eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesDeploymentsTest.java b/.../eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesDeploymentsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2023 Red Hat, Inc.
+ * Copyright (c) 2012-2025 Red Hat, Inc.
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -69,13 +69,21 @@
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.RollableScalableResource;
 import io.fabric8.kubernetes.client.dsl.V1APIGroupDSL;
-import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMixedDispatcher;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
+import io.fabric8.mockwebserver.Context;
+import io.fabric8.mockwebserver.MockWebServer;
+import io.fabric8.mockwebserver.ServerRequest;
+import io.fabric8.mockwebserver.ServerResponse;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
+import java.util.Queue;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
@@ -90,6 +98,7 @@
 import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.testng.MockitoTestNGListener;
+import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
@@ -146,7 +155,7 @@ public class KubernetesDeploymentsTest {
   @Mock private V1APIGroupDSL v1APIGroupDSL;
 
   private KubernetesDeployments kubernetesDeployments;
-  private KubernetesServer serverMock;
+  private KubernetesMockServer kubernetesMockServer;
 
   @BeforeMethod
   public void setUp() throws Exception {
@@ -194,8 +203,20 @@ public void setUp() throws Exception {
 
     kubernetesDeployments =
         new KubernetesDeployments("namespace", "workspace123", clientFactory, executor);
-    serverMock = new KubernetesServer(true, true);
-    serverMock.before();
+    final Map<ServerRequest, Queue<ServerResponse>> responses = new HashMap<>();
+    kubernetesMockServer =
+        new KubernetesMockServer(
+            new Context(),
+            new MockWebServer(),
+            responses,
+            new KubernetesMixedDispatcher(responses),
+            true);
+    kubernetesMockServer.init();
+  }
+
+  @AfterMethod
+  public void cleanUp() {
+    kubernetesMockServer.destroy();
   }
 
   @Test
@@ -696,7 +717,8 @@ public void shouldHandleEventWithEmptyLastTimestampAndFirstTimestamp() throws Ex
 
   @Test
   public void deploymentShouldHaveImagePullSecretsOfSAAndSelf() throws InfrastructureException {
-    doReturn(serverMock.getClient()).when(clientFactory).create(anyString());
+    final var client = kubernetesMockServer.createClient();
+    doReturn(client).when(clientFactory).create(anyString());
 
     final String serviceAccountName = "workspace-sa";
     LocalObjectReference pullSecretOfSA =
@@ -715,11 +737,7 @@ public void deploymentShouldHaveImagePullSecretsOfSAAndSelf() throws Infrastruct
                     .build())
             .withImagePullSecrets(pullSecretOfSA)
             .build();
-    serverMock
-        .getClient()
-        .serviceAccounts()
-        .inNamespace(kubernetesDeployments.namespace)
-        .create(serviceAccount);
+    client.serviceAccounts().inNamespace(kubernetesDeployments.namespace).create(serviceAccount);
 
     ObjectMeta objectMeta =
         new ObjectMetaBuilder()
@@ -756,7 +774,7 @@ public void deploymentShouldHaveImagePullSecretsOfSAAndSelf() throws Infrastruct
   @Test
   public void deploymentShouldHavePullSecretsOnlyOfSelfWithNonexistentSA()
       throws InfrastructureException {
-    doReturn(serverMock.getClient()).when(clientFactory).create(anyString());
+    doReturn(kubernetesMockServer.createClient()).when(clientFactory).create(anyString());
 
     LocalObjectReference pullSecretOfPod =
         new LocalObjectReferenceBuilder().withName("pullsecret-pod").build();

diff --git a/...pse/che/workspace/infrastructure/kubernetes/namespace/KubernetesNamespaceFactoryTest.java b/...pse/che/workspace/infrastructure/kubernetes/namespace/KubernetesNamespaceFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2023 Red Hat, Inc.
+ * Copyright (c) 2012-2025 Red Hat, Inc.
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -62,13 +62,19 @@
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMixedDispatcher;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
+import io.fabric8.mockwebserver.Context;
+import io.fabric8.mockwebserver.MockWebServer;
+import io.fabric8.mockwebserver.ServerRequest;
+import io.fabric8.mockwebserver.ServerResponse;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Queue;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -135,7 +141,7 @@ public class KubernetesNamespaceFactoryTest {
 
   @Mock private Resource<Namespace> namespaceResource;
 
-  private KubernetesServer serverMock;
+  private KubernetesMockServer kubernetesMockServer;
 
   private KubernetesNamespaceFactory namespaceFactory;
 
@@ -147,9 +153,16 @@ public class KubernetesNamespaceFactoryTest {
 
   @BeforeMethod
   public void setUp() throws Exception {
-    serverMock = new KubernetesServer(true, true);
-    serverMock.before();
-    k8sClient = spy(serverMock.getClient());
+    final Map<ServerRequest, Queue<ServerResponse>> responses = new HashMap<>();
+    kubernetesMockServer =
+        new KubernetesMockServer(
+            new Context(),
+            new MockWebServer(),
+            responses,
+            new KubernetesMixedDispatcher(responses),
+            true);
+    kubernetesMockServer.init();
+    k8sClient = spy(kubernetesMockServer.createClient());
     lenient().when(cheServerKubernetesClientFactory.create()).thenReturn(k8sClient);
     lenient().when(k8sClient.namespaces()).thenReturn(namespaceOperation);
 
@@ -167,7 +180,7 @@ public void setUp() throws Exception {
   @AfterMethod
   public void tearDown() {
     EnvironmentContext.reset();
-    serverMock.after();
+    kubernetesMockServer.destroy();
   }
 
   @Test

diff --git a/.../workspace/infrastructure/kubernetes/namespace/KubernetesWorkspaceServiceAccountTest.java b/.../workspace/infrastructure/kubernetes/namespace/KubernetesWorkspaceServiceAccountTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2021 Red Hat, Inc.
+ * Copyright (c) 2012-2025 Red Hat, Inc.
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -32,14 +32,23 @@
 import io.fabric8.kubernetes.api.model.rbac.RoleBuilder;
 import io.fabric8.kubernetes.api.model.rbac.RoleList;
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMixedDispatcher;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
+import io.fabric8.mockwebserver.Context;
+import io.fabric8.mockwebserver.MockWebServer;
+import io.fabric8.mockwebserver.ServerRequest;
+import io.fabric8.mockwebserver.ServerResponse;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Optional;
+import java.util.Queue;
 import java.util.Set;
 import org.eclipse.che.workspace.infrastructure.kubernetes.KubernetesClientFactory;
 import org.mockito.Mock;
 import org.mockito.testng.MockitoTestNGListener;
+import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
@@ -54,7 +63,7 @@ public class KubernetesWorkspaceServiceAccountTest {
 
   @Mock private KubernetesClientFactory clientFactory;
   private KubernetesClient k8sClient;
-  private KubernetesServer serverMock;
+  private KubernetesMockServer kubernetesMockServer;
   private KubernetesWorkspaceServiceAccount serviceAccount;
 
   @BeforeMethod
@@ -63,13 +72,25 @@ public void setUp() throws Exception {
         new KubernetesWorkspaceServiceAccount(
             WORKSPACE_ID, NAMESPACE, SA_NAME, ROLE_NAMES, clientFactory);
 
-    serverMock = new KubernetesServer(true, true);
-    serverMock.before();
-
-    k8sClient = serverMock.getClient();
+    final Map<ServerRequest, Queue<ServerResponse>> responses = new HashMap<>();
+    kubernetesMockServer =
+        new KubernetesMockServer(
+            new Context(),
+            new MockWebServer(),
+            responses,
+            new KubernetesMixedDispatcher(responses),
+            true);
+    kubernetesMockServer.init();
+
+    k8sClient = kubernetesMockServer.createClient();
     when(clientFactory.create(anyString())).thenReturn(k8sClient);
   }
 
+  @AfterMethod
+  public void tearDown() {
+    kubernetesMockServer.destroy();
+  }
+
   @Test
   public void shouldProvisionSARolesEvenIfItAlreadyExists() throws Exception {
     ServiceAccountBuilder serviceAccountBuilder =
@@ -100,7 +121,7 @@ public void shouldProvisionSARolesEvenIfItAlreadyExists() throws Exception {
 
   @Test
   public void shouldCreateMetricsRoleIfAPIEnabledOnServer() throws Exception {
-    KubernetesClient localK8sClient = spy(serverMock.getClient());
+    KubernetesClient localK8sClient = spy(k8sClient);
     when(localK8sClient.supportsApiPath(eq("/apis/metrics.k8s.io"))).thenReturn(true);
     when(clientFactory.create(anyString())).thenReturn(localK8sClient);
 
@@ -121,7 +142,7 @@ public void shouldCreateMetricsRoleIfAPIEnabledOnServer() throws Exception {
 
   @Test
   public void shouldNotCreateMetricsRoleIfAPINotEnabledOnServer() throws Exception {
-    KubernetesClient localK8sClient = spy(serverMock.getClient());
+    KubernetesClient localK8sClient = spy(k8sClient);
     when(localK8sClient.supportsApiPath(eq("/apis/metrics.k8s.io"))).thenReturn(false);
     when(clientFactory.create(anyString())).thenReturn(localK8sClient);
 
@@ -142,7 +163,7 @@ public void shouldNotCreateMetricsRoleIfAPINotEnabledOnServer() throws Exception
 
   @Test
   public void shouldCreateCredentialsSecretRole() throws Exception {
-    KubernetesClient localK8sClient = spy(serverMock.getClient());
+    KubernetesClient localK8sClient = spy(k8sClient);
     when(clientFactory.create(anyString())).thenReturn(localK8sClient);
 
     // when
@@ -169,7 +190,7 @@ public void shouldCreateCredentialsSecretRole() throws Exception {
 
   @Test
   public void shouldCreatePreferencesConfigmapRole() throws Exception {
-    KubernetesClient localK8sClient = spy(serverMock.getClient());
+    KubernetesClient localK8sClient = spy(k8sClient);
     when(clientFactory.create(anyString())).thenReturn(localK8sClient);
 
     // when