Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F34E810274 for ; Mon, 2 Mar 2015 07:08:22 +0000 (UTC) Received: (qmail 69319 invoked by uid 500); 2 Mar 2015 07:08:22 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 69247 invoked by uid 500); 2 Mar 2015 07:08:22 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 69238 invoked by uid 99); 2 Mar 2015 07:08:22 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Mar 2015 07:08:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A9B0BE034B; Mon, 2 Mar 2015 07:08:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ningjiang@apache.org To: commits@camel.apache.org Date: Mon, 02 Mar 2015 07:08:22 -0000 Message-Id: <6b464bf22d4344a9916b1ec03578afd4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] camel git commit: Fixed the jetty related unit test errors 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 Authored: Mon Mar 2 14:37:49 2015 +0800 Committer: Willem Jiang 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}]")); } }