You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by sc...@apache.org on 2009/02/04 17:30:22 UTC
svn commit: r740780 - in /incubator/etch/trunk:
binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/
examples/example/src/test/java/org/apache/etch/examples/example/
tests/src/test/java/org/apache/etch/tests/ util/src/tes...
Author: sccomer
Date: Wed Feb 4 16:30:22 2009
New Revision: 740780
URL: http://svn.apache.org/viewvc?rev=740780&view=rev
Log:
fix for ETCH-53: merge changes from 1.0.2 branch to trunk - 739282 updates to unit tests
these update to the unit tests make them more resilient to timing issues with regard to
listening sockets when used on different operating systems.
Modified:
incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestKeepAlive.java
incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestLogger.java
incubator/etch/trunk/examples/example/src/test/java/org/apache/etch/examples/example/TestExampleServer.java
incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMainTest1Client.java
incubator/etch/trunk/util/src/test/java/org/apache/etch/util/core/io/TestTcpListener.java
incubator/etch/trunk/util/src/test/java/org/apache/etch/util/core/nio/TestTcp2Connection.java
incubator/etch/trunk/util/src/test/java/org/apache/etch/util/core/nio/TestTcp2Listener.java
Modified: incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestKeepAlive.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestKeepAlive.java?rev=740780&r1=740779&r2=740780&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestKeepAlive.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestKeepAlive.java Wed Feb 4 16:30:22 2009
@@ -61,7 +61,7 @@
public void constructor1() throws Exception
{
transport.is_server = true;
- String uri = "tcp://localhost:4008?filter=KeepAlive";
+ String uri = "tcp://localhost:4801?filter=KeepAlive";
KeepAlive filter = newKeepAlive(uri);
filter.setSession( session );
@@ -77,7 +77,7 @@
public void constructor2() throws Exception
{
transport.is_server = true;
- String uri = "tcp://localhost:4008?filter=KeepAlive&KeepAlive.delay=20&KeepAlive.count=5";
+ String uri = "tcp://localhost:4801?filter=KeepAlive&KeepAlive.delay=20&KeepAlive.count=5";
KeepAlive filter = newKeepAlive(uri);
filter.setSession( session );
@@ -93,7 +93,7 @@
public void constructor3() throws Exception
{
transport.is_server = false;
- String uri = "tcp://localhost:4008?filter=KeepAlive";
+ String uri = "tcp://localhost:4801?filter=KeepAlive";
KeepAlive filter = newKeepAlive(uri);
filter.setSession( session );
@@ -109,7 +109,7 @@
public void clientup() throws Exception
{
transport.is_server = false;
- String uri = "tcp://localhost:4008?filter=KeepAlive&KeepAlive.delay=3";
+ String uri = "tcp://localhost:4801?filter=KeepAlive&KeepAlive.delay=3";
KeepAlive filter = newKeepAlive(uri);
filter.setSession( session );
filter.sessionNotify( Session.UP );
@@ -128,7 +128,7 @@
public void clientup1() throws Exception
{
transport.is_server = false;
- String uri = "tcp://localhost:4008?filter=KeepAlive&KeepAlive.delay=2";
+ String uri = "tcp://localhost:4801?filter=KeepAlive&KeepAlive.delay=2";
KeepAlive filter = newKeepAlive(uri);
filter.setSession( session );
filter.sessionNotify( Session.UP );
@@ -150,7 +150,7 @@
transport.is_server = false;
- String uri = "tcp://localhost:4008?filter=KeepAlive";
+ String uri = "tcp://localhost:4801?filter=KeepAlive";
KeepAlive filter = newKeepAlive(uri);
filter.setSession( session );
@@ -164,7 +164,7 @@
public void serverUp() throws Exception
{
transport.is_server = true;
- String uri = "tcp://localhost:4008?filter=KeepAlive";
+ String uri = "tcp://localhost:4801?filter=KeepAlive";
KeepAlive filter = newKeepAlive(uri);
filter.setSession( session );
filter.sessionNotify( Session.UP );
@@ -185,7 +185,7 @@
transport.is_server = true;
- String uri = "tcp://localhost:4008?filter=KeepAlive";
+ String uri = "tcp://localhost:4801?filter=KeepAlive";
KeepAlive filter = newKeepAlive(uri);
filter.setSession( session );
@@ -198,7 +198,7 @@
public void resetClient() throws Exception
{
transport.is_server = false;
- String uri = "tcp://localhost:4008?filter=KeepAlive&KeepAlive.delay=2&KeepAlive.count=4";
+ String uri = "tcp://localhost:4801?filter=KeepAlive&KeepAlive.delay=2&KeepAlive.count=4";
KeepAlive filter = newKeepAlive(uri);
filter.setSession( session );
filter.sessionNotify( Session.UP );
Modified: incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestLogger.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestLogger.java?rev=740780&r1=740779&r2=740780&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestLogger.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestLogger.java Wed Feb 4 16:30:22 2009
@@ -59,7 +59,7 @@
/** @throws Exception */
@Test
public void constructor1() throws Exception {
- String uri = "tcp://localhost:4008?filter=Logger";
+ String uri = "tcp://localhost:4802?filter=Logger";
Logger.testFlag = true;
Logger logger = newLogger(uri);
assertEquals(logger.getFileName(),"Log.txt");
@@ -70,7 +70,7 @@
/** @throws Exception */
@Test
public void constructor2() throws Exception {
- String uri = "tcp://localhost:4008?filter=Logger&Logger.filePath=Test.txt";
+ String uri = "tcp://localhost:4802?filter=Logger&Logger.filePath=Test.txt";
Logger.testFlag = true;
Logger logger = newLogger(uri);
assertEquals(logger.getFileName(),"Test.txt");
@@ -80,7 +80,7 @@
/** @throws Exception */
@Test
public void logger() throws Exception {
- String uri = "tcp://localhost:4008?filter=Logger";
+ String uri = "tcp://localhost:4802?filter=Logger";
Logger.testFlag = true;
Logger logger = newLogger(uri);
logger.setSession( session );
@@ -91,7 +91,7 @@
/** @throws Exception */
@Test
public void logger1() throws Exception {
- String uri = "tcp://localhost:4008?filter=Logger";
+ String uri = "tcp://localhost:4802?filter=Logger";
Logger.testFlag = true;
Logger logger = newLogger(uri);
logger.setSession( session );
@@ -105,7 +105,7 @@
/** @throws Exception */
@Test
public void logger2() throws Exception {
- String uri = "tcp://localhost:4008?filter=Logger";
+ String uri = "tcp://localhost:4802?filter=Logger";
Logger.testFlag = true;
Logger logger = newLogger(uri);
logger.setSession( session );
Modified: incubator/etch/trunk/examples/example/src/test/java/org/apache/etch/examples/example/TestExampleServer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/example/src/test/java/org/apache/etch/examples/example/TestExampleServer.java?rev=740780&r1=740779&r2=740780&view=diff
==============================================================================
--- incubator/etch/trunk/examples/example/src/test/java/org/apache/etch/examples/example/TestExampleServer.java (original)
+++ incubator/etch/trunk/examples/example/src/test/java/org/apache/etch/examples/example/TestExampleServer.java Wed Feb 4 16:30:22 2009
@@ -54,7 +54,7 @@
Log.addSink(null);
Log.report("StartExampleListener");
- String uri = "tcp://localhost:4008";
+ String uri = "tcp://localhost:4800";
MainExampleListener implFactory = new MainExampleListener();
listener = ExampleHelper.newListener( uri, null, implFactory );
@@ -86,7 +86,7 @@
public void makeConnection()
throws Exception
{
- String uri = "tcp://localhost:4008";
+ String uri = "tcp://localhost:4800";
server = ExampleHelper.newServer( uri, null, new MainExampleClient() );
Modified: incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMainTest1Client.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMainTest1Client.java?rev=740780&r1=740779&r2=740780&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMainTest1Client.java (original)
+++ incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMainTest1Client.java Wed Feb 4 16:30:22 2009
@@ -911,7 +911,14 @@
{
while(c > this.myCount)
{
- ;
+ try
+ {
+ Thread.sleep( 10 );
+ }
+ catch ( InterruptedException e )
+ {
+ // ignore
+ }
}
try
Modified: incubator/etch/trunk/util/src/test/java/org/apache/etch/util/core/io/TestTcpListener.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/test/java/org/apache/etch/util/core/io/TestTcpListener.java?rev=740780&r1=740779&r2=740780&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/test/java/org/apache/etch/util/core/io/TestTcpListener.java (original)
+++ incubator/etch/trunk/util/src/test/java/org/apache/etch/util/core/io/TestTcpListener.java Wed Feb 4 16:30:22 2009
@@ -366,6 +366,8 @@
what.set( What.DOWN );
return;
}
+
+ System.out.println("MyListenerHandler " + event);
}
}
Modified: incubator/etch/trunk/util/src/test/java/org/apache/etch/util/core/nio/TestTcp2Connection.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/test/java/org/apache/etch/util/core/nio/TestTcp2Connection.java?rev=740780&r1=740779&r2=740780&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/test/java/org/apache/etch/util/core/nio/TestTcp2Connection.java (original)
+++ incubator/etch/trunk/util/src/test/java/org/apache/etch/util/core/nio/TestTcp2Connection.java Wed Feb 4 16:30:22 2009
@@ -779,6 +779,8 @@
{
if (event instanceof Exception)
Log.report( "listener.notify", "event", event );
+
+ System.out.println( "TestTcp2Connection.MyListener: event = " + event );
}
}
Modified: incubator/etch/trunk/util/src/test/java/org/apache/etch/util/core/nio/TestTcp2Listener.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/test/java/org/apache/etch/util/core/nio/TestTcp2Listener.java?rev=740780&r1=740779&r2=740780&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/test/java/org/apache/etch/util/core/nio/TestTcp2Listener.java (original)
+++ incubator/etch/trunk/util/src/test/java/org/apache/etch/util/core/nio/TestTcp2Listener.java Wed Feb 4 16:30:22 2009
@@ -25,6 +25,7 @@
import static org.junit.Assert.assertTrue;
import java.io.IOException;
+import java.net.Inet6Address;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketException;
@@ -149,7 +150,10 @@
assertNull( lh.xsocket );
InetSocketAddress a = (InetSocketAddress) l.localAddress();
- assertEquals( "0.0.0.0", a.getAddress().getHostAddress().toString() );
+ if ( a.getAddress() instanceof Inet6Address )
+ assertEquals( "0:0:0:0:0:0:0:0", a.getAddress().getHostAddress().toString() );
+ else
+ assertEquals( "0.0.0.0", a.getAddress().getHostAddress().toString() );
assertTrue( a.getPort() > 0 && a.getPort() < 65536 );
l.stop();
@@ -196,7 +200,7 @@
public void start3() throws Exception
{
MyListenerHandler lh = new MyListenerHandler();
- Tcp2Listener l = new Tcp2Listener( "tcp://0.0.0.0:4009", r );
+ Tcp2Listener l = new Tcp2Listener( "tcp://0.0.0.0:4998", r );
l.setSession( lh );
assertWhat( null, lh.what );
@@ -210,8 +214,11 @@
assertNull( lh.xsocket );
InetSocketAddress a = (InetSocketAddress) l.localAddress();
- assertEquals( "0.0.0.0", a.getAddress().getHostAddress().toString() );
- assertEquals( 4009, a.getPort() );
+ if ( a.getAddress() instanceof Inet6Address )
+ assertEquals( "0:0:0:0:0:0:0:0", a.getAddress().getHostAddress().toString() );
+ else
+ assertEquals( "0.0.0.0", a.getAddress().getHostAddress().toString() );
+ assertEquals( 4998, a.getPort() );
l.stop();
l.waitDown( TIMEOUT );
@@ -227,7 +234,7 @@
public void start4() throws Exception
{
MyListenerHandler lh = new MyListenerHandler();
- Tcp2Listener l = new Tcp2Listener( "tcp://127.0.0.1:4006", r );
+ Tcp2Listener l = new Tcp2Listener( "tcp://127.0.0.1:4996", r );
l.setSession( lh );
assertWhat( null, lh.what );
@@ -243,7 +250,7 @@
InetSocketAddress a = (InetSocketAddress) l.localAddress();
assertEquals( "127.0.0.1", a.getAddress().getHostAddress().toString() );
- assertEquals( 4006, a.getPort() );
+ assertEquals( 4996, a.getPort() );
l.stop();
l.waitDown( TIMEOUT );
@@ -260,7 +267,7 @@
{
// bad address
MyListenerHandler lh = new MyListenerHandler();
- Tcp2Listener l = new Tcp2Listener( "tcp://1.2.3.4.5:4007", r );
+ Tcp2Listener l = new Tcp2Listener( "tcp://1.2.3.4.5:4997", r );
l.setSession( lh );
assertWhat( null, lh.what );
@@ -274,13 +281,13 @@
public void accept1() throws Exception
{
MyListenerHandler lh = new MyListenerHandler();
- Tcp2Listener l = new Tcp2Listener( "tcp://0.0.0.0:4008", r );
+ Tcp2Listener l = new Tcp2Listener( "tcp://0.0.0.0:4995", r );
l.setSession( lh );
l.start();
l.waitUp( TIMEOUT );
- Socket s = new Socket( "127.0.0.1", 4008 );
+ Socket s = new Socket( "127.0.0.1", 4995 );
assertWhat( What.ACCEPTED, lh.what );
assertNotNull( lh.xsocket );