[camel] branch master updated: CAMEL-16401: Fix failing test

[lburgazzoli]

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.git


The following commit(s) were added to refs/heads/master by this push:
     new 0b84c65  CAMEL-16401: Fix failing test
0b84c65 is described below

commit 0b84c65ee3afc1a7b1b5b37a25171d614acfde53
Author: Luca Burgazzoli <lburgazz...@gmail.com>
AuthorDate: Thu Mar 25 13:08:54 2021 +0100

    CAMEL-16401: Fix failing test
---
 .../builder/RouteTemplateErrorHandlerTest.java     | 23 +++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git 
a/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateErrorHandlerTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateErrorHandlerTest.java
index 182928d..33c5d53 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateErrorHandlerTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateErrorHandlerTest.java
@@ -16,9 +16,13 @@
  */
 package org.apache.camel.builder;
 
+import org.apache.camel.Channel;
 import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.impl.engine.DefaultRoute;
+import org.apache.camel.processor.errorhandler.NoErrorHandler;
 import org.junit.jupiter.api.Test;
 
+import static org.apache.camel.TestSupport.unwrapChannel;
 import static org.apache.camel.util.CollectionHelper.mapOf;
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -44,18 +48,27 @@ public class RouteTemplateErrorHandlerTest {
             });
 
             assertThat(context.getRouteDefinitions()).first().satisfies(d -> {
-                
assertThat(d.getErrorHandlerFactory()).isInstanceOfSatisfying(ErrorHandlerBuilderRef.class,
 r -> {
-                    assertThat(r.getRef()).isEqualTo("myErrorHandler");
+                
assertThat(d.getErrorHandlerFactory()).isInstanceOfSatisfying(ErrorHandlerBuilderRef.class,
 h -> {
+                    assertThat(h.getRef()).isEqualTo("myErrorHandler");
                 });
             });
 
             
assertThat(context.getRouteTemplateDefinitions()).first().satisfies(d -> {
-                
assertThat(d.route().getErrorHandlerFactory()).isInstanceOfSatisfying(ErrorHandlerBuilderRef.class,
 r -> {
-                    assertThat(r.getRef()).isEqualTo("myErrorHandler");
+                
assertThat(d.route().getErrorHandlerFactory()).isInstanceOfSatisfying(ErrorHandlerBuilderRef.class,
 h -> {
+                    assertThat(h.getRef()).isEqualTo("myErrorHandler");
                 });
             });
 
-            context.addRouteFromTemplate("myTemplate", "", mapOf("", ""));
+            context.addRouteFromTemplate("myId", "myTemplate", mapOf("foo", 
"f", "bar", "b"));
+            context.start();
+
+            assertThat(context.getRoutes()).allSatisfy(r -> {
+                assertThat(r).isInstanceOfSatisfying(DefaultRoute.class, dr -> 
{
+                    Channel channel = unwrapChannel(r.getProcessor());
+                    assertThat(channel).isNotNull();
+                    
assertThat(channel.getErrorHandler()).isInstanceOf(NoErrorHandler.class);
+                });
+            });
         }
     }
 }