Merge pull request #40018 from cescoffier/fix-native-its

Fix various IT modules and add them to the CI matrices

.github/native-tests.json

@@ -93,7 +93,7 @@
         {
             "category": "HTTP",
             "timeout": 110,
-            "test-modules": "elytron-resteasy, resteasy-jackson, elytron-resteasy-reactive, resteasy-mutiny, resteasy-reactive-kotlin/standard, vertx, vertx-http, vertx-web, vertx-web-jackson, vertx-graphql, virtual-http, rest-client, rest-client-reactive, rest-client-reactive-stork, rest-client-reactive-multipart, websockets, management-interface, management-interface-auth",
+            "test-modules": "elytron-resteasy, resteasy-jackson, elytron-resteasy-reactive, resteasy-mutiny, resteasy-reactive-kotlin/standard, vertx, vertx-http, vertx-web, vertx-web-jackson, vertx-graphql, virtual-http, rest-client, rest-client-reactive, rest-client-reactive-stork, rest-client-reactive-multipart, websockets, management-interface, management-interface-auth, mutiny-native-jctools",
             "os-name": "ubuntu-latest"
         },
         {
@@ -116,8 +116,8 @@
         },
         {
             "category": "Misc4",
-            "timeout": 125,
-            "test-modules": "picocli-native, gradle, micrometer-mp-metrics, micrometer-prometheus, logging-json, jaxp, jaxb, opentelemetry, opentelemetry-jdbc-instrumentation, webjars-locator",
+            "timeout": 130,
+            "test-modules": "picocli-native, gradle, micrometer-mp-metrics, micrometer-prometheus, logging-json, jaxp, jaxb, opentelemetry, opentelemetry-jdbc-instrumentation, opentelemetry-redis-instrumentation, webjars-locator",
             "os-name": "ubuntu-latest"
         },
         {
@@ -128,8 +128,8 @@
         },
         {
             "category": "gRPC",
-            "timeout": 75,
-            "test-modules": "grpc-health, grpc-interceptors, grpc-mutual-auth, grpc-plain-text-gzip, grpc-plain-text-mutiny, grpc-proto-v2, grpc-streaming, grpc-tls, grpc-tls-p12",
+            "timeout": 80,
+            "test-modules": "grpc-health, grpc-interceptors, grpc-mutual-auth, grpc-plain-text-gzip, grpc-plain-text-mutiny, grpc-proto-v2, grpc-streaming, grpc-tls, grpc-tls-p12, grpc-test-random-port",
             "os-name": "ubuntu-latest"
         },
         {

.github/virtual-threads-tests.json

@@ -11,6 +11,12 @@
             "timeout": 45,
             "test-modules": "amqp-virtual-threads, jms-virtual-threads, kafka-virtual-threads",
             "os-name": "ubuntu-latest"
+        },
+        {
+            "category": "Security",
+            "timeout": 20,
+            "test-modules": "security-webauthn-virtual-threads",
+            "os-name": "ubuntu-latest"
         }
     ]
 }

integration-tests/grpc-test-random-port/src/test/java/io/quarkus/grpc/examples/hello/RandomPortSeparateServerPlainIT.java

@@ -1,9 +1,33 @@
 package io.quarkus.grpc.examples.hello;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+import com.google.common.net.HostAndPort;
+
+import examples.GreeterGrpc;
+import examples.HelloRequest;
+import io.grpc.netty.NettyChannelBuilder;
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import io.quarkus.test.junit.TestProfile;
 
 @QuarkusIntegrationTest
 @TestProfile(RandomPortSeparateServerPlainTestBase.Profile.class)
 class RandomPortSeparateServerPlainIT extends RandomPortSeparateServerPlainTestBase {
+
+    @Test
+    void testWithNative() {
+        var channel = NettyChannelBuilder.forAddress("localhost", 9000).usePlaintext().build();
+        var stub = GreeterGrpc.newBlockingStub(channel);
+        HelloRequest request = HelloRequest.newBuilder().setName("neo").build();
+        var resp = stub.sayHello(request);
+        assertThat(resp.getMessage()).startsWith("Hello neo");
+
+        int clientPort = HostAndPort.fromString(channel.authority()).getPort();
+        assertThat(clientPort).isNotEqualTo(0);
+        assertThat(clientPort).isEqualTo(9000);
+
+        channel.shutdownNow();
+    }
 }

integration-tests/grpc-test-random-port/src/test/java/io/quarkus/grpc/examples/hello/RandomPortTestBase.java

@@ -12,6 +12,7 @@
 import examples.MutinyGreeterGrpc.MutinyGreeterStub;
 import io.grpc.Channel;
 import io.quarkus.grpc.GrpcClient;
+import io.quarkus.test.junit.DisabledOnIntegrationTest;
 
 abstract class RandomPortTestBase {
     @GrpcClient("hello")
@@ -21,6 +22,7 @@ abstract class RandomPortTestBase {
     Channel channel;
 
     @Test
+    @DisabledOnIntegrationTest
     void testRandomPort() {
         assertSoftly(softly -> {
             HelloRequest request = HelloRequest.newBuilder().setName("neo").build();

integration-tests/grpc-test-random-port/src/test/java/io/quarkus/grpc/examples/hello/RandomPortVertxServerPlainIT.java

@@ -1,9 +1,33 @@
 package io.quarkus.grpc.examples.hello;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+import com.google.common.net.HostAndPort;
+
+import examples.GreeterGrpc;
+import examples.HelloRequest;
+import io.grpc.netty.NettyChannelBuilder;
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import io.quarkus.test.junit.TestProfile;
 
 @QuarkusIntegrationTest
 @TestProfile(RandomPortVertxServerPlainTestBase.Profile.class)
 class RandomPortVertxServerPlainIT extends RandomPortVertxServerPlainTestBase {
+
+    @Test
+    void testWithNative() {
+        var channel = NettyChannelBuilder.forAddress("localhost", 8081).usePlaintext().build();
+        var stub = GreeterGrpc.newBlockingStub(channel);
+        HelloRequest request = HelloRequest.newBuilder().setName("neo").build();
+        var resp = stub.sayHello(request);
+        assertThat(resp.getMessage()).startsWith("Hello neo");
+
+        int clientPort = HostAndPort.fromString(channel.authority()).getPort();
+        assertThat(clientPort).isNotEqualTo(0);
+        assertThat(clientPort).isEqualTo(8081);
+
+        channel.shutdownNow();
+    }
 }

integration-tests/hibernate-reactive-mssql/src/main/java/io/quarkus/it/hibernate/reactive/mssql/DialectEndpoint.java

@@ -3,16 +3,17 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import org.hibernate.SessionFactory;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-
-import io.quarkus.hibernate.orm.runtime.config.DialectVersions;
 import jakarta.inject.Inject;
 import jakarta.servlet.annotation.WebServlet;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
+import org.hibernate.SessionFactory;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+
+import io.quarkus.hibernate.orm.runtime.config.DialectVersions;
+
 @WebServlet(name = "DialectEndpoint", urlPatterns = "/dialect/version")
 public class DialectEndpoint extends HttpServlet {
     @Inject

integration-tests/hibernate-reactive-mssql/src/main/java/io/quarkus/it/hibernate/reactive/mssql/HibernateReactiveMSSQLTestEndpoint.java

@@ -1,15 +1,16 @@
 package io.quarkus.it.hibernate.reactive.mssql;
 
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+
 import org.hibernate.reactive.mutiny.Mutiny;
 
 import io.smallrye.mutiny.Uni;
 import io.vertx.mutiny.mssqlclient.MSSQLPool;
 import io.vertx.mutiny.sqlclient.Row;
 import io.vertx.mutiny.sqlclient.RowSet;
 import io.vertx.mutiny.sqlclient.Tuple;
-import jakarta.inject.Inject;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
 
 @Path("/tests")
 public class HibernateReactiveMSSQLTestEndpoint {

integration-tests/opentelemetry-redis-instrumentation/src/test/java/io/quarkus/it/opentelemetry/QuarkusOpenTelemetryRedisIT.java

@@ -1,12 +1,14 @@
 package io.quarkus.it.opentelemetry;
 
+import java.util.Map;
+
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 
 @QuarkusIntegrationTest
 class QuarkusOpenTelemetryRedisIT extends QuarkusOpenTelemetryRedisTest {
 
-    @Override
-    String getKey(String k) {
-        return "native-" + k;
+    void checkForException(Map<String, Object> exception) {
+        // Ignore it
+        // The exception is not passed in native mode. (need to be investigated)
     }
 }

integration-tests/opentelemetry-redis-instrumentation/src/test/java/io/quarkus/it/opentelemetry/QuarkusOpenTelemetryRedisTest.java

@@ -117,6 +117,12 @@ public void syncInvalidOperation() {
         assertEquals("bazinga", span.get("name"));
         assertEquals("ERROR", status.get("statusCode"));
         assertEquals("exception", event.get("name"));
+
+        checkForException(exception);
+
+    }
+
+    void checkForException(Map<String, Object> exception) {
         assertThat((String) exception.get("message"), containsString("ERR unknown command 'bazinga'"));
     }
 
@@ -185,7 +191,8 @@ public void reactiveInvalidOperation() {
         assertEquals("bazinga", span.get("name"));
         assertEquals("ERROR", status.get("statusCode"));
         assertEquals("exception", event.get("name"));
-        assertThat((String) exception.get("message"), containsString("ERR unknown command 'bazinga'"));
+
+        checkForException(exception);
     }
 
     private List<Map<String, Object>> getSpans() {

integration-tests/virtual-threads/security-webauthn-virtual-threads/src/test/java/io/quarkus/virtual/security/webauthn/RunOnVirtualThreadIT.java

@@ -1,8 +1,55 @@
 package io.quarkus.virtual.security.webauthn;
 
+import static io.quarkus.virtual.security.webauthn.RunOnVirtualThreadTest.checkLoggedIn;
+
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+
 import io.quarkus.test.junit.QuarkusIntegrationTest;
+import io.quarkus.test.security.webauthn.WebAuthnEndpointHelper;
+import io.quarkus.test.security.webauthn.WebAuthnHardware;
+import io.restassured.RestAssured;
+import io.restassured.filter.cookie.CookieFilter;
+import io.vertx.core.json.JsonObject;
 
 @QuarkusIntegrationTest
-class RunOnVirtualThreadIT extends RunOnVirtualThreadTest {
+class RunOnVirtualThreadIT {
+
+    @Test
+    public void test() {
+
+        RestAssured.get("/open").then().statusCode(200).body(Matchers.is("Hello"));
+        RestAssured
+                .given().redirects().follow(false)
+                .get("/secure").then().statusCode(302);
+        RestAssured
+                .given().redirects().follow(false)
+                .get("/admin").then().statusCode(302);
+        RestAssured
+                .given().redirects().follow(false)
+                .get("/cheese").then().statusCode(302);
+
+        CookieFilter cookieFilter = new CookieFilter();
+        WebAuthnHardware hardwareKey = new WebAuthnHardware();
+        String challenge = WebAuthnEndpointHelper.invokeRegistration("stef", cookieFilter);
+        JsonObject registration = hardwareKey.makeRegistrationJson(challenge);
+
+        // now finalise
+        WebAuthnEndpointHelper.invokeCallback(registration, cookieFilter);
+
+        // make sure our login cookie works
+        checkLoggedIn(cookieFilter);
+
+        // reset cookies for the login phase
+        cookieFilter = new CookieFilter();
+        // now try to log in
+        challenge = WebAuthnEndpointHelper.invokeLogin("stef", cookieFilter);
+        JsonObject login = hardwareKey.makeLoginJson(challenge);
+
+        // now finalise
+        WebAuthnEndpointHelper.invokeCallback(login, cookieFilter);
 
+        // make sure our login cookie still works
+        checkLoggedIn(cookieFilter);
+    }
 }

integration-tests/virtual-threads/security-webauthn-virtual-threads/src/test/java/io/quarkus/virtual/security/webauthn/RunOnVirtualThreadTest.java

@@ -80,7 +80,7 @@ public void test() throws Exception {
         checkLoggedIn(cookieFilter);
     }
 
-    private void checkLoggedIn(CookieFilter cookieFilter) {
+    public static void checkLoggedIn(CookieFilter cookieFilter) {
         RestAssured
                 .given()
                 .filter(cookieFilter)