You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by gh...@apache.org on 2006/06/12 21:17:12 UTC
svn commit: r413727 -
/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/SinkChannelTest.java
Author: gharley
Date: Mon Jun 12 12:17:12 2006
New Revision: 413727
URL: http://svn.apache.org/viewvc?rev=413727&view=rev
Log:
Another attempt at fixing the unstable (on Linux) unit test. Ensure we have read off all of the expected
bytes before testing with JUnit assert.
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/SinkChannelTest.java
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/SinkChannelTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/SinkChannelTest.java?rev=413727&r1=413726&r2=413727&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/SinkChannelTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/SinkChannelTest.java Mon Jun 12 12:17:12 2006
@@ -125,13 +125,21 @@
thread[i].join();
}
ByteBuffer readBuf = ByteBuffer.allocate(THREAD_NUM * BUFFER_SIZE);
- long readVal = source.read(readBuf);
+
+ long totalCount = 0;
+ do {
+ long count = source.read(readBuf);
+ if (count < 0) {
+ break;
+ }
+ totalCount += count;
+ } while (totalCount != (THREAD_NUM * BUFFER_SIZE));
+
StringBuffer buf = new StringBuffer();
for (int i = 0; i < THREAD_NUM; i++) {
buf.append("bytes");
}
String readString = buf.toString();
- assertEquals(readString.length(), readVal);
assertEquals(readString, new String(readBuf.array(), ISO8859_1));
}