andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed TestOptions to TestUtil

Browse Source
This commit is contained in:
Trustin Lee 2009-03-12 00:42:41 +00:00
parent ebdfec8ec0
commit bd184cc665
12 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -235,7 +235,7 @@
<forkMode>never</forkMode>
<excludes>
<exclude>**/Abstract*</exclude>
<exclude>**/TestOption*</exclude>
<exclude>**/TestUtil*</exclude>
</excludes>
</configuration>
</plugin>

8
src/test/java/org/jboss/netty/bootstrap/AbstractSocketClientBootstrapTest.java
View File

@ -38,7 +38,7 @@ import org.jboss.netty.channel.ChannelPipelineException;
import org.jboss.netty.channel.ChannelPipelineFactory;
import org.jboss.netty.util.DummyHandler;
import org.jboss.netty.util.ExecutorUtil;
import org.jboss.netty.util.TestOptions;
import org.jboss.netty.util.TestUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@ -93,7 +93,7 @@ public abstract class AbstractSocketClientBootstrapTest {
bootstrap.setOption(
"remoteAddress",
new InetSocketAddress(
TestOptions.getLocalHost(),
TestUtil.getLocalHost(),
serverSocket.socket().getLocalPort()));
ChannelFuture future = bootstrap.connect();
@ -130,7 +130,7 @@ public abstract class AbstractSocketClientBootstrapTest {
bootstrap.setOption(
"remoteAddress",
new InetSocketAddress(
TestOptions.getLocalHost(),
TestUtil.getLocalHost(),
serverSocket.socket().getLocalPort()));
bootstrap.setOption("localAddress", new InetSocketAddress(0));
@ -162,7 +162,7 @@ public abstract class AbstractSocketClientBootstrapTest {
expect(pipelineFactory.getPipeline()).andThrow(new ChannelPipelineException());
replay(pipelineFactory);
bootstrap.connect(new InetSocketAddress(TestOptions.getLocalHost(), 1));
bootstrap.connect(new InetSocketAddress(TestUtil.getLocalHost(), 1));
}
@Test(expected = IllegalStateException.class)

6
src/test/java/org/jboss/netty/bootstrap/AbstractSocketServerBootstrapTest.java
View File

@ -45,7 +45,7 @@ import org.jboss.netty.channel.SimpleChannelHandler;
import org.jboss.netty.channel.socket.SocketChannelConfig;
import org.jboss.netty.util.DummyHandler;
import org.jboss.netty.util.ExecutorUtil;
import org.jboss.netty.util.TestOptions;
import org.jboss.netty.util.TestUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@ -132,7 +132,7 @@ public abstract class AbstractSocketServerBootstrapTest {
Socket socket = null;
try {
socket = new Socket(
TestOptions.getLocalHost(),
TestUtil.getLocalHost(),
((InetSocketAddress) channel.getLocalAddress()).getPort());
// Wait until the connection is open in the server side.
@ -188,7 +188,7 @@ public abstract class AbstractSocketServerBootstrapTest {
expect(pipelineFactory.getPipeline()).andThrow(new ChannelPipelineException());
replay(pipelineFactory);
bootstrap.connect(new InetSocketAddress(TestOptions.getLocalHost(), 1));
bootstrap.connect(new InetSocketAddress(TestUtil.getLocalHost(), 1));
}
@Test(expected = IllegalStateException.class)

4
src/test/java/org/jboss/netty/channel/socket/AbstractSocketEchoTest.java
View File

@ -46,7 +46,7 @@ import org.jboss.netty.channel.ExceptionEvent;
import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.channel.SimpleChannelHandler;
import org.jboss.netty.util.ExecutorUtil;
import org.jboss.netty.util.TestOptions;
import org.jboss.netty.util.TestUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@ -97,7 +97,7 @@ public abstract class AbstractSocketEchoTest {
Channel sc = sb.bind(new InetSocketAddress(0));
int port = ((InetSocketAddress) sc.getLocalAddress()).getPort();
ChannelFuture ccf = cb.connect(new InetSocketAddress(TestOptions.getLocalHost(), port));
ChannelFuture ccf = cb.connect(new InetSocketAddress(TestUtil.getLocalHost(), port));
assertTrue(ccf.awaitUninterruptibly().isSuccess());
Channel cc = ccf.getChannel();

6
src/test/java/org/jboss/netty/channel/socket/NioClientSocketShutdownTimeTest.java
View File

@ -33,7 +33,7 @@ import org.jboss.netty.bootstrap.ClientBootstrap;
import org.jboss.netty.channel.ChannelFuture;
import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
import org.jboss.netty.util.DummyHandler;
import org.jboss.netty.util.TestOptions;
import org.jboss.netty.util.TestUtil;
import org.junit.Test;
@ -48,7 +48,7 @@ public class NioClientSocketShutdownTimeTest {
@Test
public void testShutdownTime() throws Throwable {
if (!TestOptions.isTimingTestEnabled()) {
if (!TestUtil.isTimingTestEnabled()) {
return;
}
@ -68,7 +68,7 @@ public class NioClientSocketShutdownTimeTest {
serverSocket.configureBlocking(false);
ChannelFuture f = b.connect(new InetSocketAddress(
TestOptions.getLocalHost(),
TestUtil.getLocalHost(),
serverSocket.socket().getLocalPort()));
serverSocket.accept();

6
src/test/java/org/jboss/netty/channel/socket/NioServerSocketShutdownTimeTest.java
View File

@ -36,7 +36,7 @@ import org.jboss.netty.channel.ChannelPipelineCoverage;
import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.SimpleChannelHandler;
import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
import org.jboss.netty.util.TestOptions;
import org.jboss.netty.util.TestUtil;
import org.junit.Test;
@ -51,7 +51,7 @@ public class NioServerSocketShutdownTimeTest {
@Test(timeout = 10000)
public void testSuccessfulBindAttempt() throws Exception {
if (!TestOptions.isTimingTestEnabled()) {
if (!TestUtil.isTimingTestEnabled()) {
return;
}
@ -74,7 +74,7 @@ public class NioServerSocketShutdownTimeTest {
Socket socket = null;
try {
socket = new Socket(
TestOptions.getLocalHost(),
TestUtil.getLocalHost(),
((InetSocketAddress) channel.getLocalAddress()).getPort());
while (!handler.connected) {

4
src/test/java/org/jboss/netty/handler/codec/frame/AbstractSocketFixedLengthEchoTest.java
View File

@ -46,7 +46,7 @@ import org.jboss.netty.channel.ExceptionEvent;
import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.channel.SimpleChannelHandler;
import org.jboss.netty.util.ExecutorUtil;
import org.jboss.netty.util.TestOptions;
import org.jboss.netty.util.TestUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@ -99,7 +99,7 @@ public abstract class AbstractSocketFixedLengthEchoTest {
Channel sc = sb.bind(new InetSocketAddress(0));
int port = ((InetSocketAddress) sc.getLocalAddress()).getPort();
ChannelFuture ccf = cb.connect(new InetSocketAddress(TestOptions.getLocalHost(), port));
ChannelFuture ccf = cb.connect(new InetSocketAddress(TestUtil.getLocalHost(), port));
assertTrue(ccf.awaitUninterruptibly().isSuccess());
Channel cc = ccf.getChannel();

4
src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketCompatibleObjectStreamEchoTest.java
View File

@ -44,7 +44,7 @@ import org.jboss.netty.channel.ExceptionEvent;
import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.channel.SimpleChannelHandler;
import org.jboss.netty.util.ExecutorUtil;
import org.jboss.netty.util.TestOptions;
import org.jboss.netty.util.TestUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@ -108,7 +108,7 @@ public abstract class AbstractSocketCompatibleObjectStreamEchoTest {
Channel sc = sb.bind(new InetSocketAddress(0));
int port = ((InetSocketAddress) sc.getLocalAddress()).getPort();
ChannelFuture ccf = cb.connect(new InetSocketAddress(TestOptions.getLocalHost(), port));
ChannelFuture ccf = cb.connect(new InetSocketAddress(TestUtil.getLocalHost(), port));
assertTrue(ccf.awaitUninterruptibly().isSuccess());
Channel cc = ccf.getChannel();

4
src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketObjectStreamEchoTest.java
View File

@ -44,7 +44,7 @@ import org.jboss.netty.channel.ExceptionEvent;
import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.channel.SimpleChannelHandler;
import org.jboss.netty.util.ExecutorUtil;
import org.jboss.netty.util.TestOptions;
import org.jboss.netty.util.TestUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@ -108,7 +108,7 @@ public abstract class AbstractSocketObjectStreamEchoTest {
Channel sc = sb.bind(new InetSocketAddress(0));
int port = ((InetSocketAddress) sc.getLocalAddress()).getPort();
ChannelFuture ccf = cb.connect(new InetSocketAddress(TestOptions.getLocalHost(), port));
ChannelFuture ccf = cb.connect(new InetSocketAddress(TestUtil.getLocalHost(), port));
assertTrue(ccf.awaitUninterruptibly().isSuccess());
Channel cc = ccf.getChannel();

4
src/test/java/org/jboss/netty/handler/codec/string/AbstractSocketStringEchoTest.java
View File

@ -46,7 +46,7 @@ import org.jboss.netty.channel.SimpleChannelHandler;
import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
import org.jboss.netty.handler.codec.frame.Delimiters;
import org.jboss.netty.util.ExecutorUtil;
import org.jboss.netty.util.TestOptions;
import org.jboss.netty.util.TestUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@ -112,7 +112,7 @@ public abstract class AbstractSocketStringEchoTest {
Channel sc = sb.bind(new InetSocketAddress(0));
int port = ((InetSocketAddress) sc.getLocalAddress()).getPort();
ChannelFuture ccf = cb.connect(new InetSocketAddress(TestOptions.getLocalHost(), port));
ChannelFuture ccf = cb.connect(new InetSocketAddress(TestUtil.getLocalHost(), port));
assertTrue(ccf.awaitUninterruptibly().isSuccess());
Channel cc = ccf.getChannel();

4
src/test/java/org/jboss/netty/handler/ssl/AbstractSocketSslEchoTest.java
View File

@ -53,7 +53,7 @@ import org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
import org.jboss.netty.logging.InternalLogger;
import org.jboss.netty.logging.InternalLoggerFactory;
import org.jboss.netty.util.ExecutorUtil;
import org.jboss.netty.util.TestOptions;
import org.jboss.netty.util.TestUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@ -128,7 +128,7 @@ public abstract class AbstractSocketSslEchoTest {
Channel sc = sb.bind(new InetSocketAddress(0));
int port = ((InetSocketAddress) sc.getLocalAddress()).getPort();
ChannelFuture ccf = cb.connect(new InetSocketAddress(TestOptions.getLocalHost(), port));
ChannelFuture ccf = cb.connect(new InetSocketAddress(TestUtil.getLocalHost(), port));
ccf.awaitUninterruptibly();
if (!ccf.isSuccess()) {
logger.error("Connection attempt failed", ccf.getCause());

7
src/test/java/org/jboss/netty/util/TestOptions.java → src/test/java/org/jboss/netty/util/TestUtil.java
View File

@ -32,7 +32,7 @@ import java.net.UnknownHostException;
* @version $Rev$, $Date$
*/
@org.junit.Ignore
public final class TestOptions {
public final class TestUtil {
private static final boolean ENABLED;
private static final InetAddress LOCALHOST;
@ -72,10 +72,13 @@ public final class TestOptions {
}
public static InetAddress getLocalHost() {
// We cache this because some machine takes almost forever to return
// from InetAddress.getLocalHost(). I think it's due to the incorrect
// /etc/hosts or /etc/resolve.conf.
return LOCALHOST;
}
private TestOptions() {
private TestUtil() {
// Unused
}
}