Repository: camel Updated Branches: refs/heads/master 87b972ea5 -> e3c0f8b75
Fixed test after log4j cleanup Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e3c0f8b7 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e3c0f8b7 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e3c0f8b7 Branch: refs/heads/master Commit: e3c0f8b756d086a72a44ba515a4a954d15dfb304 Parents: 87b972e Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Dec 20 09:29:20 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Dec 20 09:29:20 2016 +0100 ---------------------------------------------------------------------- .../org/apache/camel/util/ResourceHelperTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e3c0f8b7/camel-core/src/test/java/org/apache/camel/util/ResourceHelperTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/util/ResourceHelperTest.java b/camel-core/src/test/java/org/apache/camel/util/ResourceHelperTest.java index cd49eb4..b0448e9 100644 --- a/camel-core/src/test/java/org/apache/camel/util/ResourceHelperTest.java +++ b/camel-core/src/test/java/org/apache/camel/util/ResourceHelperTest.java @@ -42,7 +42,7 @@ public class ResourceHelperTest extends TestSupport { String text = context.getTypeConverter().convertTo(String.class, is); assertNotNull(text); - assertTrue(text.contains("log4j")); + assertTrue(text.contains("rootLogger")); is.close(); context.stop(); @@ -60,7 +60,7 @@ public class ResourceHelperTest extends TestSupport { String text = context.getTypeConverter().convertTo(String.class, is); assertNotNull(text); - assertTrue(text.contains("log4j")); + assertTrue(text.contains("rootLogger")); is.close(); context.stop(); @@ -75,7 +75,7 @@ public class ResourceHelperTest extends TestSupport { String text = context.getTypeConverter().convertTo(String.class, is); assertNotNull(text); - assertTrue(text.contains("log4j")); + assertTrue(text.contains("rootLogger")); is.close(); context.stop(); @@ -83,7 +83,7 @@ public class ResourceHelperTest extends TestSupport { public void testLoadRegistry() throws Exception { SimpleRegistry registry = new SimpleRegistry(); - registry.put("myBean", "This is a log4j logging configuation file"); + registry.put("myBean", "This is a log4j logging configuration file"); CamelContext context = new DefaultCamelContext(registry); context.start(); @@ -107,7 +107,7 @@ public class ResourceHelperTest extends TestSupport { String text = context.getTypeConverter().convertTo(String.class, is); assertNotNull(text); - assertTrue(text.contains("log4j")); + assertTrue(text.contains("rootLogger")); is.close(); context.stop(); @@ -150,7 +150,7 @@ public class ResourceHelperTest extends TestSupport { String text = context.getTypeConverter().convertTo(String.class, url); assertNotNull(text); - assertTrue(text.contains("log4j")); + assertTrue(text.contains("rootLogger")); context.stop(); } @@ -164,7 +164,7 @@ public class ResourceHelperTest extends TestSupport { String text = context.getTypeConverter().convertTo(String.class, url); assertNotNull(text); - assertTrue(text.contains("log4j")); + assertTrue(text.contains("rootLogger")); context.stop(); }