Merge pull request #2673 from manusa/test/1109-tidy

fix: tidied 1109 test to show clearer intentions
fabric8io · Dec 17, 2020 · da8e084 · da8e084
2 parents 69bd362 + 11b9bc9
commit da8e084
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 10 deletions.
diff --git a/...tes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CustomResourceCrud1109Test.java b/...tes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CustomResourceCrud1109Test.java
@@ -16,47 +16,86 @@
 package io.fabric8.kubernetes.client.mock;
 
 import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;
-import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionNames;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext;
 import io.fabric8.kubernetes.client.mock.crd.FooBar;
 import io.fabric8.kubernetes.client.mock.crd.FooBarList;
 import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
 import org.junit.Rule;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.migrationsupport.rules.EnableRuleMigrationSupport;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 @EnableRuleMigrationSupport
 class CustomResourceCrud1109Test {
   @Rule
   public KubernetesServer server = new KubernetesServer(true,true);
 
   private CustomResourceDefinition customResourceDefinition;
+  private MixedOperation<FooBar, FooBarList, Resource<FooBar>> fooBarClient;
 
   @BeforeEach
   void setUp() {
     customResourceDefinition = server.getClient().apiextensions().v1beta1().customResourceDefinitions()
       .create(CustomResourceDefinitionContext.v1beta1CRDFromCustomResourceType(FooBar.class).build());
+    fooBarClient = server.getClient().customResources(FooBar.class, FooBarList.class);
+  }
+
+  @Test
+  @DisplayName("Generated customResourceDefinition has dashes in singular and plural but not in kind")
+  void testGeneratedCRDHasDashesInNamesButNotInKind() {
+    assertThat(customResourceDefinition)
+      .hasFieldOrPropertyWithValue("kind", "FooBar")
+      .hasFieldOrPropertyWithValue("spec.names.kind", "FooBar")
+      .hasFieldOrPropertyWithValue("spec.names.singular", "foo-bar")
+      .hasFieldOrPropertyWithValue("spec.names.plural", "foo-bars");
+  }
+
+  @Test
+  @DisplayName("KubernetesCrudDispatcher, HTTP requests are performed to dashed plural (not to lower-cased kind)")
+  void testRequestsArePerformedToDashedPath() throws Exception {
+    // When
+    fooBarClient.inNamespace("my-namespace").list();
+    // Then
+    assertThat(server.getLastRequest())
+      .hasFieldOrPropertyWithValue("path", "/apis/baz.example.com/v1alpha1/namespaces/my-namespace/foo-bars");
   }
 
   @Test
-  @DisplayName("Fix for issue 1109, verifies resources with dashes can be retrieved")
-  void test1109() {
+  @DisplayName("Get single CR resource, with CR created through KubernetesCrudDispatcher, should perform GET to crd list with dashed plural")
+  void test1109GetSingleResource() {
     // Given
-    final MixedOperation<FooBar, FooBarList, Resource<FooBar>> fooBarClient = server.getClient().customResources(FooBar.class, FooBarList.class);
     final FooBar fb1 = new FooBar();
     fb1.getMetadata().setName("example");
     fooBarClient.inNamespace("default").create(fb1);
-    final FooBarList list = fooBarClient.inNamespace("default").list();
-    Assertions.assertEquals(1, list.getItems().size());
-    Assertions.assertEquals("FooBar", list.getItems().iterator().next().getKind());
     // When
     final FooBar fooBar = fooBarClient.inNamespace("default").withName("example").get();
     // Then
-    Assertions.assertNotNull(fooBar);
+    assertThat(fooBar)
+      .isNotNull()
+      .hasFieldOrPropertyWithValue("metadata.name", "example")
+      .hasFieldOrPropertyWithValue("kind", "FooBar")
+      .isNotSameAs(fb1);
+  }
+
+  @Test
+  @DisplayName("Get CR list, with CR created through KubernetesCrudDispatcher, should perform GET to crd list with dashed plural")
+  void test1109GetList() {
+    // Given
+    final FooBar fb1 = new FooBar();
+    fb1.getMetadata().setName("example");
+    fooBarClient.inNamespace("default").create(fb1);
+    // When
+    final FooBarList fooBarList = fooBarClient.inNamespace("default").list();
+    // Then
+    assertThat(fooBarList)
+      .isNotNull()
+      .extracting(FooBarList::getItems)
+      .asList()
+      .hasSize(1);
   }
 }
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/crd/FooBar.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/crd/FooBar.java
@@ -24,7 +24,7 @@
 @Group(FooBar.GROUP)
 @Version(FooBar.VERSION)
 @Singular(FooBar.SINGULAR)
-public class FooBar  extends CustomResource implements Namespaced {
+public class FooBar extends CustomResource implements Namespaced {
   public static final String GROUP = "baz.example.com";
   public static final String VERSION = "v1alpha1";
   public static final String SINGULAR = "foo-bar";