Fixed SCTP testcases #632

This commit is contained in:
Jestan Nirojan 2012-12-15 13:49:08 +05:30 committed by Norman Maurer
parent 3fc3401c08
commit 4229b23a51
2 changed files with 3 additions and 13 deletions

View File

@ -58,14 +58,13 @@ public class SctpEchoTest extends AbstractSctpTest {
} }
@Test @Test
@Ignore("TODO: fix this after OioSctp EventLoop done")
public void testSimpleEchoWithBoundedBuffer() throws Throwable { public void testSimpleEchoWithBoundedBuffer() throws Throwable {
Assume.assumeTrue(TestUtils.isSctpSupported()); Assume.assumeTrue(TestUtils.isSctpSupported());
run(); run();
} }
public void testSimpleEchoWithBoundedBuffer(ServerBootstrap sb, Bootstrap cb) throws Throwable { 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 { private static void testSimpleEcho0(ServerBootstrap sb, Bootstrap cb, int maxInboundBufferSize) throws Throwable {

View File

@ -29,10 +29,7 @@ import io.netty.channel.socket.nio.NioSctpChannel;
import io.netty.channel.socket.nio.NioSctpServerChannel; import io.netty.channel.socket.nio.NioSctpServerChannel;
import io.netty.channel.socket.nio.NioServerSocketChannel; import io.netty.channel.socket.nio.NioServerSocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.channel.socket.nio.NioSocketChannel;
import io.netty.channel.socket.oio.OioDatagramChannel; import io.netty.channel.socket.oio.*;
import io.netty.channel.socket.oio.OioEventLoopGroup;
import io.netty.channel.socket.oio.OioServerSocketChannel;
import io.netty.channel.socket.oio.OioSocketChannel;
import io.netty.testsuite.util.TestUtils; import io.netty.testsuite.util.TestUtils;
import java.util.ArrayList; import java.util.ArrayList;
@ -247,8 +244,6 @@ final class SocketTestPermutation {
channel(NioSctpServerChannel.class); channel(NioSctpServerChannel.class);
} }
}); });
/*
* Comment out till #632 is fixes
list.add(new Factory<ServerBootstrap>() { list.add(new Factory<ServerBootstrap>() {
@Override @Override
public ServerBootstrap newInstance() { public ServerBootstrap newInstance() {
@ -257,7 +252,6 @@ final class SocketTestPermutation {
channel(OioSctpServerChannel.class); channel(OioSctpServerChannel.class);
} }
}); });
*/
return list; return list;
} }
@ -274,15 +268,12 @@ final class SocketTestPermutation {
return new Bootstrap().group(new NioEventLoopGroup()).channel(NioSctpChannel.class); return new Bootstrap().group(new NioEventLoopGroup()).channel(NioSctpChannel.class);
} }
}); });
/* list.add(new Factory<Bootstrap>() {
* Comment out till #632 is fixes
* list.add(new Factory<Bootstrap>() {
@Override @Override
public Bootstrap newInstance() { public Bootstrap newInstance() {
return new Bootstrap().group(new OioEventLoopGroup()).channel(OioSctpChannel.class); return new Bootstrap().group(new OioEventLoopGroup()).channel(OioSctpChannel.class);
} }
}); });
*/
return list; return list;
} }