You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2021/05/07 07:37:58 UTC

[camel] branch main updated: CAMEL-16584: support for route template in YAML DS

This is an automated email from the ASF dual-hosted git repository.

lburgazzoli pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 23fd9ec  CAMEL-16584: support for route template in YAML DS
23fd9ec is described below

commit 23fd9ec578da84c7aec13ecc706342528c63f54f
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Fri May 7 09:37:22 2021 +0200

    CAMEL-16584: support for route template in YAML DS
---
 .../org/apache/camel/dsl/yaml/KameletTest.groovy   |  2 +-
 .../apache/camel/dsl/yaml/RouteTemplateTest.groovy | 45 +++++++++++++---------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletTest.groovy
index 0fc4a62..fe3cb16 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletTest.groovy
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletTest.groovy
@@ -226,7 +226,7 @@ class KameletTest extends YamlTestSupport {
                       uri: "kamelet:source"
                       steps:
                         - process:
-                            ref: "myProcessor"
+                            ref: "{{myProcessor}}"
                 - from:
                     uri: "direct:start"
                     steps:
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RouteTemplateTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RouteTemplateTest.groovy
index abddd70..392b297 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RouteTemplateTest.groovy
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RouteTemplateTest.groovy
@@ -16,17 +16,13 @@
  */
 package org.apache.camel.dsl.yaml
 
+import org.apache.camel.component.mock.MockEndpoint
 import org.apache.camel.dsl.yaml.support.YamlTestSupport
-import org.apache.camel.dsl.yaml.support.model.MyBean
+import org.apache.camel.dsl.yaml.support.model.MyUppercaseProcessor
 import org.apache.camel.model.LogDefinition
 import org.apache.camel.model.RouteTemplateDefinition
 
 class RouteTemplateTest extends YamlTestSupport {
-    @Override
-    def doSetup() {
-        context.start()
-    }
-
     def "create template"() {
         when:
             loadRoutes '''
@@ -51,32 +47,45 @@ class RouteTemplateTest extends YamlTestSupport {
     }
 
     def "create template with beans"() {
-        when:
+        setup:
             loadRoutes """
                 - template:
                     id: "myTemplate"
                     beans:
-                      - name: "myBean"
-                        type: ${MyBean.class.name}
-                        properties:
-                          field1: 'f1'
+                      - name: "myProcessor"
+                        type: ${MyUppercaseProcessor.class.name}
                     from:
-                      uri: "direct:info"
+                      uri: "direct:{{directName}}"
                       steps:
-                        - log: "message"
+                        - process:
+                            ref: "{{myProcessor}}"
+                - from:
+                    uri: "direct:start"
+                    steps:
+                      - to: "direct:myId"
+                      - to: "mock:result"
             """
+
+            withMock('mock:result') {
+                expectedMessageCount 1
+                expectedBodiesReceived 'HELLO'
+            }
+        when:
+            context.addRouteFromTemplate('myId', 'myTemplate', ['directName': 'myId'])
+            context.start()
+
+            withTemplate {
+                to('direct:start').withBody('hello').send()
+            }
         then:
             context.routeTemplateDefinitions.size() == 1
 
             with(context.routeTemplateDefinitions[0], RouteTemplateDefinition) {
                 id == 'myTemplate'
                 configurer != null
-
-                route.input.endpointUri == 'direct:info'
-                with (route.outputs[0], LogDefinition) {
-                    message == 'message'
-                }
             }
+
+            MockEndpoint.assertIsSatisfied(context)
     }
 
     def "create template with properties"() {