review: kubernetes-mock-server config

Signed-off-by: Marc Nuri <[email protected]>
fabric8io · Jun 26, 2024 · 150c462 · 150c462
1 parent 9b29217
commit 150c462
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/...ver-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServer.java b/...ver-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServer.java
@@ -207,12 +207,12 @@ public void clearExpectations() {
   }
 
   protected Config initConfig() {
-    NamedContext mockServerContext = new NamedContextBuilder()
-        .withName("fabric8-mockserver-context")
+    final NamedContext mockServerContext = new NamedContextBuilder()
+        .withName("fabric8-mock-server-context")
         .withNewContext()
         .withNamespace("test")
         .withCluster(String.format("localhost:%d", getPort()))
-        .withUser("fabric8-mockserver-testuser")
+        .withUser("fabric8-mock-server-user")
         .endContext()
         .build();
     return new ConfigBuilder(Config.empty())
@@ -223,7 +223,7 @@ protected Config initConfig() {
         .withHttp2Disable(true)
         .addToContexts(mockServerContext)
         .withCurrentContext(mockServerContext)
-        .withUsername("fabric8-mockserver-testuser")
+        .withUsername("fabric8-mock-server-user")
         .withOauthToken("secret")
         .build();
   }

diff --git a/...test/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServerExtensionTest.java b/...test/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServerExtensionTest.java
@@ -29,22 +29,22 @@ class KubernetesMockServerExtensionTest {
   KubernetesClient client;
 
   @Test
-  void testExample() {
+  void mockServerConfiguration() {
     assertThat(client)
         .isNotNull()
         .extracting(Client::getConfiguration)
         .hasFieldOrPropertyWithValue("oauthToken", "secret")
-        .hasFieldOrPropertyWithValue("username", "fabric8-mockserver-testuser")
-        .hasFieldOrPropertyWithValue("currentContext.name", "fabric8-mockserver-context")
+        .hasFieldOrPropertyWithValue("username", "fabric8-mock-server-user")
+        .hasFieldOrPropertyWithValue("currentContext.name", "fabric8-mock-server-context")
         .hasFieldOrPropertyWithValue("currentContext.context.namespace", "test")
-        .hasFieldOrPropertyWithValue("currentContext.context.user", "fabric8-mockserver-testuser")
+        .hasFieldOrPropertyWithValue("currentContext.context.user", "fabric8-mock-server-user")
         .satisfies(c -> assertThat(c.getCurrentContext().getContext().getCluster()).startsWith("localhost:"))
         .satisfies(c -> assertThat(c.getContexts()).hasSize(1));
   }
 
   @Test
   @DisplayName("KubernetesMockServerExtension uses KubernetesMixedDispatcher and provides expectation for GET /version")
-  void testGetKubernetesVersion() {
+  void getKubernetesVersion() {
     // When
     final VersionInfo result = client.getKubernetesVersion();
     // Then

diff --git a/...java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtensionStaticTests.java b/...java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtensionStaticTests.java
@@ -31,10 +31,10 @@ void testStaticOpenShiftClientGetsInitialized() {
         .isNotNull()
         .extracting(Client::getConfiguration)
         .hasFieldOrPropertyWithValue("oauthToken", "secret")
-        .hasFieldOrPropertyWithValue("username", "fabric8-mockserver-testuser")
-        .hasFieldOrPropertyWithValue("currentContext.name", "fabric8-mockserver-context")
+        .hasFieldOrPropertyWithValue("username", "fabric8-mock-server-user")
+        .hasFieldOrPropertyWithValue("currentContext.name", "fabric8-mock-server-context")
         .hasFieldOrPropertyWithValue("currentContext.context.namespace", "test")
-        .hasFieldOrPropertyWithValue("currentContext.context.user", "fabric8-mockserver-testuser")
+        .hasFieldOrPropertyWithValue("currentContext.context.user", "fabric8-mock-server-user")
         .satisfies(c -> assertThat(c.getCurrentContext().getContext().getCluster()).startsWith("localhost:"))
         .satisfies(c -> assertThat(c.getContexts()).hasSize(1));
   }

diff --git a/.../test/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtensionTests.java b/.../test/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtensionTests.java
@@ -31,10 +31,10 @@ void testOpenShiftClientGetsInitialized() {
         .isNotNull()
         .extracting(Client::getConfiguration)
         .hasFieldOrPropertyWithValue("oauthToken", "secret")
-        .hasFieldOrPropertyWithValue("username", "fabric8-mockserver-testuser")
-        .hasFieldOrPropertyWithValue("currentContext.name", "fabric8-mockserver-context")
+        .hasFieldOrPropertyWithValue("username", "fabric8-mock-server-user")
+        .hasFieldOrPropertyWithValue("currentContext.name", "fabric8-mock-server-context")
         .hasFieldOrPropertyWithValue("currentContext.context.namespace", "test")
-        .hasFieldOrPropertyWithValue("currentContext.context.user", "fabric8-mockserver-testuser")
+        .hasFieldOrPropertyWithValue("currentContext.context.user", "fabric8-mock-server-user")
         .satisfies(c -> assertThat(c.getCurrentContext().getContext().getCluster()).startsWith("localhost:"))
         .satisfies(c -> assertThat(c.getContexts()).hasSize(1));
   }