This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch camel-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 85cb9c2d31e9c7584188977640de82ee1fac8c18 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Wed Aug 12 09:54:57 2020 +0200 CAMEL-14297: Introduce RouteBuilderConfigurer. Check route names in test, thanks Peter. --- .../src/main/java/org/apache/camel/quarkus/core/CoreResource.java | 5 +++-- .../core/src/main/java/org/apache/camel/quarkus/core/CoreRoutes.java | 2 +- .../core/src/test/java/org/apache/camel/quarkus/core/CoreTest.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CoreResource.java b/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CoreResource.java index a263769..af45a13 100644 --- a/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CoreResource.java +++ b/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CoreResource.java @@ -39,6 +39,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.ExtendedCamelContext; import org.apache.camel.NoSuchLanguageException; +import org.apache.camel.Route; import org.apache.camel.builder.RouteBuilderConfigurer; import org.apache.camel.catalog.RuntimeCamelCatalog; import org.apache.camel.component.log.LogComponent; @@ -79,9 +80,9 @@ public class CoreResource { @Path("/routes/lookup-routes") @GET @Produces(MediaType.TEXT_PLAIN) - public boolean lookupRoutes() { + public String lookupRoutes() { // there should be 2 routes, the one with RouteBuilderConfigurer method above and from CoreRoutes.java - return context.getRoutes().size() == 2; + return context.getRoutes().stream().map(Route::getId).sorted().collect(Collectors.joining(",")); } @Path("/registry/lookup-registry") diff --git a/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CoreRoutes.java b/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CoreRoutes.java index e3bb7e3..4aa1678 100644 --- a/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CoreRoutes.java +++ b/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CoreRoutes.java @@ -23,7 +23,7 @@ public class CoreRoutes extends RouteBuilder { @Override public void configure() { from("timer:keep-alive") - .id("timer") + .routeId("timer") .setBody().constant("I'm alive !") .to("log:keep-alive"); diff --git a/integration-tests/core/src/test/java/org/apache/camel/quarkus/core/CoreTest.java b/integration-tests/core/src/test/java/org/apache/camel/quarkus/core/CoreTest.java index 7dbf748..f45b7f0 100644 --- a/integration-tests/core/src/test/java/org/apache/camel/quarkus/core/CoreTest.java +++ b/integration-tests/core/src/test/java/org/apache/camel/quarkus/core/CoreTest.java @@ -42,7 +42,7 @@ public class CoreTest { @Test public void testLookupRoutes() { - RestAssured.when().get("/test/routes/lookup-routes").then().body(is("true")); + RestAssured.when().get("/test/routes/lookup-routes").then().body(is("bar,timer")); } @Test