fix: replace AssertJ's deprecated asList() DSL method in RouteEnriche…

…rBehavioralTest and ProjectEnricherTest (3524) removed deprected method asList() --- removed deprected aslist --- removed asList() deprected method in the ProjectEnricherTest --- improved imports
eclipse-jkube · Nov 8, 2024 · ea78f03 · ea78f03
1 parent 51e25ea
commit ea78f03
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 13 deletions.
diff --git a/...neric/src/test/java/org/eclipse/jkube/enricher/generic/openshift/ProjectEnricherTest.java b/...neric/src/test/java/org/eclipse/jkube/enricher/generic/openshift/ProjectEnricherTest.java
@@ -13,14 +13,17 @@
  */
 package org.eclipse.jkube.enricher.generic.openshift;
 
-import org.eclipse.jkube.kit.config.resource.PlatformMode;
-import org.eclipse.jkube.kit.enricher.api.JKubeEnricherContext;
-
 import io.fabric8.kubernetes.api.model.KubernetesList;
 import io.fabric8.kubernetes.api.model.KubernetesListBuilder;
 import io.fabric8.kubernetes.api.model.NamespaceBuilder;
 import io.fabric8.kubernetes.api.model.Service;
 import io.fabric8.kubernetes.api.model.ServiceBuilder;
+import io.fabric8.kubernetes.api.model.HasMetadata;
+
+import org.assertj.core.api.InstanceOfAssertFactories;
+import org.eclipse.jkube.kit.config.resource.PlatformMode;
+import org.eclipse.jkube.kit.enricher.api.JKubeEnricherContext;
+
 import io.fabric8.openshift.api.model.Project;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -47,7 +50,7 @@ void create_whenKubernetesListHasNamespace_thenNamespaceConvertedToProject() {
         // Then
         assertThat(klb.build())
             .extracting(KubernetesList::getItems)
-            .asList()
+            .asInstanceOf(InstanceOfAssertFactories.list(HasMetadata.class))
             .singleElement()
             .isInstanceOf(Project.class)
             .hasFieldOrPropertyWithValue("metadata.name", "foo");
@@ -64,11 +67,11 @@ void create_whenKubernetesListHasNamespaceWithSpec_thenNamespaceConvertedToProje
         // Then
         assertThat(klb.build())
             .extracting(KubernetesList::getItems)
-            .asList()
+            .asInstanceOf(InstanceOfAssertFactories.list(HasMetadata.class))
             .singleElement()
             .isInstanceOf(Project.class)
             .extracting("spec.finalizers")
-            .asList().first().isEqualTo("hoo");
+            .asInstanceOf(InstanceOfAssertFactories.list(HasMetadata.class)).first().isEqualTo("hoo");
     }
 
     @Test
@@ -82,7 +85,7 @@ void create_whenKubernetesListHasNamespaceWithStatus_thenNamespaceConvertedToPro
         // Then
         assertThat(klb.build())
             .extracting(KubernetesList::getItems)
-            .asList()
+            .asInstanceOf(InstanceOfAssertFactories.list(HasMetadata.class))
             .singleElement()
             .isInstanceOf(Project.class)
             .hasFieldOrPropertyWithValue("status.phase", "Complete");
@@ -98,7 +101,7 @@ void create_whenKubernetesListDoesNotHasNamespace_thenDoesNotNamespaceConvertedT
         // Then
         assertThat(klb.build())
             .extracting(KubernetesList::getItems)
-            .asList()
+            .asInstanceOf(InstanceOfAssertFactories.list(HasMetadata.class))
             .singleElement()
             .isInstanceOf(Service.class)
             .hasFieldOrPropertyWithValue("metadata.name", null);

diff --git a/...c/test/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricherBehavioralTest.java b/...c/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;
@@ -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(HasMetadata.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(HasMetadata.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(HasMetadata.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(HasMetadata.class))
+              .singleElement()
         .isInstanceOf(Service.class);
     }