Repository: camel Updated Branches: refs/heads/master d0b5f0498 -> 504cf03de
Fixed the jetty related unit test errors Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/442a29a5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/442a29a5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/442a29a5 Branch: refs/heads/master Commit: 442a29a528ecdd6a973db19647e9fb834d5d0e68 Parents: d0b5f04 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Mon Mar 2 14:37:49 2015 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Mon Mar 2 14:37:49 2015 +0800 ---------------------------------------------------------------------- .../JettyHttpComponentConfigurationAndDocumentationTest.java | 4 ++-- .../jetty/JettyRouteWithUnknownSocketPropertiesTest.java | 2 +- .../jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/442a29a5/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpComponentConfigurationAndDocumentationTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpComponentConfigurationAndDocumentationTest.java index eae83bf..e18e911 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpComponentConfigurationAndDocumentationTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpComponentConfigurationAndDocumentationTest.java @@ -43,8 +43,8 @@ public class JettyHttpComponentConfigurationAndDocumentationTest extends CamelTe ComponentConfiguration compConf = comp.createComponentConfiguration(); String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"httpClientMaxThreads\": { \"type\": \"integer\"")); - assertTrue(json.contains("\"sessionSupport\": { \"type\": \"boolean\", \"javaType\": \"boolean\" },")); + assertTrue(json.contains("\"httpClientMaxThreads\": { \"kind\": \"parameter\", \"type\": \"integer\"")); + assertTrue(json.contains("\"sessionSupport\": { \"kind\": \"parameter\", \"type\": \"boolean\", \"javaType\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/442a29a5/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSocketPropertiesTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSocketPropertiesTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSocketPropertiesTest.java index 8b5fedd..1c16248 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSocketPropertiesTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSocketPropertiesTest.java @@ -55,7 +55,7 @@ public class JettyRouteWithUnknownSocketPropertiesTest extends BaseJettyTest { try { context.start(); fail("Should have thrown exception"); - } catch (IllegalArgumentException e) { + } catch (Exception e) { assertTrue(e.getMessage().endsWith("Unknown parameters=[{doesNotExist=2000}]")); } } http://git-wip-us.apache.org/repos/asf/camel/blob/442a29a5/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java index 72d913d..091bf15 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java @@ -55,7 +55,7 @@ public class JettyRouteWithUnknownSslSocketPropertiesTest extends BaseJettyTest try { context.start(); fail("Should have thrown exception"); - } catch (IllegalArgumentException e) { + } catch (Exception e) { assertTrue("Actual message: " + e.getMessage(), e.getMessage().endsWith("Unknown parameters=[{doesNotExist=2000}]")); } }
