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

…nTest (3039) Chore #3027: Replace AssertJ's deprecated asList() DSL method with asInstanceOf(InstanceOfAssertFactories.list(type.class)) Signed-off-by: Jason Mok <jjasonmok1@gmail.com> --- Remove use of wildcard import Signed-off-by: Jason Mok <jjasonmok1@gmail.com> --- Resolve dependency issues Signed-off-by: Jason Mok <jjasonmok1@gmail.com>
eclipse-jkube · May 13, 2024 · 2baba12 · 2baba12
1 parent d15cd9c
commit 2baba12
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/util/SerializationTest.java b/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/util/SerializationTest.java
@@ -16,10 +16,13 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.EnvVar;
 import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.openshift.api.model.Template;
+import org.assertj.core.api.InstanceOfAssertFactories;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -81,13 +84,12 @@ void unmarshal_withTemplateUrl_shouldLoadTemplate() throws Exception {
     assertThat(result)
       .isInstanceOf(Template.class)
       .hasFieldOrPropertyWithValue("metadata.name", "template-example")
-      .extracting("objects").asList().singleElement()
-      .isInstanceOf(Pod.class)
+      .extracting("objects").asInstanceOf(InstanceOfAssertFactories.list(Pod.class)).singleElement()
       .hasFieldOrPropertyWithValue("metadata.name", "pod-from-template")
-      .extracting("spec.containers").asList().singleElement()
+      .extracting("spec.containers").asInstanceOf(InstanceOfAssertFactories.list(Container.class)).singleElement()
       .hasFieldOrPropertyWithValue("image", "busybox")
       .hasFieldOrPropertyWithValue("securityContext.additionalProperties.privileged", "${POD_SECURITY_CONTEXT}")
-      .extracting("env").asList().singleElement()
+      .extracting("env").asInstanceOf(InstanceOfAssertFactories.list(EnvVar.class)).singleElement()
       .hasFieldOrPropertyWithValue("value", "${ENV_VAR_KEY}");
   }
 
@@ -100,13 +102,12 @@ void unmarshal_withTemplateFile_shouldLoadTemplate() throws Exception {
     assertThat(result)
       .isInstanceOf(Template.class)
       .hasFieldOrPropertyWithValue("metadata.name", "template-example")
-      .extracting("objects").asList().singleElement()
-      .isInstanceOf(Pod.class)
+      .extracting("objects").asInstanceOf(InstanceOfAssertFactories.list(Pod.class)).singleElement()
       .hasFieldOrPropertyWithValue("metadata.name", "pod-from-template")
-      .extracting("spec.containers").asList().singleElement()
+      .extracting("spec.containers").asInstanceOf(InstanceOfAssertFactories.list(Container.class)).singleElement()
       .hasFieldOrPropertyWithValue("image", "busybox")
       .hasFieldOrPropertyWithValue("securityContext.additionalProperties.privileged", "${POD_SECURITY_CONTEXT}")
-      .extracting("env").asList().singleElement()
+      .extracting("env").asInstanceOf(InstanceOfAssertFactories.list(EnvVar.class)).singleElement()
       .hasFieldOrPropertyWithValue("value", "${ENV_VAR_KEY}");
   }