[camel] branch master updated: Fixed test

[davsclaus]

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

davsclaus 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 ae645f8  Fixed test
ae645f8 is described below

commit ae645f8f33a3aebc16ded3385c4abc76be8bf386
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Mar 6 15:32:04 2021 +0100

    Fixed test
---
 .../test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git 
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java
 
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java
index c5cf0f5..8ae3347 100644
--- 
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java
+++ 
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java
@@ -28,7 +28,6 @@ import org.apache.camel.support.ResourceHelper;
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.StringHelper;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -71,7 +70,7 @@ public class JettyFreemarkerTest extends CamelTestSupport {
         map.put("firstName", "John");
         map.put("lastName", "Doe");
 
-        String response = 
template.requestBodyAndHeaders("freemarker://http://localhost:"; + port + 
"/test?name=header.ftl", "",
+        String response = 
template.requestBodyAndHeaders("freemarker://http://localhost:"; + port + 
"/test?name=header", "",
                 map, String.class);
 
         assertEquals("Dear Doe, John", response);
@@ -90,9 +89,6 @@ public class JettyFreemarkerTest extends CamelTestSupport {
                                 String name = 
exchange.getIn().getHeader("name", String.class);
                                 ObjectHelper.notNull(name, "name");
 
-                                // strip off the locale
-                                name = StringHelper.before(name, "_");
-
                                 name = "org/apache/camel/itest/jetty/" + name 
+ ".ftl";
                                 InputStream is
                                         = 
ResourceHelper.resolveMandatoryResourceAsInputStream(exchange.getContext(), 
name);