Author: davsclaus
Date: Sun May 27 10:15:14 2012
New Revision: 1343025
URL: http://svn.apache.org/viewvc?rev=1343025&view=rev
Log:
Use WANT for client SSL to have test working on more platforms
Added:
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersUdpTest.java
- copied, changed from r1343010,
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslConextParametersUdpTest.java
Removed:
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2LoggerOptionTest.java
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslConextParametersUdpTest.java
Modified:
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/BaseMina2Test.java
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersTcpTest.java
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersVmTest.java
Modified:
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/BaseMina2Test.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/BaseMina2Test.java?rev=1343025&r1=1343024&r2=1343025&view=diff
==============================================================================
---
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/BaseMina2Test.java
(original)
+++
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/BaseMina2Test.java
Sun May 27 10:15:14 2012
@@ -73,10 +73,9 @@ public class BaseMina2Test extends Camel
tmp.setKeyStore(ksp);
// NOTE: Needed since the client uses a loose trust configuration when
no ssl context
- // is provided. We turn on client-auth to ensure that the tests onlt
pass when
- // the client is configured explicitly.
+ // is provided. We turn on WANT client-auth to prefer using
authentication
SSLContextServerParameters scsp = new SSLContextServerParameters();
- scsp.setClientAuthentication(ClientAuthentication.REQUIRE.name());
+ scsp.setClientAuthentication(ClientAuthentication.WANT.name());
SSLContextParameters sslContextParameters = new SSLContextParameters();
sslContextParameters.setKeyManagers(kmp);
Modified:
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersTcpTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersTcpTest.java?rev=1343025&r1=1343024&r2=1343025&view=diff
==============================================================================
---
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersTcpTest.java
(original)
+++
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersTcpTest.java
Sun May 27 10:15:14 2012
@@ -31,8 +31,8 @@ public class Mina2SslContextParametersTc
Object body = "Hello there!";
endpoint.expectedBodiesReceived(body);
-
template.sendBodyAndHeader(String.format("mina2:tcp://localhost:%1$s?sync=false&minaLogger=true&sslContextParameters=#sslContextParameters",
getPort()), body, "cheese",
- 123);
+
template.sendBodyAndHeader(String.format("mina2:tcp://localhost:%1$s?sync=false&minaLogger=true&sslContextParameters=#sslContextParameters",
+ getPort()), body, "cheese", 123);
assertMockEndpointsSatisfied();
}
@@ -46,7 +46,8 @@ public class Mina2SslContextParametersTc
return new RouteBuilder() {
public void configure() {
-
from(String.format("mina2:tcp://localhost:%1$s?sync=false&minaLogger=true&sslContextParameters=#sslContextParameters",
getPort())).to("log:before?showAll=true")
+
fromF("mina2:tcp://localhost:%1$s?sync=false&minaLogger=true&sslContextParameters=#sslContextParameters",
getPort())
+ .to("log:before?showAll=true")
.to("mock:result").to("log:after?showAll=true");
}
};
Copied:
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersUdpTest.java
(from r1343010,
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslConextParametersUdpTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersUdpTest.java?p2=camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersUdpTest.java&p1=camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslConextParametersUdpTest.java&r1=1343010&r2=1343025&rev=1343025&view=diff
==============================================================================
---
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslConextParametersUdpTest.java
(original)
+++
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersUdpTest.java
Sun May 27 10:15:14 2012
@@ -27,11 +27,11 @@ import org.junit.Test;
/**
* @version
*/
-public class Mina2SslConextParametersUdpTest extends BaseMina2Test {
+public class Mina2SslContextParametersUdpTest extends BaseMina2Test {
protected int messageCount = 3;
- public Mina2SslConextParametersUdpTest() {
+ public Mina2SslContextParametersUdpTest() {
}
@Test
@@ -52,8 +52,7 @@ public class Mina2SslConextParametersUdp
String text = "Hello Message: " + Integer.toString(i);
byte[] data = text.getBytes();
- //DatagramPacket packet = new DatagramPacket(data,
data.length, address, getPort());
- DatagramPacket packet = new DatagramPacket(data, data.length,
address, 10111);
+ DatagramPacket packet = new DatagramPacket(data, data.length,
address, getPort());
socket.send(packet);
}
Thread.sleep(2000);
@@ -71,7 +70,7 @@ public class Mina2SslConextParametersUdp
return new RouteBuilder() {
public void configure() {
-
from("mina2:udp://127.0.0.1:10111?sync=false&minaLogger=true&sslContextParameters=#sslContextParameters").to("mock:result");
+ from("mina2:udp://127.0.0.1:" + getPort() +
"?sync=false&minaLogger=true&sslContextParameters=#sslContextParameters").to("mock:result");
}
};
}
Modified:
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersVmTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersVmTest.java?rev=1343025&r1=1343024&r2=1343025&view=diff
==============================================================================
---
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersVmTest.java
(original)
+++
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersVmTest.java
Sun May 27 10:15:14 2012
@@ -31,7 +31,8 @@ public class Mina2SslContextParametersVm
Object body = "Hello there!";
endpoint.expectedBodiesReceived(body);
-
template.sendBodyAndHeader(String.format("mina2:vm://localhost:%1$s?sync=false&minaLogger=true&sslContextParameters=#sslContextParameters",
getPort()), body, "cheese", 123);
+
template.sendBodyAndHeader(String.format("mina2:vm://localhost:%1$s?sync=false&minaLogger=true&sslContextParameters=#sslContextParameters",
+ getPort()), body, "cheese", 123);
assertMockEndpointsSatisfied();
}
@@ -45,7 +46,8 @@ public class Mina2SslContextParametersVm
return new RouteBuilder() {
public void configure() {
-
from(String.format("mina2:vm://localhost:%1$s?sync=false&minaLogger=true&sslContextParameters=#sslContextParameters",
getPort())).to("log:before?showAll=true").to("mock:result")
+
fromF("mina2:vm://localhost:%1$s?sync=false&minaLogger=true&sslContextParameters=#sslContextParameters",
getPort())
+ .to("log:before?showAll=true").to("mock:result")
.to("log:after?showAll=true");
}
};
