You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/12/02 09:20:30 UTC
[1/6] git commit: Fixed test
Updated Branches:
refs/heads/camel-2.11.x 7fa3bb401 -> c4b34ff63
refs/heads/camel-2.12.x e94ebcc7c -> a98f69c24
refs/heads/master b048537a5 -> 102843f02
Fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/635356ab
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/635356ab
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/635356ab
Branch: refs/heads/master
Commit: 635356abbfc883d250288e526378ffbcddc5bc0e
Parents: b048537
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Dec 2 09:16:04 2013 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Dec 2 09:16:04 2013 +0100
----------------------------------------------------------------------
.../util/jsse/SSLContextParametersTest.java | 51 ++++++++++++--------
1 file changed, 30 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/635356ab/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java b/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
index 11c82b2..bc163c2 100644
--- a/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
@@ -553,13 +553,16 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
engine = context.createSSLEngine();
socket = (SSLSocket) context.getSocketFactory().createSocket();
serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
-
- assertTrue(engine.getEnabledCipherSuites().length >= 1);
- assertStartsWith(engine.getEnabledCipherSuites(), "TLS");
- assertTrue(socket.getEnabledCipherSuites().length >= 1);
- assertStartsWith(socket.getEnabledCipherSuites(), "TLS");
- assertTrue(serverSocket.getEnabledCipherSuites().length >= 1);
- assertStartsWith(serverSocket.getEnabledCipherSuites(), "TLS");
+
+ // not all platforms/JDKs have these cipher suites
+ if (!isPlatform("aix")) {
+ assertTrue(engine.getEnabledCipherSuites().length >= 1);
+ assertStartsWith(engine.getEnabledCipherSuites(), "TLS");
+ assertTrue(socket.getEnabledCipherSuites().length >= 1);
+ assertStartsWith(socket.getEnabledCipherSuites(), "TLS");
+ assertTrue(serverSocket.getEnabledCipherSuites().length >= 1);
+ assertStartsWith(serverSocket.getEnabledCipherSuites(), "TLS");
+ }
}
public void testSecureSocketProtocols() throws Exception {
@@ -619,13 +622,16 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
engine = context.createSSLEngine();
socket = (SSLSocket) context.getSocketFactory().createSocket();
serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
-
- assertEquals(1, engine.getEnabledProtocols().length);
- assertEquals("TLSv1", engine.getEnabledProtocols()[0]);
- assertEquals(1, socket.getEnabledProtocols().length);
- assertEquals("TLSv1", socket.getEnabledProtocols()[0]);
- assertEquals(1, socket.getEnabledProtocols().length);
- assertEquals("TLSv1", serverSocket.getEnabledProtocols()[0]);
+
+ // not all platforms/JDKs have these cipher suites
+ if (!isPlatform("aix")) {
+ assertEquals(1, engine.getEnabledProtocols().length);
+ assertEquals("TLSv1", engine.getEnabledProtocols()[0]);
+ assertEquals(1, socket.getEnabledProtocols().length);
+ assertEquals("TLSv1", socket.getEnabledProtocols()[0]);
+ assertEquals(1, socket.getEnabledProtocols().length);
+ assertEquals("TLSv1", serverSocket.getEnabledProtocols()[0]);
+ }
}
public void testSecureSocketProtocolsFilter() throws Exception {
@@ -692,13 +698,16 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
engine = context.createSSLEngine();
socket = (SSLSocket) context.getSocketFactory().createSocket();
serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
-
- assertTrue(engine.getEnabledProtocols().length >= 1);
- assertStartsWith(engine.getEnabledProtocols(), "TLS");
- assertTrue(socket.getEnabledProtocols().length >= 1);
- assertStartsWith(socket.getEnabledProtocols(), "TLS");
- assertTrue(socket.getEnabledProtocols().length >= 1);
- assertStartsWith(serverSocket.getEnabledProtocols(), "TLS");
+
+ // not all platforms/JDKs have these cipher suites
+ if (!isPlatform("aix")) {
+ assertTrue(engine.getEnabledProtocols().length >= 1);
+ assertStartsWith(engine.getEnabledProtocols(), "TLS");
+ assertTrue(socket.getEnabledProtocols().length >= 1);
+ assertStartsWith(socket.getEnabledProtocols(), "TLS");
+ assertTrue(socket.getEnabledProtocols().length >= 1);
+ assertStartsWith(serverSocket.getEnabledProtocols(), "TLS");
+ }
}
public void testSessionTimeout() throws Exception {
[4/6] git commit: Fixed test
Posted by da...@apache.org.
Fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a98f69c2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a98f69c2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a98f69c2
Branch: refs/heads/camel-2.12.x
Commit: a98f69c24304774a5d7d90cffd743acc67aabd61
Parents: a372ac4
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Dec 2 09:19:59 2013 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Dec 2 09:22:13 2013 +0100
----------------------------------------------------------------------
.../testng/AbstractCamelTestNGSpringContextTestsPlainTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a98f69c2/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsPlainTest.java
----------------------------------------------------------------------
diff --git a/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsPlainTest.java b/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsPlainTest.java
index 1984450..d1aa63d 100644
--- a/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsPlainTest.java
+++ b/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsPlainTest.java
@@ -102,9 +102,10 @@ public class AbstractCamelTestNGSpringContextTestsPlainTest
@Test
public void testStopwatch() {
StopWatch stopWatch = StopWatchTestExecutionListener.getStopWatch();
-
+
+ // some servers is slower
assertNotNull(stopWatch);
- assertTrue(stopWatch.taken() < 100);
+ assertTrue(stopWatch.taken() < 1000);
}
@Test
[2/6] git commit: Fixed test
Posted by da...@apache.org.
Fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/102843f0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/102843f0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/102843f0
Branch: refs/heads/master
Commit: 102843f024ebb120e6e31c0046b6fbc5c37fb9a3
Parents: 635356a
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Dec 2 09:19:59 2013 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Dec 2 09:19:59 2013 +0100
----------------------------------------------------------------------
.../testng/AbstractCamelTestNGSpringContextTestsPlainTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/102843f0/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsPlainTest.java
----------------------------------------------------------------------
diff --git a/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsPlainTest.java b/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsPlainTest.java
index 1984450..d1aa63d 100644
--- a/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsPlainTest.java
+++ b/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsPlainTest.java
@@ -102,9 +102,10 @@ public class AbstractCamelTestNGSpringContextTestsPlainTest
@Test
public void testStopwatch() {
StopWatch stopWatch = StopWatchTestExecutionListener.getStopWatch();
-
+
+ // some servers is slower
assertNotNull(stopWatch);
- assertTrue(stopWatch.taken() < 100);
+ assertTrue(stopWatch.taken() < 1000);
}
@Test
[5/6] git commit: Fixed test
Posted by da...@apache.org.
Fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a8dd0b5b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a8dd0b5b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a8dd0b5b
Branch: refs/heads/camel-2.11.x
Commit: a8dd0b5bbd6d1b500e5be126966c04e2a2e88266
Parents: 7fa3bb4
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Dec 2 09:16:04 2013 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Dec 2 09:22:29 2013 +0100
----------------------------------------------------------------------
.../util/jsse/SSLContextParametersTest.java | 51 ++++++++++++--------
1 file changed, 30 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a8dd0b5b/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java b/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
index 11c82b2..bc163c2 100644
--- a/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
@@ -553,13 +553,16 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
engine = context.createSSLEngine();
socket = (SSLSocket) context.getSocketFactory().createSocket();
serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
-
- assertTrue(engine.getEnabledCipherSuites().length >= 1);
- assertStartsWith(engine.getEnabledCipherSuites(), "TLS");
- assertTrue(socket.getEnabledCipherSuites().length >= 1);
- assertStartsWith(socket.getEnabledCipherSuites(), "TLS");
- assertTrue(serverSocket.getEnabledCipherSuites().length >= 1);
- assertStartsWith(serverSocket.getEnabledCipherSuites(), "TLS");
+
+ // not all platforms/JDKs have these cipher suites
+ if (!isPlatform("aix")) {
+ assertTrue(engine.getEnabledCipherSuites().length >= 1);
+ assertStartsWith(engine.getEnabledCipherSuites(), "TLS");
+ assertTrue(socket.getEnabledCipherSuites().length >= 1);
+ assertStartsWith(socket.getEnabledCipherSuites(), "TLS");
+ assertTrue(serverSocket.getEnabledCipherSuites().length >= 1);
+ assertStartsWith(serverSocket.getEnabledCipherSuites(), "TLS");
+ }
}
public void testSecureSocketProtocols() throws Exception {
@@ -619,13 +622,16 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
engine = context.createSSLEngine();
socket = (SSLSocket) context.getSocketFactory().createSocket();
serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
-
- assertEquals(1, engine.getEnabledProtocols().length);
- assertEquals("TLSv1", engine.getEnabledProtocols()[0]);
- assertEquals(1, socket.getEnabledProtocols().length);
- assertEquals("TLSv1", socket.getEnabledProtocols()[0]);
- assertEquals(1, socket.getEnabledProtocols().length);
- assertEquals("TLSv1", serverSocket.getEnabledProtocols()[0]);
+
+ // not all platforms/JDKs have these cipher suites
+ if (!isPlatform("aix")) {
+ assertEquals(1, engine.getEnabledProtocols().length);
+ assertEquals("TLSv1", engine.getEnabledProtocols()[0]);
+ assertEquals(1, socket.getEnabledProtocols().length);
+ assertEquals("TLSv1", socket.getEnabledProtocols()[0]);
+ assertEquals(1, socket.getEnabledProtocols().length);
+ assertEquals("TLSv1", serverSocket.getEnabledProtocols()[0]);
+ }
}
public void testSecureSocketProtocolsFilter() throws Exception {
@@ -692,13 +698,16 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
engine = context.createSSLEngine();
socket = (SSLSocket) context.getSocketFactory().createSocket();
serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
-
- assertTrue(engine.getEnabledProtocols().length >= 1);
- assertStartsWith(engine.getEnabledProtocols(), "TLS");
- assertTrue(socket.getEnabledProtocols().length >= 1);
- assertStartsWith(socket.getEnabledProtocols(), "TLS");
- assertTrue(socket.getEnabledProtocols().length >= 1);
- assertStartsWith(serverSocket.getEnabledProtocols(), "TLS");
+
+ // not all platforms/JDKs have these cipher suites
+ if (!isPlatform("aix")) {
+ assertTrue(engine.getEnabledProtocols().length >= 1);
+ assertStartsWith(engine.getEnabledProtocols(), "TLS");
+ assertTrue(socket.getEnabledProtocols().length >= 1);
+ assertStartsWith(socket.getEnabledProtocols(), "TLS");
+ assertTrue(socket.getEnabledProtocols().length >= 1);
+ assertStartsWith(serverSocket.getEnabledProtocols(), "TLS");
+ }
}
public void testSessionTimeout() throws Exception {
[6/6] git commit: Fixed test
Posted by da...@apache.org.
Fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c4b34ff6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c4b34ff6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c4b34ff6
Branch: refs/heads/camel-2.11.x
Commit: c4b34ff6342deb8d59730fa166682d792bb411ff
Parents: a8dd0b5
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Dec 2 09:19:59 2013 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Dec 2 09:22:38 2013 +0100
----------------------------------------------------------------------
.../testng/AbstractCamelTestNGSpringContextTestsPlainTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c4b34ff6/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsPlainTest.java
----------------------------------------------------------------------
diff --git a/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsPlainTest.java b/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsPlainTest.java
index 1984450..d1aa63d 100644
--- a/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsPlainTest.java
+++ b/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsPlainTest.java
@@ -102,9 +102,10 @@ public class AbstractCamelTestNGSpringContextTestsPlainTest
@Test
public void testStopwatch() {
StopWatch stopWatch = StopWatchTestExecutionListener.getStopWatch();
-
+
+ // some servers is slower
assertNotNull(stopWatch);
- assertTrue(stopWatch.taken() < 100);
+ assertTrue(stopWatch.taken() < 1000);
}
@Test
[3/6] git commit: Fixed test
Posted by da...@apache.org.
Fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a372ac45
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a372ac45
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a372ac45
Branch: refs/heads/camel-2.12.x
Commit: a372ac458de37726f0a91f17e3a871c46a20d563
Parents: e94ebcc
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Dec 2 09:16:04 2013 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Dec 2 09:22:06 2013 +0100
----------------------------------------------------------------------
.../util/jsse/SSLContextParametersTest.java | 51 ++++++++++++--------
1 file changed, 30 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a372ac45/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java b/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
index 11c82b2..bc163c2 100644
--- a/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
@@ -553,13 +553,16 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
engine = context.createSSLEngine();
socket = (SSLSocket) context.getSocketFactory().createSocket();
serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
-
- assertTrue(engine.getEnabledCipherSuites().length >= 1);
- assertStartsWith(engine.getEnabledCipherSuites(), "TLS");
- assertTrue(socket.getEnabledCipherSuites().length >= 1);
- assertStartsWith(socket.getEnabledCipherSuites(), "TLS");
- assertTrue(serverSocket.getEnabledCipherSuites().length >= 1);
- assertStartsWith(serverSocket.getEnabledCipherSuites(), "TLS");
+
+ // not all platforms/JDKs have these cipher suites
+ if (!isPlatform("aix")) {
+ assertTrue(engine.getEnabledCipherSuites().length >= 1);
+ assertStartsWith(engine.getEnabledCipherSuites(), "TLS");
+ assertTrue(socket.getEnabledCipherSuites().length >= 1);
+ assertStartsWith(socket.getEnabledCipherSuites(), "TLS");
+ assertTrue(serverSocket.getEnabledCipherSuites().length >= 1);
+ assertStartsWith(serverSocket.getEnabledCipherSuites(), "TLS");
+ }
}
public void testSecureSocketProtocols() throws Exception {
@@ -619,13 +622,16 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
engine = context.createSSLEngine();
socket = (SSLSocket) context.getSocketFactory().createSocket();
serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
-
- assertEquals(1, engine.getEnabledProtocols().length);
- assertEquals("TLSv1", engine.getEnabledProtocols()[0]);
- assertEquals(1, socket.getEnabledProtocols().length);
- assertEquals("TLSv1", socket.getEnabledProtocols()[0]);
- assertEquals(1, socket.getEnabledProtocols().length);
- assertEquals("TLSv1", serverSocket.getEnabledProtocols()[0]);
+
+ // not all platforms/JDKs have these cipher suites
+ if (!isPlatform("aix")) {
+ assertEquals(1, engine.getEnabledProtocols().length);
+ assertEquals("TLSv1", engine.getEnabledProtocols()[0]);
+ assertEquals(1, socket.getEnabledProtocols().length);
+ assertEquals("TLSv1", socket.getEnabledProtocols()[0]);
+ assertEquals(1, socket.getEnabledProtocols().length);
+ assertEquals("TLSv1", serverSocket.getEnabledProtocols()[0]);
+ }
}
public void testSecureSocketProtocolsFilter() throws Exception {
@@ -692,13 +698,16 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
engine = context.createSSLEngine();
socket = (SSLSocket) context.getSocketFactory().createSocket();
serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
-
- assertTrue(engine.getEnabledProtocols().length >= 1);
- assertStartsWith(engine.getEnabledProtocols(), "TLS");
- assertTrue(socket.getEnabledProtocols().length >= 1);
- assertStartsWith(socket.getEnabledProtocols(), "TLS");
- assertTrue(socket.getEnabledProtocols().length >= 1);
- assertStartsWith(serverSocket.getEnabledProtocols(), "TLS");
+
+ // not all platforms/JDKs have these cipher suites
+ if (!isPlatform("aix")) {
+ assertTrue(engine.getEnabledProtocols().length >= 1);
+ assertStartsWith(engine.getEnabledProtocols(), "TLS");
+ assertTrue(socket.getEnabledProtocols().length >= 1);
+ assertStartsWith(socket.getEnabledProtocols(), "TLS");
+ assertTrue(socket.getEnabledProtocols().length >= 1);
+ assertStartsWith(serverSocket.getEnabledProtocols(), "TLS");
+ }
}
public void testSessionTimeout() throws Exception {