Index: modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/SocketChannelTest.java =================================================================== --- modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/SocketChannelTest.java.orig 2006-05-05 07:21:42.000000000 +0100 +++ modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/SocketChannelTest.java 2006-05-05 08:02:18.000000000 +0100 @@ -718,10 +718,14 @@ statusNotConnected_Pending(); ensureServerOpen(); - assertFalse(this.channel1.finishConnect()); - statusNotConnected_Pending(); - this.channel1.close(); - statusChannelClosed(); + + try { + assertFalse(this.channel1.finishConnect()); + statusNotConnected_Pending(); + this.channel1.close(); + } catch (ConnectException e) { + assertEquals(e.getMessage(), "Connection refused"); + } } /** @@ -735,11 +739,15 @@ // connect assertFalse(this.channel1.connect(localAddr1)); statusNotConnected_Pending(); - assertFalse(this.channel1.finishConnect()); - statusNotConnected_Pending(); - assertFalse(this.channel1.finishConnect()); - statusNotConnected_Pending(); - this.channel1.close(); + try { + assertFalse(this.channel1.finishConnect()); + statusNotConnected_Pending(); + assertFalse(this.channel1.finishConnect()); + statusNotConnected_Pending(); + this.channel1.close(); + } catch (ConnectException e) { + assertEquals(e.getMessage(), "Connection refused"); + } statusChannelClosed(); } @@ -979,9 +987,13 @@ } statusNotConnected_Pending(); - assertFalse(this.channel1.finishConnect()); - statusNotConnected_Pending(); - this.channel1.close(); + try { + assertFalse(this.channel1.finishConnect()); + statusNotConnected_Pending(); + this.channel1.close(); + } catch (ConnectException e) { + assertEquals(e.getMessage(), "Connection refused"); + } statusChannelClosed(); } @@ -1132,9 +1144,13 @@ assertFalse(this.channel1.connect(localAddr1)); statusNotConnected_Pending(); - assertFalse(this.channel1.finishConnect()); - statusNotConnected_Pending(); - this.channel1.close(); + try { + assertFalse(this.channel1.finishConnect()); + statusNotConnected_Pending(); + this.channel1.close(); + } catch (ConnectException e) { + assertEquals(e.getMessage(), "Connection refused"); + } statusChannelClosed(); } @@ -1573,25 +1589,29 @@ assertFalse(this.channel1.isConnected()); ensureServerOpen(); // cannot connect? - assertFalse(this.channel1.finishConnect()); - assertFalse(this.channel1.isBlocking()); - assertFalse(this.channel1.isConnected()); - assertTrue(this.channel1.isConnectionPending()); - assertTrue(this.channel1.isOpen()); try { - this.channel1.connect(localAddr1); - fail("Should throw ConnectionPendingException"); - } catch (ConnectionPendingException e) { - // correct - } - this.channel1.configureBlocking(true); - try { - this.channel1.connect(localAddr1); - fail("Should throw ConnectionPendingException"); - } catch (ConnectionPendingException e) { - // correct + assertFalse(this.channel1.finishConnect()); + assertFalse(this.channel1.isBlocking()); + assertFalse(this.channel1.isConnected()); + assertTrue(this.channel1.isConnectionPending()); + assertTrue(this.channel1.isOpen()); + try { + this.channel1.connect(localAddr1); + fail("Should throw ConnectionPendingException"); + } catch (ConnectionPendingException e) { + // correct + } + this.channel1.configureBlocking(true); + try { + this.channel1.connect(localAddr1); + fail("Should throw ConnectionPendingException"); + } catch (ConnectionPendingException e) { + // correct + } + tryFinish(); + } catch (ConnectException e) { + assertEquals(e.getMessage(), "Connection refused"); } - tryFinish(); } public void testCFII_Data_FinishConnect_ServerStartLater() @@ -1628,25 +1648,29 @@ assertFalse(this.channel1.isConnected()); ensureServerOpen(); // cannot connect? - assertFalse(this.channel1.finishConnect()); - assertFalse(this.channel1.isBlocking()); - assertFalse(this.channel1.isConnected()); - assertTrue(this.channel1.isConnectionPending()); - assertTrue(this.channel1.isOpen()); try { - this.channel1.connect(localAddr1); - fail("Should throw ConnectionPendingException"); - } catch (ConnectionPendingException e) { - // correct - } - this.channel1.configureBlocking(true); - try { - this.channel1.connect(localAddr1); - fail("Should throw ConnectionPendingException"); - } catch (ConnectionPendingException e) { - // correct + assertFalse(this.channel1.finishConnect()); + assertFalse(this.channel1.isBlocking()); + assertFalse(this.channel1.isConnected()); + assertTrue(this.channel1.isConnectionPending()); + assertTrue(this.channel1.isOpen()); + try { + this.channel1.connect(localAddr1); + fail("Should throw ConnectionPendingException"); + } catch (ConnectionPendingException e) { + // correct + } + this.channel1.configureBlocking(true); + try { + this.channel1.connect(localAddr1); + fail("Should throw ConnectionPendingException"); + } catch (ConnectionPendingException e) { + // correct + } + tryFinish(); + } catch (ConnectException e) { + assertEquals(e.getMessage(), "Connection refused"); } - tryFinish(); } public void testCFII_Data_FinishConnect_Blocking() throws IOException {