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

…gTest chore(deprecated assertions): replace asList with asInstanceOf(...) , issue eclipse-jkube#3157 Signed-off-by: arman-yekkehkhani <[email protected]> --- chore(deprecated method): replace ObjectMapper.configure with JsonMapper builder , issue eclipse-jkube#2527 Signed-off-by: arman-yekkehkhani <[email protected]>
manusa · Jun 17, 2024 · be1f6e1 · be1f6e1
1 parent d623b32
commit be1f6e1
Showing 1 changed file with 27 additions and 23 deletions.
diff --git a/...onfig/resource/src/test/java/org/eclipse/jkube/kit/config/resource/IngressConfigTest.java b/...onfig/resource/src/test/java/org/eclipse/jkube/kit/config/resource/IngressConfigTest.java
@@ -14,7 +14,8 @@
 package org.eclipse.jkube.kit.config.resource;
 
 import com.fasterxml.jackson.databind.MapperFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import org.assertj.core.api.InstanceOfAssertFactories;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
@@ -28,35 +29,38 @@ class IngressConfigTest {
   @Test
   void rawDeserialization() throws IOException {
     // Given
-    final ObjectMapper mapper = new ObjectMapper();
-    mapper.configure(MapperFeature.USE_ANNOTATIONS, false);
+    final JsonMapper mapper = JsonMapper.builder()
+        .configure(MapperFeature.USE_ANNOTATIONS, false)
+        .build();
     // When
     final IngressConfig result = mapper.readValue(
         IngressConfigTest.class.getResourceAsStream("/ingress-config.json"),
         IngressConfig.class);
     // Then
     assertThat(result)
-        .satisfies(ic -> assertThat(ic).extracting(IngressConfig::getIngressRules).asList().containsExactly(
-            IngressRuleConfig.builder()
-                .host("example.com")
-                .path(IngressRulePathConfig.builder()
-                    .pathType("ImplementationSpecific")
-                    .path("/path")
-                    .serviceName("service-name")
-                    .servicePort(8080)
-                    .resource(IngressRulePathResourceConfig.builder()
-                        .apiGroup("group.k8s.io")
-                        .kind("ResourceKind")
-                        .name("resource-name")
+        .satisfies(ic -> assertThat(ic).extracting(IngressConfig::getIngressRules)
+            .asInstanceOf(InstanceOfAssertFactories.list(IngressRuleConfig.class))
+            .containsExactly(
+                IngressRuleConfig.builder()
+                    .host("example.com")
+                    .path(IngressRulePathConfig.builder()
+                        .pathType("ImplementationSpecific")
+                        .path("/path")
+                        .serviceName("service-name")
+                        .servicePort(8080)
+                        .resource(IngressRulePathResourceConfig.builder()
+                            .apiGroup("group.k8s.io")
+                            .kind("ResourceKind")
+                            .name("resource-name")
+                            .build())
                         .build())
-                    .build())
-                .build()
-        ))
-        .satisfies(ic -> assertThat(ic).extracting(IngressConfig::getIngressTlsConfigs).asList()
-            .hasSize(1)
-            .element(0)
+                    .build()))
+        .satisfies(ic -> assertThat(ic).extracting(IngressConfig::getIngressTlsConfigs)
+            .asInstanceOf(InstanceOfAssertFactories.list(IngressTlsConfig.class))
+            .singleElement()
             .hasFieldOrPropertyWithValue("secretName", "shhhh")
-            .extracting("hosts").asList().containsExactly("tls.example.com")
-        );
+            .extracting("hosts")
+            .asInstanceOf(InstanceOfAssertFactories.list(String.class))
+            .containsExactly("tls.example.com"));
   }
 }