You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ay...@apache.org on 2006/11/30 17:45:47 UTC
svn commit: r480996 - in /harmony/enhanced/classlib/trunk/modules/nio: make/
src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/
Author: ayza
Date: Thu Nov 30 08:45:45 2006
New Revision: 480996
URL: http://svn.apache.org/viewvc?view=rev&rev=480996
Log:
removing testSocket_NonBlock_ActionsBeforeConnect test method and returning SocketChannelTest back to life (fix for HARMONY-1977)
Modified:
harmony/enhanced/classlib/trunk/modules/nio/make/exclude.windows.x86.drl
harmony/enhanced/classlib/trunk/modules/nio/make/exclude.windows.x86.ibm
harmony/enhanced/classlib/trunk/modules/nio/make/exclude.windows.x86_64.drl
harmony/enhanced/classlib/trunk/modules/nio/make/exclude.windows.x86_64.ibm
harmony/enhanced/classlib/trunk/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java
Modified: harmony/enhanced/classlib/trunk/modules/nio/make/exclude.windows.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/make/exclude.windows.x86.drl?view=diff&rev=480996&r1=480995&r2=480996
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/make/exclude.windows.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/make/exclude.windows.x86.drl Thu Nov 30 08:45:45 2006
@@ -1,2 +0,0 @@
-#fails on Win Server 2003
-org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java
\ No newline at end of file
Modified: harmony/enhanced/classlib/trunk/modules/nio/make/exclude.windows.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/make/exclude.windows.x86.ibm?view=diff&rev=480996&r1=480995&r2=480996
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/make/exclude.windows.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/make/exclude.windows.x86.ibm Thu Nov 30 08:45:45 2006
@@ -1,2 +0,0 @@
-#fails on Win Server 2003
-org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java
\ No newline at end of file
Modified: harmony/enhanced/classlib/trunk/modules/nio/make/exclude.windows.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/make/exclude.windows.x86_64.drl?view=diff&rev=480996&r1=480995&r2=480996
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/make/exclude.windows.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/make/exclude.windows.x86_64.drl Thu Nov 30 08:45:45 2006
@@ -1,2 +0,0 @@
-#fails on Win Server 2003
-org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java
\ No newline at end of file
Modified: harmony/enhanced/classlib/trunk/modules/nio/make/exclude.windows.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/make/exclude.windows.x86_64.ibm?view=diff&rev=480996&r1=480995&r2=480996
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/make/exclude.windows.x86_64.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/make/exclude.windows.x86_64.ibm Thu Nov 30 08:45:45 2006
@@ -1,2 +0,0 @@
-#fails on Win Server 2003
-org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java
\ No newline at end of file
Modified: harmony/enhanced/classlib/trunk/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java?view=diff&rev=480996&r1=480995&r2=480996
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java Thu Nov 30 08:45:45 2006
@@ -323,13 +323,6 @@
assertSocketAction_Block_BeforeConnect(s);
}
- public void testSocket_NonBlock_ActionsBeforeConnect() throws IOException {
- assertFalse(this.channel1.isConnected());// not connected
- this.channel1.configureBlocking(false);
- Socket s = this.channel1.socket();
- assertSocketAction_NonBlock_BeforeConnect(s);
- }
-
public void testSocket_Block_ActionsAfterConnect() throws IOException {
assertFalse(this.channel1.isConnected());// not connected
assertTrue(this.channel1.connect(localAddr1));