diff options
author | Eike Stepper | 2006-10-27 06:52:17 +0000 |
---|---|---|
committer | Eike Stepper | 2006-10-27 06:52:17 +0000 |
commit | 1a1db40e2e0c080b5207199cdd4afccaf69657aa (patch) | |
tree | 0427bcfe24a0817c5e601ce64d32520a68de3e71 /plugins/org.eclipse.net4j.tests/src | |
parent | 09ab88a0e03e429735c75a88365586d18f21c839 (diff) | |
download | cdo-1a1db40e2e0c080b5207199cdd4afccaf69657aa.tar.gz cdo-1a1db40e2e0c080b5207199cdd4afccaf69657aa.tar.xz cdo-1a1db40e2e0c080b5207199cdd4afccaf69657aa.zip |
Operations & Maintenance
Diffstat (limited to 'plugins/org.eclipse.net4j.tests/src')
4 files changed, 69 insertions, 42 deletions
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractOMTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractOMTest.java new file mode 100644 index 0000000000..251b62b75a --- /dev/null +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractOMTest.java @@ -0,0 +1,49 @@ +/*************************************************************************** + * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + **************************************************************************/ +package org.eclipse.net4j.tests; + +import org.eclipse.net4j.util.om.OMPlatform; +import org.eclipse.net4j.util.om.PrintStreamLogHandler; +import org.eclipse.net4j.util.om.PrintStreamTraceHandler; + +import junit.framework.TestCase; + +/** + * @author Eike Stepper + */ +public abstract class AbstractOMTest extends TestCase +{ + protected AbstractOMTest() + { + } + + @Override + protected void setUp() throws Exception + { + this.setUp(); + System.out.print("================================= "); + System.out.print(getName()); + System.out.println(" ================================="); + + OMPlatform.INSTANCE.addLogHandler(PrintStreamLogHandler.CONSOLE); + OMPlatform.INSTANCE.addTraceHandler(PrintStreamTraceHandler.CONSOLE); + OMPlatform.INSTANCE.setDebugging(true); + } + + @Override + protected void tearDown() throws Exception + { + System.out.println(); + System.out.println(); + Thread.sleep(20); + super.tearDown(); + } +}
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java index a06840eded..9a0d6257f7 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java @@ -17,8 +17,6 @@ import org.eclipse.net4j.tests.signal.TestSignalProtocol; import org.eclipse.net4j.transport.BufferProvider; import org.eclipse.net4j.transport.Channel; import org.eclipse.net4j.transport.ProtocolFactory; -import org.eclipse.net4j.transport.util.BufferInputStream; -import org.eclipse.net4j.transport.util.BufferOutputStream; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; import org.eclipse.net4j.util.om.OMPlatform; import org.eclipse.net4j.util.om.PrintStreamLogHandler; @@ -39,7 +37,7 @@ import junit.framework.TestCase; /** * @author Eike Stepper */ -public class SignalTest extends TestCase +public class SignalTest extends AbstractOMTest { private BufferProvider bufferPool; @@ -53,16 +51,6 @@ public class SignalTest extends TestCase protected void setUp() throws Exception { super.setUp(); - OMPlatform.INSTANCE.addLogHandler(PrintStreamLogHandler.CONSOLE); - OMPlatform.INSTANCE.addTraceHandler(PrintStreamTraceHandler.CONSOLE); - - BufferInputStream.TRACE = true; - BufferOutputStream.TRACE = true; - - System.out.print("================================= "); - System.out.print(getName()); - System.out.println(" ================================="); - bufferPool = Net4jFactory.createBufferPool((short)64); LifecycleUtil.activate(bufferPool); assertTrue(LifecycleUtil.isActive(bufferPool)); @@ -125,9 +113,6 @@ public class SignalTest extends TestCase ex.printStackTrace(); } - System.out.println(); - System.out.println(); - Thread.sleep(100); super.tearDown(); } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SynchronizingCorrelatorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SynchronizingCorrelatorTest.java index 0a2c4a4cf5..08c063b935 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SynchronizingCorrelatorTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SynchronizingCorrelatorTest.java @@ -12,13 +12,16 @@ package org.eclipse.net4j.tests; import org.eclipse.net4j.util.concurrent.Synchronizer; import org.eclipse.net4j.util.concurrent.SynchronizingCorrelator; +import org.eclipse.net4j.util.om.OMPlatform; +import org.eclipse.net4j.util.om.PrintStreamLogHandler; +import org.eclipse.net4j.util.om.PrintStreamTraceHandler; import junit.framework.TestCase; /** * @author Eike Stepper */ -public class SynchronizingCorrelatorTest extends TestCase +public class SynchronizingCorrelatorTest extends AbstractOMTest { public void testPutConsumerFirst() throws Exception { @@ -30,7 +33,7 @@ public class SynchronizingCorrelatorTest extends TestCase public void run() { Synchronizer<Boolean> eike = correlator.correlate("eike"); - result[0] = eike.get(10000); + result[0] = eike.get(5000); System.out.println("RESULT: " + result[0]); } }; @@ -61,7 +64,7 @@ public class SynchronizingCorrelatorTest extends TestCase public void run() { Synchronizer<Boolean> eike = correlator.correlate("eike"); - result[0] = eike.get(10000); + result[0] = eike.get(5000); System.out.println("RESULT: " + result[0]); } }; @@ -97,7 +100,7 @@ public class SynchronizingCorrelatorTest extends TestCase public void run() { Synchronizer<Boolean> eike = correlator.correlate("eike"); - result[0] = eike.get(10000); + result[0] = eike.get(5000); System.out.println("RESULT: " + result[0]); } }; @@ -131,7 +134,7 @@ public class SynchronizingCorrelatorTest extends TestCase public void run() { Synchronizer<Boolean> eike = correlator.correlate("eike"); - result[0] = eike.get(10000); + result[0] = eike.get(5000); System.out.println("RESULT: " + result[0]); } }; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java index 1688830a97..e7b5d84590 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java @@ -50,7 +50,7 @@ import junit.framework.TestCase; /** * @author Eike Stepper */ -public class TCPTransportTest extends TestCase +public class TCPTransportTest extends AbstractOMTest { private BufferProvider bufferPool; @@ -64,13 +64,6 @@ public class TCPTransportTest extends TestCase protected void setUp() throws Exception { super.setUp(); - OMPlatform.INSTANCE.addLogHandler(PrintStreamLogHandler.CONSOLE); - OMPlatform.INSTANCE.addTraceHandler(PrintStreamTraceHandler.CONSOLE); - - System.out.print("================================= "); - System.out.print(getName()); - System.out.println(" ================================="); - bufferPool = Net4jFactory.createBufferPool(); LifecycleUtil.activate(bufferPool); assertTrue(LifecycleUtil.isActive(bufferPool)); @@ -133,9 +126,6 @@ public class TCPTransportTest extends TestCase ex.printStackTrace(); } - System.out.println(); - System.out.println(); - Thread.sleep(10); super.tearDown(); } @@ -143,14 +133,14 @@ public class TCPTransportTest extends TestCase { acceptor.activate(); assertTrue(acceptor.isActive()); - assertTrue(connector.connect(1000)); + assertTrue(connector.connect(5000)); } public void testSendBuffer() throws Exception { acceptor.activate(); assertTrue(acceptor.isActive()); - assertTrue(connector.connect(1000)); + assertTrue(connector.connect(5000)); Channel channel = connector.openChannel(); for (int i = 0; i < 3; i++) @@ -173,7 +163,7 @@ public class TCPTransportTest extends TestCase acceptor.setProtocolFactoryRegistry(protocolFactoryRegistry); acceptor.activate(); assertTrue(acceptor.isActive()); - assertTrue(connector.connect(1000)); + assertTrue(connector.connect(5000)); Channel channel = connector.openChannel(TestProtocolFactory.PROTOCOL_ID); for (int i = 0; i < COUNT; i++) @@ -201,7 +191,7 @@ public class TCPTransportTest extends TestCase acceptor.setProtocolFactoryRegistry(local); acceptor.activate(); assertTrue(acceptor.isActive()); - assertTrue(connector.connect(1000)); + assertTrue(connector.connect(5000)); Channel channel = connector.openChannel(TestProtocolFactory.PROTOCOL_ID); for (int i = 0; i < COUNT; i++) @@ -229,7 +219,7 @@ public class TCPTransportTest extends TestCase acceptor.setProtocolFactoryRegistry(local); acceptor.activate(); assertTrue(acceptor.isActive()); - assertTrue(connector.connect(1000)); + assertTrue(connector.connect(5000)); Channel channel = connector.openChannel(TestProtocolFactory.PROTOCOL_ID); for (int i = 0; i < COUNT; i++) @@ -255,7 +245,7 @@ public class TCPTransportTest extends TestCase acceptor.setReceiveExecutor(Executors.newCachedThreadPool()); acceptor.activate(); assertTrue(acceptor.isActive()); - assertTrue(connector.connect(1000)); + assertTrue(connector.connect(5000)); Channel channel = connector.openChannel(TestProtocolFactory.PROTOCOL_ID); for (int i = 0; i < COUNT; i++) @@ -301,7 +291,7 @@ public class TCPTransportTest extends TestCase acceptor.activate(); assertTrue(acceptor.isActive()); - assertTrue(connector.connect(1000)); + assertTrue(connector.connect(5000)); Channel channel = connector.openChannel(); assertTrue(counter.await(2, TimeUnit.SECONDS)); @@ -362,7 +352,7 @@ public class TCPTransportTest extends TestCase acceptor.activate(); assertTrue(acceptor.isActive()); - assertTrue(connector.connect(1000)); + assertTrue(connector.connect(5000)); Channel channel = connector.openChannel(); assertTrue(counter.await(2, TimeUnit.SECONDS)); @@ -430,7 +420,7 @@ public class TCPTransportTest extends TestCase acceptor.activate(); assertTrue(acceptor.isActive()); - assertTrue(connector.connect(1000)); + assertTrue(connector.connect(5000)); final Channel channel = connector.openChannel(); assertTrue(counter.await(2, TimeUnit.SECONDS)); @@ -512,7 +502,7 @@ public class TCPTransportTest extends TestCase acceptor.activate(); assertTrue(acceptor.isActive()); - assertTrue(connector.connect(1000)); + assertTrue(connector.connect(5000)); Channel channel = connector.openChannel(); assertTrue(counter.await(2, TimeUnit.SECONDS)); |