This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
The following commit(s) were added to refs/heads/master by this push: new 615f043 quarkus: consolidate kamelet integration tests 615f043 is described below commit 615f043730578f506bc35b2b782f718b7f292050 Author: Luca Burgazzoli <lburgazz...@gmail.com> AuthorDate: Wed Sep 23 09:24:40 2020 +0200 quarkus: consolidate kamelet integration tests --- .github/workflows/ci-build.yml | 1 - .../camel-k-quarkus-itests-kamelet/pom.xml | 28 +++- .../{kamelet/deployment => it}/Application.java | 32 ++-- .../src/main/resources/application.properties | 6 +- .../org/apache/camel/k/quarkus/it/RuntimeIT.java | 0 .../KameletTest.java => it/RuntimeTest.java} | 30 ++-- .../k/quarkus/kamelet/deployment/KameletIT.java | 23 --- .../src/test/resources/routes.properties | 7 +- .../src/test/resources/routes/process.yaml} | 0 .../src/test/resources/routes/set-body.yaml | 0 .../src/test/resources/routes/to-upper.yaml} | 4 +- .../camel-k-quarkus-itests-runtime-kamelet/pom.xml | 167 --------------------- .../org/apache/camel/k/quarkus/it/Application.java | 40 ----- .../src/main/resources/application.properties | 23 --- .../org/apache/camel/k/quarkus/it/RuntimeTest.java | 38 ----- camel-k-quarkus/camel-k-quarkus-itests/pom.xml | 9 +- 16 files changed, 65 insertions(+), 343 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 7a0dc49..f7e591d 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -111,7 +111,6 @@ jobs: native-image-project: - :camel-k-quarkus-itests-core - :camel-k-quarkus-itests-runtime - - :camel-k-quarkus-itests-runtime-kamelet - :camel-k-quarkus-itests-cron - :camel-k-quarkus-itests-master - :camel-k-quarkus-itests-kamelet diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/pom.xml index 2f1b1c7..1681d65 100644 --- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/pom.xml @@ -30,10 +30,21 @@ <dependencies> <dependency> <groupId>org.apache.camel.k</groupId> + <artifactId>camel-k-runtime-quarkus</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel.k</groupId> <artifactId>camel-k-quarkus-kamelet</artifactId> </dependency> + <dependency> + <groupId>org.apache.camel.k</groupId> + <artifactId>camel-k-quarkus-loader-yaml</artifactId> + </dependency> - <!-- quarkus dependencies --> + <dependency> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-jsonb</artifactId> + </dependency> <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-resteasy</artifactId> @@ -100,13 +111,14 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> + <environmentVariables> + <ROUTES_DIR>${project.basedir}/src/test/resources/routes</ROUTES_DIR> + <CAMEL_K_CONF>${project.basedir}/src/test/resources/routes.properties</CAMEL_K_CONF> + </environmentVariables> <systemProperties> <quarkus.http.test-port>${test.http.port.jvm}</quarkus.http.test-port> <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager> </systemProperties> - <environmentVariables> - <CAMEL_KNATIVE_CONFIGURATION>file:${project.basedir}/src/main/resources/env.json</CAMEL_KNATIVE_CONFIGURATION> - </environmentVariables> </configuration> </plugin> </plugins> @@ -135,13 +147,14 @@ <goal>verify</goal> </goals> <configuration> + <environmentVariables> + <ROUTES_DIR>${project.basedir}/src/test/resources/routes</ROUTES_DIR> + <CAMEL_K_CONF>${project.basedir}/src/test/resources/routes.properties</CAMEL_K_CONF> + </environmentVariables> <systemProperties> <quarkus.http.test-port>${test.http.port.native}</quarkus.http.test-port> <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path> </systemProperties> - <environmentVariables> - <CAMEL_KNATIVE_CONFIGURATION>file:${project.basedir}/src/main/resources/env.json</CAMEL_KNATIVE_CONFIGURATION> - </environmentVariables> </configuration> </execution> </executions> @@ -151,5 +164,4 @@ </profile> </profiles> - </project> diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/main/java/org/apache/camel/k/quarkus/kamelet/deployment/Application.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/main/java/org/apache/camel/k/quarkus/it/Application.java similarity index 75% rename from camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/main/java/org/apache/camel/k/quarkus/kamelet/deployment/Application.java rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/main/java/org/apache/camel/k/quarkus/it/Application.java index a45053e..2e111c5 100644 --- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/main/java/org/apache/camel/k/quarkus/kamelet/deployment/Application.java +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/main/java/org/apache/camel/k/quarkus/it/Application.java @@ -14,9 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.k.quarkus.kamelet.deployment; +package org.apache.camel.k.quarkus.it; -import java.util.Locale; import java.util.stream.Collectors; import javax.enterprise.context.ApplicationScoped; @@ -31,18 +30,16 @@ import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import io.quarkus.runtime.annotations.RegisterForReflection; import org.apache.camel.CamelContext; import org.apache.camel.FluentProducerTemplate; -import org.apache.camel.builder.RouteBuilder; import org.apache.camel.model.ModelCamelContext; import org.apache.camel.model.RouteTemplateDefinition; - +@RegisterForReflection(targets = { String.class }) @Path("/test") @ApplicationScoped public class Application { - public static final String TEMPLATE_ID = "to-upper"; - @Inject CamelContext context; @Inject @@ -60,25 +57,18 @@ public class Application { .build(); } + @GET + @Path("/execute") + @Produces(MediaType.TEXT_PLAIN) + public String execute() { + return template.to("direct:process").request(String.class); + } + @POST - @Path("/invoke/{templateId}") + @Path("/execute/{templateId}") @Consumes(MediaType.TEXT_PLAIN) @Produces(MediaType.TEXT_PLAIN) public String invoke(@PathParam("templateId") String templateId, String message) { return template.toF("kamelet:%s/test?message=%s", templateId, message).request(String.class); } - - @javax.enterprise.inject.Produces - public RouteBuilder routes() { - return new RouteBuilder() { - @Override - public void configure() throws Exception { - routeTemplate(TEMPLATE_ID) - .templateParameter("message") - .from("direct:{{routeId}}") - .setBody().constant("{{message}}") - .transform().body(String.class, b -> b.toUpperCase(Locale.US)); - } - }; - } } diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/main/resources/application.properties b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/main/resources/application.properties index b51efa2..3ce5493 100644 --- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/main/resources/application.properties +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/main/resources/application.properties @@ -18,10 +18,6 @@ # # Quarkus # +quarkus.log.console.enable = false quarkus.banner.enabled = false -# -# Quarkus :: Camel -# -quarkus.camel.routes-discovery.enabled = false - diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime-kamelet/src/test/java/org/apache/camel/k/quarkus/it/RuntimeIT.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/test/java/org/apache/camel/k/quarkus/it/RuntimeIT.java similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime-kamelet/src/test/java/org/apache/camel/k/quarkus/it/RuntimeIT.java rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/test/java/org/apache/camel/k/quarkus/it/RuntimeIT.java diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/test/java/org/apache/camel/k/quarkus/kamelet/deployment/KameletTest.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/test/java/org/apache/camel/k/quarkus/it/RuntimeTest.java similarity index 77% rename from camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/test/java/org/apache/camel/k/quarkus/kamelet/deployment/KameletTest.java rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/test/java/org/apache/camel/k/quarkus/it/RuntimeTest.java index fbb2c02..6612ffb 100644 --- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/test/java/org/apache/camel/k/quarkus/kamelet/deployment/KameletTest.java +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/test/java/org/apache/camel/k/quarkus/it/RuntimeTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.k.quarkus.kamelet.deployment; +package org.apache.camel.k.quarkus.it; import java.util.Locale; @@ -28,9 +28,11 @@ import org.junit.jupiter.api.Test; import static io.restassured.RestAssured.given; import static org.assertj.core.api.Assertions.assertThat; +import static org.hamcrest.Matchers.is; @QuarkusTest -public class KameletTest { +public class RuntimeTest { + @Test public void inspect() { JsonPath p = RestAssured.given() @@ -39,27 +41,37 @@ public class KameletTest { .get("/test/inspect") .then() .statusCode(200) - .extract() + .extract() .body() .jsonPath(); - assertThat(p.getList("templates", String.class)).contains(Application.TEMPLATE_ID); + assertThat(p.getList("templates", String.class)).containsExactlyInAnyOrder("to-upper", "set-body"); + } + + @Test + public void execute() { + RestAssured.given() + .accept(MediaType.TEXT_PLAIN) + .get("/test/execute") + .then() + .statusCode(200) + .body(is("template")); } @Test - public void invoke() { + public void executeTemplate() { final String payload = "test"; String result = given() .body(payload) .header(Exchange.CONTENT_TYPE, "text/plain") - .when() - .post("/test/invoke/{templateId}", Application.TEMPLATE_ID) - .then() + .when() + .post("/test/execute/{templateId}", "to-upper") + .then() .statusCode(200) .extract() .asString(); assertThat(result).isEqualTo(payload.toUpperCase(Locale.US)); } -} +} \ No newline at end of file diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/test/java/org/apache/camel/k/quarkus/kamelet/deployment/KameletIT.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/test/java/org/apache/camel/k/quarkus/kamelet/deployment/KameletIT.java deleted file mode 100644 index 80ff5d9..0000000 --- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/test/java/org/apache/camel/k/quarkus/kamelet/deployment/KameletIT.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.k.quarkus.kamelet.deployment; - -import io.quarkus.test.junit.NativeImageTest; - -@NativeImageTest -public class KameletIT extends KameletTest { -} \ No newline at end of file diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime-kamelet/src/test/resources/routes.properties b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/test/resources/routes.properties similarity index 80% rename from camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime-kamelet/src/test/resources/routes.properties rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/test/resources/routes.properties index 19f71fb..f8882db 100644 --- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime-kamelet/src/test/resources/routes.properties +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/test/resources/routes.properties @@ -22,9 +22,12 @@ camel.k.sources[0].location = file:{{env:ROUTES_DIR}}/set-body.yaml camel.k.sources[0].type = template camel.k.sources[0].property-names[0] = bodyValue +camel.k.sources[1].location = file:{{env:ROUTES_DIR}}/to-upper.yaml +camel.k.sources[1].type = template +camel.k.sources[1].property-names[0] = message # # camel-k - sources (routes) # -camel.k.sources[1].location = file:{{env:ROUTES_DIR}}/route.yaml -camel.k.sources[1].type = source \ No newline at end of file +camel.k.sources[2].location = file:{{env:ROUTES_DIR}}/process.yaml +camel.k.sources[2].type = source \ No newline at end of file diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime-kamelet/src/test/resources/routes/route.yaml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/test/resources/routes/process.yaml similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime-kamelet/src/test/resources/routes/route.yaml rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/test/resources/routes/process.yaml diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime-kamelet/src/test/resources/routes/set-body.yaml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/test/resources/routes/set-body.yaml similarity index 100% copy from camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime-kamelet/src/test/resources/routes/set-body.yaml copy to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/test/resources/routes/set-body.yaml diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime-kamelet/src/test/resources/routes/set-body.yaml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/test/resources/routes/to-upper.yaml similarity index 89% rename from camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime-kamelet/src/test/resources/routes/set-body.yaml rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/test/resources/routes/to-upper.yaml index 55347e9..74105f1 100644 --- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime-kamelet/src/test/resources/routes/set-body.yaml +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/test/resources/routes/to-upper.yaml @@ -19,4 +19,6 @@ uri: "direct:{{routeId}}" steps: - set-body: - constant: "{{bodyValue}}" \ No newline at end of file + constant: "{{message}}" + - set-body: + simple: "${in.body.toUpperCase()}" \ No newline at end of file diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime-kamelet/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime-kamelet/pom.xml deleted file mode 100644 index a929068..0000000 --- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime-kamelet/pom.xml +++ /dev/null @@ -1,167 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-quarkus-itests</artifactId> - <version>1.5.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>camel-k-quarkus-itests-runtime-kamelet</artifactId> - - <dependencies> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-runtime-quarkus</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-quarkus-kamelet</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-quarkus-loader-yaml</artifactId> - </dependency> - - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-jsonb</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-resteasy</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-resteasy-jsonb</artifactId> - </dependency> - - <!-- test dependencies --> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit5</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>io.rest-assured</groupId> - <artifactId>rest-assured</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>${build-helper-maven-plugin-version}</version> - <executions> - <execution> - <id>reserve-network-port</id> - <goals> - <goal>reserve-network-port</goal> - </goals> - <phase>process-resources</phase> - <configuration> - <portNames> - <portName>test.http.port.jvm</portName> - <portName>test.http.port.native</portName> - </portNames> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-maven-plugin</artifactId> - <version>${quarkus-version}</version> - <executions> - <execution> - <goals> - <goal>build</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <environmentVariables> - <ROUTES_DIR>${project.basedir}/src/test/resources/routes</ROUTES_DIR> - <CAMEL_K_CONF>${project.basedir}/src/test/resources/routes.properties</CAMEL_K_CONF> - </environmentVariables> - <systemProperties> - <quarkus.http.test-port>${test.http.port.jvm}</quarkus.http.test-port> - <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>native</id> - <activation> - <property> - <name>native</name> - </property> - </activation> - <properties> - <quarkus.package.type>native</quarkus.package.type> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - <configuration> - <environmentVariables> - <ROUTES_DIR>${project.basedir}/src/test/resources/routes</ROUTES_DIR> - <CAMEL_K_CONF>${project.basedir}/src/test/resources/routes.properties</CAMEL_K_CONF> - </environmentVariables> - <systemProperties> - <quarkus.http.test-port>${test.http.port.native}</quarkus.http.test-port> - <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path> - </systemProperties> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime-kamelet/src/main/java/org/apache/camel/k/quarkus/it/Application.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime-kamelet/src/main/java/org/apache/camel/k/quarkus/it/Application.java deleted file mode 100644 index d9f338f..0000000 --- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime-kamelet/src/main/java/org/apache/camel/k/quarkus/it/Application.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.k.quarkus.it; - -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - -import org.apache.camel.FluentProducerTemplate; - -@Path("/test") -@ApplicationScoped -public class Application { - @Inject - FluentProducerTemplate template; - - @GET - @Path("/execute") - @Produces(MediaType.TEXT_PLAIN) - public String execute() { - return template.to("direct:process").request(String.class); - } -} diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime-kamelet/src/main/resources/application.properties b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime-kamelet/src/main/resources/application.properties deleted file mode 100644 index 3ce5493..0000000 --- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime-kamelet/src/main/resources/application.properties +++ /dev/null @@ -1,23 +0,0 @@ -## --------------------------------------------------------------------------- -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## --------------------------------------------------------------------------- - -# -# Quarkus -# -quarkus.log.console.enable = false -quarkus.banner.enabled = false - diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime-kamelet/src/test/java/org/apache/camel/k/quarkus/it/RuntimeTest.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime-kamelet/src/test/java/org/apache/camel/k/quarkus/it/RuntimeTest.java deleted file mode 100644 index 1b74c43..0000000 --- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime-kamelet/src/test/java/org/apache/camel/k/quarkus/it/RuntimeTest.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.k.quarkus.it; - -import javax.ws.rs.core.MediaType; - -import io.quarkus.test.junit.QuarkusTest; -import io.restassured.RestAssured; -import org.junit.jupiter.api.Test; - -import static org.hamcrest.Matchers.is; - -@QuarkusTest -public class RuntimeTest { - @Test - public void invoke() { - RestAssured.given() - .accept(MediaType.TEXT_PLAIN) - .get("/test/execute") - .then() - .statusCode(200) - .body(is("template")); - } -} \ No newline at end of file diff --git a/camel-k-quarkus/camel-k-quarkus-itests/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/pom.xml index e75e73e..53742d7 100644 --- a/camel-k-quarkus/camel-k-quarkus-itests/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-itests/pom.xml @@ -30,10 +30,6 @@ <modules> <module>camel-k-quarkus-itests-core</module> - <module>camel-k-quarkus-itests-cron</module> - <module>camel-k-quarkus-itests-master</module> - <module>camel-k-quarkus-itests-kamelet</module> - <module>camel-k-quarkus-itests-knative</module> <module>camel-k-quarkus-itests-loader-support</module> <module>camel-k-quarkus-itests-loader-groovy</module> <module>camel-k-quarkus-itests-loader-kotlin</module> @@ -42,8 +38,11 @@ <module>camel-k-quarkus-itests-loader-xml</module> <module>camel-k-quarkus-itests-loader-yaml</module> <module>camel-k-quarkus-itests-polyglot</module> + <module>camel-k-quarkus-itests-cron</module> + <module>camel-k-quarkus-itests-master</module> + <module>camel-k-quarkus-itests-knative</module> + <module>camel-k-quarkus-itests-kamelet</module> <module>camel-k-quarkus-itests-runtime</module> - <module>camel-k-quarkus-itests-runtime-kamelet</module> </modules> </project>