From 036bbc80dac9d0323e172760fa49a2f4b6e890fb Mon Sep 17 00:00:00 2001 From: Steve Hawkins Date: Mon, 28 Nov 2022 13:15:25 -0500 Subject: [PATCH] fix #4540: adding a test to ensure the raw value is not lost --- .../server/mock/IngressControllerTest.java | 34 +++++++++++++++---- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/IngressControllerTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/IngressControllerTest.java index a50f6c5fc5..65b2eb9f9b 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/IngressControllerTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/IngressControllerTest.java @@ -15,30 +15,46 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.api.model.runtime.RawExtension; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.operator.v1.IngressController; import io.fabric8.openshift.api.model.operator.v1.IngressControllerBuilder; import io.fabric8.openshift.api.model.operator.v1.IngressControllerList; import io.fabric8.openshift.api.model.operator.v1.IngressControllerListBuilder; +import io.fabric8.openshift.api.model.operator.v1.IngressControllerSpec; +import io.fabric8.openshift.api.model.operator.v1.IngressControllerSpecBuilder; import io.fabric8.openshift.client.OpenShiftClient; import org.junit.jupiter.api.Test; import java.net.HttpURLConnection; +import java.util.Arrays; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class IngressControllerTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; + @Test + void build() { + IngressControllerSpec ic = new IngressControllerSpecBuilder() + .withUnsupportedConfigOverrides(new RawExtension(Arrays.asList(1, 2))) + .build(); + // make sure the value is not dropped + assertNotNull(ic.getUnsupportedConfigOverrides()); + } + @Test void create() { // Given IngressController dnsrecord = getIngressController(); - server.expect().post() + server.expect() + .post() .withPath("/apis/operator.openshift.io/v1/namespaces/ns1/ingresscontrollers") .andReturn(HttpURLConnection.HTTP_OK, dnsrecord) .once(); @@ -54,7 +70,8 @@ void create() { @Test void get() { // Given - server.expect().get() + server.expect() + .get() .withPath("/apis/operator.openshift.io/v1/namespaces/ns1/ingresscontrollers/foo") .andReturn(HttpURLConnection.HTTP_OK, getIngressController()) .once(); @@ -70,9 +87,11 @@ void get() { @Test void list() { // Given - server.expect().get() + server.expect() + .get() .withPath("/apis/operator.openshift.io/v1/namespaces/ns1/ingresscontrollers") - .andReturn(HttpURLConnection.HTTP_OK, new IngressControllerListBuilder().withItems(getIngressController()).build()) + .andReturn(HttpURLConnection.HTTP_OK, + new IngressControllerListBuilder().withItems(getIngressController()).build()) .once(); // When @@ -87,7 +106,8 @@ void list() { @Test void delete() { // Given - server.expect().delete() + server.expect() + .delete() .withPath("/apis/operator.openshift.io/v1/namespaces/ns1/ingresscontrollers/foo") .andReturn(HttpURLConnection.HTTP_OK, getIngressController()) .once();