You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2015/03/02 08:08:22 UTC
[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 <wi...@gmail.com>
Authored: Mon Mar 2 14:37:49 2015 +0800
Committer: Willem Jiang <wi...@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}]"));
}
}
[3/3] camel git commit: Fixed the configuration and documentation
related tests
Posted by ni...@apache.org.
Fixed the configuration and documentation related tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/504cf03d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/504cf03d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/504cf03d
Branch: refs/heads/master
Commit: 504cf03deba0726754f05152f7d8606fb76a72b4
Parents: 4dbd34a
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Mar 2 14:54:04 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Mar 2 14:54:04 2015 +0800
----------------------------------------------------------------------
.../netty4/NettyComponentConfigurationAndDocumentationTest.java | 4 ++--
.../ServletComponentConfigurationAndDocumentationTest.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/504cf03d/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentConfigurationAndDocumentationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentConfigurationAndDocumentationTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentConfigurationAndDocumentationTest.java
index c48ddeb..035c25b 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentConfigurationAndDocumentationTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentConfigurationAndDocumentationTest.java
@@ -42,8 +42,8 @@ public class NettyComponentConfigurationAndDocumentationTest extends CamelTestSu
ComponentConfiguration compConf = comp.createComponentConfiguration();
String json = compConf.createParameterJsonSchema();
assertNotNull(json);
-
- assertTrue(json.contains("\"host\": { \"kind\": \"path\", \"type\": \"string\""));
+
+ assertTrue(json.contains("\"host\": { \"kind\": \"path\", \"required\": \"true\", \"type\": \"string\""));
assertTrue(json.contains("\"producerPoolMinEvictableIdle\": { \"kind\": \"parameter\", \"type\": \"integer\""));
assertTrue(json.contains("\"allowDefaultCodec\": { \"kind\": \"parameter\", \"type\": \"boolean\""));
}
http://git-wip-us.apache.org/repos/asf/camel/blob/504cf03d/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletComponentConfigurationAndDocumentationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletComponentConfigurationAndDocumentationTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletComponentConfigurationAndDocumentationTest.java
index caa005e..22c25f2 100644
--- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletComponentConfigurationAndDocumentationTest.java
+++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletComponentConfigurationAndDocumentationTest.java
@@ -42,8 +42,8 @@ public class ServletComponentConfigurationAndDocumentationTest extends CamelTest
ComponentConfiguration compConf = comp.createComponentConfiguration();
String json = compConf.createParameterJsonSchema();
assertNotNull(json);
-
- assertTrue(json.contains("\"servletName\": { \"kind\": \"parameter\", \"type\": \"string\""));
+
+ assertTrue(json.contains("\"servletName\": { \"kind\": \"property\", \"type\": \"string\""));
assertTrue(json.contains("\"matchOnUriPrefix\": { \"kind\": \"parameter\", \"type\": \"boolean\""));
}
[2/3] camel git commit: Upgrade the powermock version to 1.6.1 to fix
the test errors with JUnit 4.12
Posted by ni...@apache.org.
Upgrade the powermock version to 1.6.1 to fix the test errors with JUnit 4.12
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4dbd34ab
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4dbd34ab
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4dbd34ab
Branch: refs/heads/master
Commit: 4dbd34ab35694a21358a0ea8ad42686799993481
Parents: 442a29a
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Mar 2 14:48:21 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Mar 2 14:48:21 2015 +0800
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4dbd34ab/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index c3eb356..fa0f4ff 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -374,7 +374,7 @@
<plexus-container-default-version>1.0-alpha-48</plexus-container-default-version>
<plexus-utils-version>1.5.6</plexus-utils-version>
<pojosr-version>0.2.1</pojosr-version>
- <powermock-version>1.5.1</powermock-version>
+ <powermock-version>1.6.1</powermock-version>
<protobuf-version>2.6.1</protobuf-version>
<qpid-bundle-version>0.28_1</qpid-bundle-version>
<qpid-version>0.28</qpid-version>