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

Fixed ClosedChannelException in various integration tests

Browse Source
This commit is contained in:
Trustin Lee 2008-09-05 02:07:10 +00:00
parent 27cc323dce
commit ef6404ae0c
6 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,8 +146,8 @@ public abstract class AbstractSocketEchoTest {
} }
} }
ch.channel.close().awaitUninterruptibly();
sh.channel.close().awaitUninterruptibly(); sh.channel.close().awaitUninterruptibly();
ch.channel.close().awaitUninterruptibly();
sc.close().awaitUninterruptibly(); sc.close().awaitUninterruptibly();
if (sh.exception.get() != null && !(sh.exception.get() instanceof IOException)) { if (sh.exception.get() != null && !(sh.exception.get() instanceof IOException)) {
@ -191,11 +191,12 @@ public abstract class AbstractSocketEchoTest {
for (int i = 0; i < actual.length; i ++) { for (int i = 0; i < actual.length; i ++) {
assertEquals(data[i + lastIdx], actual[i]); assertEquals(data[i + lastIdx], actual[i]);
} }
counter += actual.length;
if (channel.getParent() != null) { if (channel.getParent() != null) {
channel.write(m); channel.write(m);
} }
counter += actual.length;
} }
@Override @Override

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

@ -148,8 +148,8 @@ public abstract class AbstractSocketFixedLengthEchoTest {
} }
} }
ch.channel.close().awaitUninterruptibly();
sh.channel.close().awaitUninterruptibly(); sh.channel.close().awaitUninterruptibly();
ch.channel.close().awaitUninterruptibly();
sc.close().awaitUninterruptibly(); sc.close().awaitUninterruptibly();
if (sh.exception.get() != null && !(sh.exception.get() instanceof IOException)) { if (sh.exception.get() != null && !(sh.exception.get() instanceof IOException)) {
@ -195,11 +195,12 @@ public abstract class AbstractSocketFixedLengthEchoTest {
for (int i = 0; i < actual.length; i ++) { for (int i = 0; i < actual.length; i ++) {
assertEquals(data[i + lastIdx], actual[i]); assertEquals(data[i + lastIdx], actual[i]);
} }
counter += actual.length;
if (channel.getParent() != null) { if (channel.getParent() != null) {
channel.write(m); channel.write(m);
} }
counter += actual.length;
} }
@Override @Override

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

@ -155,8 +155,8 @@ public abstract class AbstractSocketCompatibleObjectStreamEchoTest {
} }
} }
ch.channel.close().awaitUninterruptibly();
sh.channel.close().awaitUninterruptibly(); sh.channel.close().awaitUninterruptibly();
ch.channel.close().awaitUninterruptibly();
sc.close().awaitUninterruptibly(); sc.close().awaitUninterruptibly();
if (sh.exception.get() != null && !(sh.exception.get() instanceof IOException)) { if (sh.exception.get() != null && !(sh.exception.get() instanceof IOException)) {
@ -196,11 +196,11 @@ public abstract class AbstractSocketCompatibleObjectStreamEchoTest {
String m = (String) e.getMessage(); String m = (String) e.getMessage();
assertEquals(data[counter], m); assertEquals(data[counter], m);
counter ++;
if (channel.getParent() != null) { if (channel.getParent() != null) {
channel.write(m); channel.write(m);
} }
counter ++;
} }
@Override @Override

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

@ -155,8 +155,8 @@ public abstract class AbstractSocketObjectStreamEchoTest {
} }
} }
ch.channel.close().awaitUninterruptibly();
sh.channel.close().awaitUninterruptibly(); sh.channel.close().awaitUninterruptibly();
ch.channel.close().awaitUninterruptibly();
sc.close().awaitUninterruptibly(); sc.close().awaitUninterruptibly();
if (sh.exception.get() != null && !(sh.exception.get() instanceof IOException)) { if (sh.exception.get() != null && !(sh.exception.get() instanceof IOException)) {
@ -196,11 +196,11 @@ public abstract class AbstractSocketObjectStreamEchoTest {
String m = (String) e.getMessage(); String m = (String) e.getMessage();
assertEquals(data[counter], m); assertEquals(data[counter], m);
counter ++;
if (channel.getParent() != null) { if (channel.getParent() != null) {
channel.write(m); channel.write(m);
} }
counter ++;
} }
@Override @Override

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

@ -160,8 +160,8 @@ public abstract class AbstractSocketStringEchoTest {
} }
} }
ch.channel.close().awaitUninterruptibly();
sh.channel.close().awaitUninterruptibly(); sh.channel.close().awaitUninterruptibly();
ch.channel.close().awaitUninterruptibly();
sc.close().awaitUninterruptibly(); sc.close().awaitUninterruptibly();
if (sh.exception.get() != null && !(sh.exception.get() instanceof IOException)) { if (sh.exception.get() != null && !(sh.exception.get() instanceof IOException)) {

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

@ -158,8 +158,8 @@ public abstract class AbstractSocketSslEchoTest {
} }
} }
ch.channel.close().awaitUninterruptibly();
sh.channel.close().awaitUninterruptibly(); sh.channel.close().awaitUninterruptibly();
ch.channel.close().awaitUninterruptibly();
sc.close().awaitUninterruptibly(); sc.close().awaitUninterruptibly();
if (sh.exception.get() != null && !(sh.exception.get() instanceof IOException)) { if (sh.exception.get() != null && !(sh.exception.get() instanceof IOException)) {
@ -203,11 +203,12 @@ public abstract class AbstractSocketSslEchoTest {
for (int i = 0; i < actual.length; i ++) { for (int i = 0; i < actual.length; i ++) {
assertEquals(data[i + lastIdx], actual[i]); assertEquals(data[i + lastIdx], actual[i]);
} }
counter += actual.length;
if (channel.getParent() != null) { if (channel.getParent() != null) {
channel.write(m); channel.write(m);
} }
counter += actual.length;
} }
@Override @Override