From 4229b23a510c19c662ceba5949391f701807e8ae Mon Sep 17 00:00:00 2001 From: Jestan Nirojan Date: Sat, 15 Dec 2012 13:49:08 +0530 Subject: [PATCH] Fixed SCTP testcases #632 --- .../testsuite/transport/socket/SctpEchoTest.java | 3 +-- .../transport/socket/SocketTestPermutation.java | 13 ++----------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SctpEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/SctpEchoTest.java index 7899b4cc9f..9147d0a095 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SctpEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/SctpEchoTest.java @@ -58,14 +58,13 @@ public class SctpEchoTest extends AbstractSctpTest { } @Test - @Ignore("TODO: fix this after OioSctp EventLoop done") public void testSimpleEchoWithBoundedBuffer() throws Throwable { Assume.assumeTrue(TestUtils.isSctpSupported()); run(); } public void testSimpleEchoWithBoundedBuffer(ServerBootstrap sb, Bootstrap cb) throws Throwable { - testSimpleEcho0(sb, cb, 32); + testSimpleEcho0(sb, cb, 4096); } private static void testSimpleEcho0(ServerBootstrap sb, Bootstrap cb, int maxInboundBufferSize) throws Throwable { diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java index 2f1a37019a..8716f5ea8b 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java @@ -29,10 +29,7 @@ import io.netty.channel.socket.nio.NioSctpChannel; import io.netty.channel.socket.nio.NioSctpServerChannel; import io.netty.channel.socket.nio.NioServerSocketChannel; import io.netty.channel.socket.nio.NioSocketChannel; -import io.netty.channel.socket.oio.OioDatagramChannel; -import io.netty.channel.socket.oio.OioEventLoopGroup; -import io.netty.channel.socket.oio.OioServerSocketChannel; -import io.netty.channel.socket.oio.OioSocketChannel; +import io.netty.channel.socket.oio.*; import io.netty.testsuite.util.TestUtils; import java.util.ArrayList; @@ -247,8 +244,6 @@ final class SocketTestPermutation { channel(NioSctpServerChannel.class); } }); - /* - * Comment out till #632 is fixes list.add(new Factory() { @Override public ServerBootstrap newInstance() { @@ -257,7 +252,6 @@ final class SocketTestPermutation { channel(OioSctpServerChannel.class); } }); - */ return list; } @@ -274,15 +268,12 @@ final class SocketTestPermutation { return new Bootstrap().group(new NioEventLoopGroup()).channel(NioSctpChannel.class); } }); - /* - * Comment out till #632 is fixes - * list.add(new Factory() { + list.add(new Factory() { @Override public Bootstrap newInstance() { return new Bootstrap().group(new OioEventLoopGroup()).channel(OioSctpChannel.class); } }); - */ return list; }