diff --git a/examples/https/pom.xml b/examples/https/pom.xml index 0721251d2..cac10245f 100644 --- a/examples/https/pom.xml +++ b/examples/https/pom.xml @@ -19,6 +19,11 @@ quarkus-test-core test + + io.quarkus.qe + quarkus-test-openshift + test + diff --git a/examples/https/src/test/java/io/quarkus/qe/HttpIT.java b/examples/https/src/test/java/io/quarkus/qe/HttpIT.java new file mode 100644 index 000000000..2a7188abb --- /dev/null +++ b/examples/https/src/test/java/io/quarkus/qe/HttpIT.java @@ -0,0 +1,25 @@ +package io.quarkus.qe; + +import static io.quarkus.test.utils.AwaitilityUtils.untilAsserted; +import static io.restassured.RestAssured.given; +import static org.hamcrest.Matchers.is; + +import org.apache.http.HttpStatus; +import org.junit.jupiter.api.Test; + +import io.quarkus.test.scenarios.QuarkusScenario; +import io.restassured.specification.RequestSpecification; + +@QuarkusScenario +public class HttpIT { + + private final RequestSpecification spec = given(); + + @Test + public void shouldSayHelloWorld() { + untilAsserted(() -> spec.get("/greeting") + .then() + .statusCode(HttpStatus.SC_OK) + .body(is("Hello World!"))); + } +} diff --git a/examples/https/src/test/java/io/quarkus/qe/OpenShiftHttpIT.java b/examples/https/src/test/java/io/quarkus/qe/OpenShiftHttpIT.java new file mode 100644 index 000000000..e34981048 --- /dev/null +++ b/examples/https/src/test/java/io/quarkus/qe/OpenShiftHttpIT.java @@ -0,0 +1,8 @@ +package io.quarkus.qe; + +import io.quarkus.test.scenarios.OpenShiftScenario; + +@OpenShiftScenario +public class OpenShiftHttpIT extends HttpIT { + +} diff --git a/quarkus-test-openshift/src/main/java/io/quarkus/test/bootstrap/inject/OpenShiftClient.java b/quarkus-test-openshift/src/main/java/io/quarkus/test/bootstrap/inject/OpenShiftClient.java index fac36a593..c6844e1c0 100644 --- a/quarkus-test-openshift/src/main/java/io/quarkus/test/bootstrap/inject/OpenShiftClient.java +++ b/quarkus-test-openshift/src/main/java/io/quarkus/test/bootstrap/inject/OpenShiftClient.java @@ -66,6 +66,7 @@ import io.fabric8.openshift.client.NamespacedOpenShiftClient; import io.fabric8.openshift.client.OpenShiftConfig; import io.fabric8.openshift.client.OpenShiftConfigBuilder; +import io.fabric8.openshift.client.impl.OpenShiftClientImpl; import io.quarkus.test.bootstrap.Service; import io.quarkus.test.configuration.PropertyLookup; import io.quarkus.test.logging.Log; @@ -98,7 +99,7 @@ public final class OpenShiftClient { private static final String OC = "oc"; private final String currentNamespace; - private final NamespacedOpenShiftClient client; + private final OpenShiftClientImpl client; private final KnativeClient kn; private final String scenarioId; private boolean isClientReady; @@ -118,8 +119,10 @@ private OpenShiftClient(String scenarioId) { kn = client.adapt(KnativeClient.class); } - private static NamespacedOpenShiftClient createClient(OpenShiftConfig config) { - return new KubernetesClientBuilder().withConfig(config).build().adapt(NamespacedOpenShiftClient.class); + private static OpenShiftClientImpl createClient(OpenShiftConfig config) { + return new KubernetesClientBuilder().withConfig(config).build() + .adapt(NamespacedOpenShiftClient.class) + .adapt(OpenShiftClientImpl.class); } public static OpenShiftClient create(String scenarioId) {