Adjust our tests due to changes in JUnit 5 regarding inheritance

JUnit 5 changed how they handle inheritance to be more in line with what
standard Java does.
This change causes some issues with some of our tests as we can't
leverage overriding for static fields as we did before.

https://junit.org/junit5/docs/5.11.1/release-notes/#release-notes-5.11.0-junit-platform-bug-fixes

Author: gsmet

extensions/resteasy-classic/resteasy-client/deployment/src/test/java/io/quarkus/restclient/configuration/AbstractRestClientsTest.java

@@ -0,0 +1,53 @@
+package io.quarkus.restclient.configuration;
+
+import java.util.Set;
+
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Singleton;
+
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.arc.Arc;
+
+/**
+ * Tests clients configured with MicroProfile-style configuration.
+ */
+abstract class AbstractRestClientsTest {
+
+    @RestClient
+    EchoClientWithConfigKey clientWithConfigKey;
+
+    @RestClient
+    EchoClient fullClassNameClient;
+
+    @Test
+    public void clientWithConfigKeyShouldConnect() {
+        Assertions.assertEquals("Hello", clientWithConfigKey.echo("Hello"));
+    }
+
+    @Test
+    void clientWithConfigShouldHaveSingletonScope() {
+        verifyClientScope(EchoClientWithConfigKey.class, Singleton.class);
+    }
+
+    @Test
+    public void fullClassNameClientShouldConnect() {
+        Assertions.assertEquals("Hello", fullClassNameClient.echo("Hello"));
+    }
+
+    @Test
+    void fullClassNameClientShouldHaveSingletonScope() {
+        verifyClientScope(EchoClient.class, Singleton.class);
+    }
+
+    static void verifyClientScope(Class clientInterface, Class expectedScope) {
+        BeanManager beanManager = Arc.container().beanManager();
+        Set<Bean<?>> beans = beanManager.getBeans(clientInterface, RestClient.LITERAL);
+        Bean<?> resolvedBean = beanManager.resolve(beans);
+        Assertions.assertEquals(expectedScope, resolvedBean.getScope());
+    }
+
+}

extensions/resteasy-classic/resteasy-client/deployment/src/test/java/io/quarkus/restclient/configuration/MPRestClientsTest.java

@@ -1,62 +1,18 @@
 package io.quarkus.restclient.configuration;
 
-import java.util.Set;
-
-import jakarta.enterprise.inject.spi.Bean;
-import jakarta.enterprise.inject.spi.BeanManager;
-import jakarta.inject.Singleton;
-
-import org.eclipse.microprofile.rest.client.inject.RestClient;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import io.quarkus.arc.Arc;
 import io.quarkus.test.QuarkusUnitTest;
 
 /**
  * Tests clients configured with MicroProfile-style configuration.
  */
-public class MPRestClientsTest {
+public class MPRestClientsTest extends AbstractRestClientsTest {
 
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .withApplicationRoot((jar) -> jar
                     .addClasses(EchoResource.class,
                             EchoClient.class, EchoClientWithConfigKey.class, ShortNameEchoClient.class))
             .withConfigurationResource("mp-restclients-test-application.properties");
-
-    @RestClient
-    EchoClientWithConfigKey clientWithConfigKey;
-
-    @RestClient
-    EchoClient fullClassNameClient;
-
-    @Test
-    public void clientWithConfigKeyShouldConnect() {
-        Assertions.assertEquals("Hello", clientWithConfigKey.echo("Hello"));
-    }
-
-    @Test
-    void clientWithConfigShouldHaveSingletonScope() {
-        verifyClientScope(EchoClientWithConfigKey.class, Singleton.class);
-    }
-
-    @Test
-    public void fullClassNameClientShouldConnect() {
-        Assertions.assertEquals("Hello", fullClassNameClient.echo("Hello"));
-    }
-
-    @Test
-    void fullClassNameClientShouldHaveSingletonScope() {
-        verifyClientScope(EchoClient.class, Singleton.class);
-    }
-
-    static void verifyClientScope(Class clientInterface, Class expectedScope) {
-        BeanManager beanManager = Arc.container().beanManager();
-        Set<Bean<?>> beans = beanManager.getBeans(clientInterface, RestClient.LITERAL);
-        Bean<?> resolvedBean = beanManager.resolve(beans);
-        Assertions.assertEquals(expectedScope, resolvedBean.getScope());
-    }
-
 }

extensions/resteasy-classic/resteasy-client/deployment/src/test/java/io/quarkus/restclient/configuration/QuarkusRestClientsTest.java

@@ -12,7 +12,7 @@
 /**
  * Tests clients configured with Quarkus-style configuration.
  */
-public class QuarkusRestClientsTest extends MPRestClientsTest {
+public class QuarkusRestClientsTest extends AbstractRestClientsTest {
 
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()

extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/AbstractNonAbsentSerializationTest.java

@@ -0,0 +1,52 @@
+package io.quarkus.resteasy.reactive.jackson.deployment.test;
+
+import jakarta.inject.Singleton;
+
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.quarkus.jackson.ObjectMapperCustomizer;
+import io.restassured.RestAssured;
+
+public abstract class AbstractNonAbsentSerializationTest {
+
+    @Singleton
+    public static class NonAbsentObjectMapperCustomizer implements ObjectMapperCustomizer {
+
+        @Override
+        public void customize(ObjectMapper objectMapper) {
+            objectMapper
+                    .enable(DeserializationFeature.FAIL_ON_NULL_CREATOR_PROPERTIES)
+                    .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+                    .setSerializationInclusion(JsonInclude.Include.NON_ABSENT);
+        }
+    }
+
+    @Test
+    public void testObject() {
+        RestAssured.get("/json-include/my-object")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body("name", Matchers.equalTo("name"))
+                .body("description", Matchers.equalTo("description"))
+                .body("map.test", Matchers.equalTo(1))
+                .body("strings[0]", Matchers.equalTo("test"));
+    }
+
+    @Test
+    public void testEmptyObject() {
+        RestAssured.get("/json-include/my-object-empty")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body("name", Matchers.nullValue())
+                .body("description", Matchers.nullValue())
+                .body("map", Matchers.anEmptyMap())
+                .body("strings", Matchers.hasSize(0));
+    }
+}

extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/AbstractNonEmptySerializationTest.java

@@ -0,0 +1,49 @@
+package io.quarkus.resteasy.reactive.jackson.deployment.test;
+
+import jakarta.inject.Singleton;
+
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.quarkus.jackson.ObjectMapperCustomizer;
+import io.restassured.RestAssured;
+
+public abstract class AbstractNonEmptySerializationTest {
+
+    @Singleton
+    public static class NonEmptyObjectMapperCustomizer implements ObjectMapperCustomizer {
+
+        @Override
+        public void customize(ObjectMapper objectMapper) {
+            objectMapper
+                    .enable(DeserializationFeature.FAIL_ON_NULL_CREATOR_PROPERTIES)
+                    .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+                    .setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
+        }
+    }
+
+    @Test
+    public void testObject() {
+        RestAssured.get("/json-include/my-object")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body("name", Matchers.equalTo("name"))
+                .body("description", Matchers.equalTo("description"))
+                .body("map.test", Matchers.equalTo(1))
+                .body("strings[0]", Matchers.equalTo("test"));
+    }
+
+    @Test
+    public void testEmptyObject() {
+        RestAssured.get("/json-include/my-object-empty")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body(Matchers.is("{}"));
+    }
+}