From 473fed63dafa3e774a3ce266b4aa5c6aef5e88ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Vav=C5=99=C3=ADk?= Date: Sun, 2 Apr 2023 16:59:46 +0200 Subject: [PATCH] Enable tests using Quarkus OpenShift extensions as upstream issue fixed --- ...lessExtensionOpenShiftFunqyKnEventsIT.java | 2 +- ...kerBuildStrategyHttpMinimumReactiveIT.java | 4 +- ...ftUsingExtensionHttpMinimumReactiveIT.java | 4 +- ...trategyOpenShiftHttpMinimumReactiveIT.java | 4 +- ...tensionOpenShiftHttpMinimumReactiveIT.java | 4 +- ...nsionDockerBuildStrategyHttpMinimumIT.java | 4 +- .../OpenShiftUsingExtensionHttpMinimumIT.java | 4 +- ...erBuildStrategyOpenShiftHttpMinimumIT.java | 4 +- ...erlessExtensionOpenShiftHttpMinimumIT.java | 4 +- .../OpenShiftCompressionHandlerIT.java | 2 - .../reactive/OpenShiftHttpCachingIT.java | 2 - .../vertx/OpenShiftUsingExtensionVertxIT.java | 2 - ...onDockerBuildStrategyOpenShiftVertxIT.java | 2 - .../ServerlessExtensionOpenShiftVertxIT.java | 2 - ...OperatorOpenShiftInfinispanCountersIT.java | 3 +- .../OperatorOpenShiftInfinispanObjectsIT.java | 1 - lifecycle-application/pom.xml | 33 ++++++++++++- .../OpenShiftLifecycleApplicationIT.java | 2 +- pom.xml | 2 +- ...onDockerBuildStrategyManyExtensionsIT.java | 4 +- ...enShiftUsingExtensionManyExtensionsIT.java | 4 +- ...uildStrategyOpenShiftManyExtensionsIT.java | 4 +- ...essExtensionOpenShiftManyExtensionsIT.java | 4 +- .../WebSocketsProducerConsumerIT.java | 46 +++++++++++-------- 24 files changed, 74 insertions(+), 73 deletions(-) diff --git a/funqy/knative-events/src/test/java/io/quarkus/ts/funqy/knativeevents/ServerlessExtensionOpenShiftFunqyKnEventsIT.java b/funqy/knative-events/src/test/java/io/quarkus/ts/funqy/knativeevents/ServerlessExtensionOpenShiftFunqyKnEventsIT.java index b51b18f2b..df0c763c3 100644 --- a/funqy/knative-events/src/test/java/io/quarkus/ts/funqy/knativeevents/ServerlessExtensionOpenShiftFunqyKnEventsIT.java +++ b/funqy/knative-events/src/test/java/io/quarkus/ts/funqy/knativeevents/ServerlessExtensionOpenShiftFunqyKnEventsIT.java @@ -36,7 +36,7 @@ import io.quarkus.test.services.knative.eventing.spi.ForwardResponseDTO; import io.restassured.common.mapper.TypeRef; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") +@Disabled("Disabled as flaky") // TODO mvavrik: investigate why the test is flaky @Tag("use-quarkus-openshift-extension") @Tag("serverless") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) diff --git a/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/OpenShiftUsingExtensionDockerBuildStrategyHttpMinimumReactiveIT.java b/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/OpenShiftUsingExtensionDockerBuildStrategyHttpMinimumReactiveIT.java index f6a817a59..09ac48d62 100644 --- a/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/OpenShiftUsingExtensionDockerBuildStrategyHttpMinimumReactiveIT.java +++ b/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/OpenShiftUsingExtensionDockerBuildStrategyHttpMinimumReactiveIT.java @@ -1,14 +1,12 @@ package io.quarkus.ts.http.minimum.reactive; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtensionAndDockerBuildStrategy) public class OpenShiftUsingExtensionDockerBuildStrategyHttpMinimumReactiveIT extends HttpMinimumReactiveIT { -} \ No newline at end of file +} diff --git a/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/OpenShiftUsingExtensionHttpMinimumReactiveIT.java b/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/OpenShiftUsingExtensionHttpMinimumReactiveIT.java index ff733cc86..9d5c06c7c 100644 --- a/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/OpenShiftUsingExtensionHttpMinimumReactiveIT.java +++ b/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/OpenShiftUsingExtensionHttpMinimumReactiveIT.java @@ -1,14 +1,12 @@ package io.quarkus.ts.http.minimum.reactive; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) public class OpenShiftUsingExtensionHttpMinimumReactiveIT extends HttpMinimumReactiveIT { -} \ No newline at end of file +} diff --git a/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/ServerlessExtensionDockerBuildStrategyOpenShiftHttpMinimumReactiveIT.java b/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/ServerlessExtensionDockerBuildStrategyOpenShiftHttpMinimumReactiveIT.java index 6cb97b0f6..4d94e2690 100644 --- a/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/ServerlessExtensionDockerBuildStrategyOpenShiftHttpMinimumReactiveIT.java +++ b/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/ServerlessExtensionDockerBuildStrategyOpenShiftHttpMinimumReactiveIT.java @@ -2,14 +2,12 @@ import static io.restassured.RestAssured.given; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; import io.restassured.specification.RequestSpecification; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @Tag("serverless") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtensionAndDockerBuildStrategy) @@ -20,4 +18,4 @@ public class ServerlessExtensionDockerBuildStrategyOpenShiftHttpMinimumReactiveI protected RequestSpecification givenSpec() { return HTTPS_CLIENT_SPEC; } -} \ No newline at end of file +} diff --git a/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/ServerlessExtensionOpenShiftHttpMinimumReactiveIT.java b/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/ServerlessExtensionOpenShiftHttpMinimumReactiveIT.java index 941468924..09d714c9f 100644 --- a/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/ServerlessExtensionOpenShiftHttpMinimumReactiveIT.java +++ b/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/ServerlessExtensionOpenShiftHttpMinimumReactiveIT.java @@ -2,14 +2,12 @@ import static io.restassured.RestAssured.given; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; import io.restassured.specification.RequestSpecification; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @Tag("serverless") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) @@ -21,4 +19,4 @@ public class ServerlessExtensionOpenShiftHttpMinimumReactiveIT extends HttpMinim protected RequestSpecification givenSpec() { return HTTPS_CLIENT_SPEC; } -} \ No newline at end of file +} diff --git a/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/OpenShiftUsingExtensionDockerBuildStrategyHttpMinimumIT.java b/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/OpenShiftUsingExtensionDockerBuildStrategyHttpMinimumIT.java index 189946ecc..60df2c5f3 100644 --- a/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/OpenShiftUsingExtensionDockerBuildStrategyHttpMinimumIT.java +++ b/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/OpenShiftUsingExtensionDockerBuildStrategyHttpMinimumIT.java @@ -1,14 +1,12 @@ package io.quarkus.ts.http.minimum; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtensionAndDockerBuildStrategy) public class OpenShiftUsingExtensionDockerBuildStrategyHttpMinimumIT extends HttpMinimumIT { -} \ No newline at end of file +} diff --git a/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/OpenShiftUsingExtensionHttpMinimumIT.java b/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/OpenShiftUsingExtensionHttpMinimumIT.java index d001448b4..1e83fc484 100644 --- a/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/OpenShiftUsingExtensionHttpMinimumIT.java +++ b/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/OpenShiftUsingExtensionHttpMinimumIT.java @@ -1,14 +1,12 @@ package io.quarkus.ts.http.minimum; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) public class OpenShiftUsingExtensionHttpMinimumIT extends HttpMinimumIT { -} \ No newline at end of file +} diff --git a/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/ServerlessExtensionDockerBuildStrategyOpenShiftHttpMinimumIT.java b/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/ServerlessExtensionDockerBuildStrategyOpenShiftHttpMinimumIT.java index beb096a71..8c3f89c89 100644 --- a/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/ServerlessExtensionDockerBuildStrategyOpenShiftHttpMinimumIT.java +++ b/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/ServerlessExtensionDockerBuildStrategyOpenShiftHttpMinimumIT.java @@ -2,14 +2,12 @@ import static io.restassured.RestAssured.given; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; import io.restassured.specification.RequestSpecification; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @Tag("serverless") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtensionAndDockerBuildStrategy) @@ -20,4 +18,4 @@ public class ServerlessExtensionDockerBuildStrategyOpenShiftHttpMinimumIT extend protected RequestSpecification givenSpec() { return HTTPS_CLIENT_SPEC; } -} \ No newline at end of file +} diff --git a/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/ServerlessExtensionOpenShiftHttpMinimumIT.java b/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/ServerlessExtensionOpenShiftHttpMinimumIT.java index b46202174..b41514b5a 100644 --- a/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/ServerlessExtensionOpenShiftHttpMinimumIT.java +++ b/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/ServerlessExtensionOpenShiftHttpMinimumIT.java @@ -2,14 +2,12 @@ import static io.restassured.RestAssured.given; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; import io.restassured.specification.RequestSpecification; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @Tag("serverless") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) @@ -20,4 +18,4 @@ public class ServerlessExtensionOpenShiftHttpMinimumIT extends HttpMinimumIT { protected RequestSpecification givenSpec() { return HTTPS_CLIENT_SPEC; } -} \ No newline at end of file +} diff --git a/http/jakarta-rest-reactive/src/test/java/io/quarkus/ts/http/jakartarest/reactive/OpenShiftCompressionHandlerIT.java b/http/jakarta-rest-reactive/src/test/java/io/quarkus/ts/http/jakartarest/reactive/OpenShiftCompressionHandlerIT.java index 7538ab706..9a655cd0c 100644 --- a/http/jakarta-rest-reactive/src/test/java/io/quarkus/ts/http/jakartarest/reactive/OpenShiftCompressionHandlerIT.java +++ b/http/jakarta-rest-reactive/src/test/java/io/quarkus/ts/http/jakartarest/reactive/OpenShiftCompressionHandlerIT.java @@ -1,13 +1,11 @@ package io.quarkus.ts.http.jakartarest.reactive; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; import io.quarkus.test.scenarios.annotations.DisabledOnNative; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) // OCP Native coverage is not required (Test plan QUARKUS-2487), due to a lack of resources and the ROI. diff --git a/http/jakarta-rest-reactive/src/test/java/io/quarkus/ts/http/jakartarest/reactive/OpenShiftHttpCachingIT.java b/http/jakarta-rest-reactive/src/test/java/io/quarkus/ts/http/jakartarest/reactive/OpenShiftHttpCachingIT.java index 09137b700..c5821109e 100644 --- a/http/jakarta-rest-reactive/src/test/java/io/quarkus/ts/http/jakartarest/reactive/OpenShiftHttpCachingIT.java +++ b/http/jakarta-rest-reactive/src/test/java/io/quarkus/ts/http/jakartarest/reactive/OpenShiftHttpCachingIT.java @@ -1,12 +1,10 @@ package io.quarkus.ts.http.jakartarest.reactive; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) public class OpenShiftHttpCachingIT extends HttpCachingIT { diff --git a/http/vertx/src/test/java/io/quarkus/ts/vertx/OpenShiftUsingExtensionVertxIT.java b/http/vertx/src/test/java/io/quarkus/ts/vertx/OpenShiftUsingExtensionVertxIT.java index 9f04e664c..627a99211 100644 --- a/http/vertx/src/test/java/io/quarkus/ts/vertx/OpenShiftUsingExtensionVertxIT.java +++ b/http/vertx/src/test/java/io/quarkus/ts/vertx/OpenShiftUsingExtensionVertxIT.java @@ -1,6 +1,5 @@ package io.quarkus.ts.vertx; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.bootstrap.RestService; @@ -9,7 +8,6 @@ import io.quarkus.test.services.QuarkusApplication; import io.restassured.specification.RequestSpecification; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) public class OpenShiftUsingExtensionVertxIT extends AbstractVertxIT { diff --git a/http/vertx/src/test/java/io/quarkus/ts/vertx/ServerlessExtensionDockerBuildStrategyOpenShiftVertxIT.java b/http/vertx/src/test/java/io/quarkus/ts/vertx/ServerlessExtensionDockerBuildStrategyOpenShiftVertxIT.java index 914f8073c..6da0b51c2 100644 --- a/http/vertx/src/test/java/io/quarkus/ts/vertx/ServerlessExtensionDockerBuildStrategyOpenShiftVertxIT.java +++ b/http/vertx/src/test/java/io/quarkus/ts/vertx/ServerlessExtensionDockerBuildStrategyOpenShiftVertxIT.java @@ -1,6 +1,5 @@ package io.quarkus.ts.vertx; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.bootstrap.RestService; @@ -9,7 +8,6 @@ import io.quarkus.test.services.QuarkusApplication; import io.restassured.specification.RequestSpecification; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @Tag("serverless") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtensionAndDockerBuildStrategy) diff --git a/http/vertx/src/test/java/io/quarkus/ts/vertx/ServerlessExtensionOpenShiftVertxIT.java b/http/vertx/src/test/java/io/quarkus/ts/vertx/ServerlessExtensionOpenShiftVertxIT.java index f69844789..fdb7acd7b 100644 --- a/http/vertx/src/test/java/io/quarkus/ts/vertx/ServerlessExtensionOpenShiftVertxIT.java +++ b/http/vertx/src/test/java/io/quarkus/ts/vertx/ServerlessExtensionOpenShiftVertxIT.java @@ -1,6 +1,5 @@ package io.quarkus.ts.vertx; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.bootstrap.RestService; @@ -9,7 +8,6 @@ import io.quarkus.test.services.QuarkusApplication; import io.restassured.specification.RequestSpecification; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @Tag("serverless") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) diff --git a/infinispan-client/src/test/java/io/quarkus/ts/infinispan/client/OperatorOpenShiftInfinispanCountersIT.java b/infinispan-client/src/test/java/io/quarkus/ts/infinispan/client/OperatorOpenShiftInfinispanCountersIT.java index 43b916d97..45b50e865 100644 --- a/infinispan-client/src/test/java/io/quarkus/ts/infinispan/client/OperatorOpenShiftInfinispanCountersIT.java +++ b/infinispan-client/src/test/java/io/quarkus/ts/infinispan/client/OperatorOpenShiftInfinispanCountersIT.java @@ -21,7 +21,8 @@ import io.quarkus.test.services.QuarkusApplication; import io.quarkus.test.utils.Command; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") +// TODO mvavrik: investigate and enable test! +@Disabled("fails over incorrect response status, mvavrik will investigate in week 14") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class OperatorOpenShiftInfinispanCountersIT extends BaseOpenShiftInfinispanIT { diff --git a/infinispan-client/src/test/java/io/quarkus/ts/infinispan/client/OperatorOpenShiftInfinispanObjectsIT.java b/infinispan-client/src/test/java/io/quarkus/ts/infinispan/client/OperatorOpenShiftInfinispanObjectsIT.java index 55933c3fb..849c2d301 100644 --- a/infinispan-client/src/test/java/io/quarkus/ts/infinispan/client/OperatorOpenShiftInfinispanObjectsIT.java +++ b/infinispan-client/src/test/java/io/quarkus/ts/infinispan/client/OperatorOpenShiftInfinispanObjectsIT.java @@ -26,7 +26,6 @@ import io.quarkus.ts.infinispan.client.serialized.ShopItem; import io.restassured.response.Response; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class OperatorOpenShiftInfinispanObjectsIT extends BaseOpenShiftInfinispanIT { diff --git a/lifecycle-application/pom.xml b/lifecycle-application/pom.xml index aa62c04ff..da8f9d89a 100644 --- a/lifecycle-application/pom.xml +++ b/lifecycle-application/pom.xml @@ -20,11 +20,10 @@ io.quarkus quarkus-resteasy - + io.quarkus quarkus-spring-di @@ -52,5 +51,35 @@ + + windows + + + windows + + + + + + maven-surefire-plugin + + + + false + + + + + maven-failsafe-plugin + + + + false + + + + + + diff --git a/lifecycle-application/src/test/java/io/quarkus/ts/lifecycle/OpenShiftLifecycleApplicationIT.java b/lifecycle-application/src/test/java/io/quarkus/ts/lifecycle/OpenShiftLifecycleApplicationIT.java index e983a5827..2ebe4b1b0 100644 --- a/lifecycle-application/src/test/java/io/quarkus/ts/lifecycle/OpenShiftLifecycleApplicationIT.java +++ b/lifecycle-application/src/test/java/io/quarkus/ts/lifecycle/OpenShiftLifecycleApplicationIT.java @@ -13,7 +13,7 @@ import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") +@Disabled("https://github.com/quarkusio/quarkus/issues/29451") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) public class OpenShiftLifecycleApplicationIT extends LifecycleApplicationIT { diff --git a/pom.xml b/pom.xml index ea9eaff6c..6107f118a 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ jvm registry.access.redhat.com/ubi8/openjdk-11:latest - quay.io/quarkus/ubi-quarkus-native-s2i:22.2-java17 + quay.io/quarkus/ubi-quarkus-graalvmce-s2i:22.3-java17 format sort diff --git a/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/OpenShiftUsingExtensionDockerBuildStrategyManyExtensionsIT.java b/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/OpenShiftUsingExtensionDockerBuildStrategyManyExtensionsIT.java index c25319ca1..af56b9bde 100644 --- a/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/OpenShiftUsingExtensionDockerBuildStrategyManyExtensionsIT.java +++ b/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/OpenShiftUsingExtensionDockerBuildStrategyManyExtensionsIT.java @@ -1,14 +1,12 @@ package io.quarkus.ts.many.extensions; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtensionAndDockerBuildStrategy) public class OpenShiftUsingExtensionDockerBuildStrategyManyExtensionsIT extends ManyExtensionsIT { -} \ No newline at end of file +} diff --git a/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/OpenShiftUsingExtensionManyExtensionsIT.java b/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/OpenShiftUsingExtensionManyExtensionsIT.java index 920b5f89c..88b516dde 100644 --- a/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/OpenShiftUsingExtensionManyExtensionsIT.java +++ b/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/OpenShiftUsingExtensionManyExtensionsIT.java @@ -1,14 +1,12 @@ package io.quarkus.ts.many.extensions; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) public class OpenShiftUsingExtensionManyExtensionsIT extends ManyExtensionsIT { -} \ No newline at end of file +} diff --git a/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/ServerlessExtensionDockerBuildStrategyOpenShiftManyExtensionsIT.java b/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/ServerlessExtensionDockerBuildStrategyOpenShiftManyExtensionsIT.java index dc2b18236..a6af3fb99 100644 --- a/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/ServerlessExtensionDockerBuildStrategyOpenShiftManyExtensionsIT.java +++ b/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/ServerlessExtensionDockerBuildStrategyOpenShiftManyExtensionsIT.java @@ -2,14 +2,12 @@ import static io.restassured.RestAssured.given; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; import io.restassured.specification.RequestSpecification; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @Tag("serverless") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtensionAndDockerBuildStrategy) @@ -20,4 +18,4 @@ public class ServerlessExtensionDockerBuildStrategyOpenShiftManyExtensionsIT ext protected RequestSpecification givenSpec() { return HTTPS_CLIENT_SPEC; } -} \ No newline at end of file +} diff --git a/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/ServerlessExtensionOpenShiftManyExtensionsIT.java b/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/ServerlessExtensionOpenShiftManyExtensionsIT.java index accf890f2..e204a8938 100644 --- a/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/ServerlessExtensionOpenShiftManyExtensionsIT.java +++ b/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/ServerlessExtensionOpenShiftManyExtensionsIT.java @@ -2,14 +2,12 @@ import static io.restassured.RestAssured.given; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; import io.restassured.specification.RequestSpecification; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @Tag("serverless") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) @@ -21,4 +19,4 @@ public class ServerlessExtensionOpenShiftManyExtensionsIT extends ManyExtensions protected RequestSpecification givenSpec() { return HTTPS_CLIENT_SPEC; } -} \ No newline at end of file +} diff --git a/websockets/quarkus-websockets/src/test/java/io/quarkus/ts/websockets/producer/WebSocketsProducerConsumerIT.java b/websockets/quarkus-websockets/src/test/java/io/quarkus/ts/websockets/producer/WebSocketsProducerConsumerIT.java index bbdf60163..0de883587 100644 --- a/websockets/quarkus-websockets/src/test/java/io/quarkus/ts/websockets/producer/WebSocketsProducerConsumerIT.java +++ b/websockets/quarkus-websockets/src/test/java/io/quarkus/ts/websockets/producer/WebSocketsProducerConsumerIT.java @@ -1,5 +1,7 @@ package io.quarkus.ts.websockets.producer; +import static java.time.Duration.ofSeconds; + import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; @@ -15,6 +17,7 @@ import jakarta.websocket.OnOpen; import jakarta.websocket.Session; +import org.awaitility.Awaitility; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -33,7 +36,7 @@ public void smoke() throws Exception { Client client = new Client(); try (Session session = connect(client, getUri("/chat/stu"))) { session.getAsyncRemote().sendText("hello world"); - Assertions.assertEquals(">> stu: hello world", client.getMessage()); + assertMessage(">> stu: hello world", client); } } @@ -46,12 +49,10 @@ public void chatting() throws Exception { try (Session bob = connect(bobChat, getUri("/chat/bob"))) { alice.getAsyncRemote().sendText("hello bob"); - Assertions.assertEquals(">> alice: hello bob", aliceChat.getMessage()); - Assertions.assertEquals(">> alice: hello bob", bobChat.getMessage()); + assertMessage(">> alice: hello bob", aliceChat, bobChat); bob.getAsyncRemote().sendText("hello alice"); - Assertions.assertEquals(">> bob: hello alice", bobChat.getMessage()); - Assertions.assertEquals(">> bob: hello alice", aliceChat.getMessage()); + assertMessage(">> bob: hello alice", bobChat, aliceChat); } } } @@ -65,19 +66,14 @@ public void trio() throws Exception { try (Session porthos = connect(porthosChat, getUri("/chat/porthos"))) { try (Session aramis = connect(aramisChat, getUri("/chat/aramis"))) { athos.getAsyncRemote().sendText("hello, friends"); - Assertions.assertEquals(">> athos: hello, friends", athosChat.getMessage()); - Assertions.assertEquals(">> athos: hello, friends", porthosChat.getMessage()); - Assertions.assertEquals(">> athos: hello, friends", aramisChat.getMessage()); + assertMessage(">> athos: hello, friends", athosChat, porthosChat, aramisChat); aramis.getAsyncRemote().sendText("Adios, Athos!"); - Assertions.assertEquals(">> aramis: Adios, Athos!", athosChat.getMessage()); - Assertions.assertEquals(">> aramis: Adios, Athos!", porthosChat.getMessage()); - Assertions.assertEquals(">> aramis: Adios, Athos!", aramisChat.getMessage()); + assertMessage(">> aramis: Adios, Athos!", athosChat, porthosChat, aramisChat); athos.close(); Assertions.assertNull(athosChat.getMessage()); - Assertions.assertEquals("User athos left", porthosChat.getMessage()); - Assertions.assertEquals("User athos left", aramisChat.getMessage()); + assertMessage("User athos left", porthosChat, aramisChat); } } } @@ -87,7 +83,7 @@ public void i18n() throws Exception { Client client = new Client(); try (Session session = connect(client, getUri("/chat/traveler"))) { session.getAsyncRemote().sendText("今日は přátelé, как дела? \uD83E\uDED6 ?"); - Assertions.assertEquals(">> traveler: 今日は přátelé, как дела? \uD83E\uDED6 ?", client.getMessage()); + assertMessage(">> traveler: 今日は přátelé, как дела? \uD83E\uDED6 ?", client); } } @@ -95,22 +91,32 @@ public void i18n() throws Exception { public void push() throws Exception { Client client = new Client(); try (Session session = connect(client, getUri("/push"))) { - Assertions.assertEquals("One", client.getMessage()); - Assertions.assertEquals("Two", client.getMessage()); - Assertions.assertEquals("Three", client.getMessage()); - Assertions.assertEquals("Four", client.getMessage()); + assertMessage("One", client); + assertMessage("Two", client); + assertMessage("Three", client); + assertMessage("Four", client); } } // TODO change following code when this will be fixed https://github.com/quarkus-qe/quarkus-test-framework/issues/263 - private URI getUri(String with) throws URISyntaxException { + private static URI getUri(String with) throws URISyntaxException { return new URI(server.getHost() + ":" + server.getPort()).resolve(with); } - private Session connect(Client client, URI uri) throws DeploymentException, IOException { + private static Session connect(Client client, URI uri) throws DeploymentException, IOException { return ContainerProvider.getWebSocketContainer().connectToServer(client, uri); } + private static void assertMessage(String expectedMessage, Client... clients) { + for (Client client : clients) { + // message has been sent asynchronously, therefore we should wait a little + Awaitility + .await() + .atMost(ofSeconds(2)) + .untilAsserted(() -> Assertions.assertEquals(expectedMessage, client.getMessage())); + } + } + @ClientEndpoint public static class Client { private final LinkedBlockingDeque messages = new LinkedBlockingDeque<>();