From d0f1eb3343faf908d3c8dbbcd84d9fce2b109b08 Mon Sep 17 00:00:00 2001 From: Shivam Date: Mon, 4 Nov 2024 23:55:37 +0530 Subject: [PATCH 1/2] removed deprected method asList() --- .../RouteEnricherBehavioralTest.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/jkube-kit/enricher/generic/src/test/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricherBehavioralTest.java b/jkube-kit/enricher/generic/src/test/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricherBehavioralTest.java index 918118c8d1..c8efb4d4a1 100644 --- a/jkube-kit/enricher/generic/src/test/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricherBehavioralTest.java +++ b/jkube-kit/enricher/generic/src/test/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricherBehavioralTest.java @@ -28,6 +28,7 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; +import java.util.ArrayList; import java.util.Properties; import static org.assertj.core.api.Assertions.assertThat; @@ -54,7 +55,9 @@ void create_withNoServices_shouldNotCreateRoute() { // When new RouteEnricher(context).create(PlatformMode.openshift, klb); // Then - assertThat(klb.build()).extracting(KubernetesList::getItems).asList().isEmpty(); + assertThat(klb.build()).extracting(KubernetesList::getItems) + .asInstanceOf(InstanceOfAssertFactories.list(ArrayList.class)) + .isEmpty(); } @Test @@ -65,8 +68,10 @@ void create_withServiceNotExposed_shouldNotCreateRoute() { // When new RouteEnricher(context).create(PlatformMode.openshift, klb); // Then - assertThat(klb.build()).extracting(KubernetesList::getItems).asList().singleElement() - .isInstanceOf(Service.class); + assertThat(klb.build()).extracting(KubernetesList::getItems) + .asInstanceOf(InstanceOfAssertFactories.list(ArrayList.class)) + .singleElement() + .isInstanceOf(Service.class); } @Test @@ -77,7 +82,9 @@ void create_withServiceWithNoWebPort_shouldNotCreateRoute() { // When new RouteEnricher(context).create(PlatformMode.openshift, klb); // Then - assertThat(klb.build()).extracting(KubernetesList::getItems).asList().singleElement() + assertThat(klb.build()).extracting(KubernetesList::getItems) + .asInstanceOf(InstanceOfAssertFactories.list(ArrayList.class)) + .singleElement() .isInstanceOf(Service.class); } @@ -115,7 +122,9 @@ void inKubernetes_shouldNotCreateRoute() { // When new RouteEnricher(context).create(PlatformMode.kubernetes, klb); // Then - assertThat(klb.build()).extracting(KubernetesList::getItems).asList().singleElement() + assertThat(klb.build()).extracting(KubernetesList::getItems) + .asInstanceOf(InstanceOfAssertFactories.list(ArrayList.class)) + .singleElement() .isInstanceOf(Service.class); } From dbf481e1bf6b4fc5c5b26ded2a7ef11f833fd679 Mon Sep 17 00:00:00 2001 From: Shivam Date: Tue, 5 Nov 2024 10:31:09 +0530 Subject: [PATCH 2/2] removed deprected aslist --- .../generic/openshift/RouteEnricherBehavioralTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jkube-kit/enricher/generic/src/test/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricherBehavioralTest.java b/jkube-kit/enricher/generic/src/test/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricherBehavioralTest.java index c8efb4d4a1..4696cba85b 100644 --- a/jkube-kit/enricher/generic/src/test/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricherBehavioralTest.java +++ b/jkube-kit/enricher/generic/src/test/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricherBehavioralTest.java @@ -13,6 +13,7 @@ */ package org.eclipse.jkube.enricher.generic.openshift; +import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.KubernetesList; import io.fabric8.kubernetes.api.model.KubernetesListBuilder; import io.fabric8.kubernetes.api.model.Service; @@ -28,7 +29,6 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import java.util.ArrayList; import java.util.Properties; import static org.assertj.core.api.Assertions.assertThat; @@ -56,7 +56,7 @@ void create_withNoServices_shouldNotCreateRoute() { new RouteEnricher(context).create(PlatformMode.openshift, klb); // Then assertThat(klb.build()).extracting(KubernetesList::getItems) - .asInstanceOf(InstanceOfAssertFactories.list(ArrayList.class)) + .asInstanceOf(InstanceOfAssertFactories.list(HasMetadata.class)) .isEmpty(); } @@ -69,7 +69,7 @@ void create_withServiceNotExposed_shouldNotCreateRoute() { new RouteEnricher(context).create(PlatformMode.openshift, klb); // Then assertThat(klb.build()).extracting(KubernetesList::getItems) - .asInstanceOf(InstanceOfAssertFactories.list(ArrayList.class)) + .asInstanceOf(InstanceOfAssertFactories.list(HasMetadata.class)) .singleElement() .isInstanceOf(Service.class); } @@ -83,7 +83,7 @@ void create_withServiceWithNoWebPort_shouldNotCreateRoute() { new RouteEnricher(context).create(PlatformMode.openshift, klb); // Then assertThat(klb.build()).extracting(KubernetesList::getItems) - .asInstanceOf(InstanceOfAssertFactories.list(ArrayList.class)) + .asInstanceOf(InstanceOfAssertFactories.list(HasMetadata.class)) .singleElement() .isInstanceOf(Service.class); } @@ -123,7 +123,7 @@ void inKubernetes_shouldNotCreateRoute() { new RouteEnricher(context).create(PlatformMode.kubernetes, klb); // Then assertThat(klb.build()).extracting(KubernetesList::getItems) - .asInstanceOf(InstanceOfAssertFactories.list(ArrayList.class)) + .asInstanceOf(InstanceOfAssertFactories.list(HasMetadata.class)) .singleElement() .isInstanceOf(Service.class); }