From: <st...@us...> - 2007-02-27 17:43:40
|
Revision: 3939 http://svn.sourceforge.net/smartfrog/?rev=3939&view=rev Author: steve_l Date: 2007-02-27 09:41:52 -0800 (Tue, 27 Feb 2007) Log Message: ----------- handle java6 experience robustly Modified Paths: -------------- trunk/core/testharness/testcases/org/smartfrog/test/system/nwfailure/NetworkFailureTest.java trunk/core/testharness/testcases/org/smartfrog/test/system/nwfailure/tcn51.sf Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/nwfailure/NetworkFailureTest.java =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/nwfailure/NetworkFailureTest.java 2007-02-27 17:41:22 UTC (rev 3938) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/nwfailure/NetworkFailureTest.java 2007-02-27 17:41:52 UTC (rev 3939) @@ -45,15 +45,33 @@ "no-such-hostname"); } + /** + * This test can fail for different reasons on Java 6 from Java 5, or + * maybe this is triggered by differences in proxy setup. + * <pre> + * java.rmi.ConnectIOException: Exception creating connection to: 192.6.19.80; + * nested exception is: java.net.NoRouteToHostException: connect timed out: 192.6.19.80 + * </pre> + * @throws Exception + */ public void testConnectionRefusedTCN51() throws Exception { - deployExpectingException(FILES + "tcn51.sf", + Throwable thrown = deployExpectingException(FILES + "tcn51.sf", "tcn51", "SmartFrogDeploymentException", - "Connection refused", - "java.rmi.ConnectException", - "Connection refused"); - + null, + null, + null); + Throwable nested=thrown.getCause(); + assertNotNull("No nested cause",nested); + String message = nested.getMessage(); + assertNotNull("No nested message", message); + String faulttype=nested.getClass().getName(); + if("java.rmi.ConnectException".equals(faulttype)) { + assertContains(message, "Connection refused"); + } else { + assertEquals("java.rmi.ConnectIOException",faulttype); + } } public void testConnectionRefusedTCN51b() throws Exception { @@ -64,6 +82,5 @@ "Connection refused to host: 216.239.59.99", "java.rmi.ConnectException", "Connection refused"); - } } Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/nwfailure/tcn51.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/nwfailure/tcn51.sf 2007-02-27 17:41:22 UTC (rev 3938) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/nwfailure/tcn51.sf 2007-02-27 17:41:52 UTC (rev 3939) @@ -22,7 +22,7 @@ #include "org/smartfrog/test/system/nwfailure/component.sf" /* - * try deploying to google. Something in the router chain will reject this + * try deploying to smartfrog.org . Something in the router chain will reject this */ sfConfig extends Compound { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-06-06 20:26:07
|
Revision: 6647 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=6647&view=rev Author: steve_l Date: 2008-06-06 13:26:06 -0700 (Fri, 06 Jun 2008) Log Message: ----------- SFOS-888 A Network test is commented out Modified Paths: -------------- trunk/core/testharness/testcases/org/smartfrog/test/system/nwfailure/NetworkFailure.java trunk/core/testharness/testcases/org/smartfrog/test/system/nwfailure/NetworkFailureTest.java trunk/core/testharness/testcases/org/smartfrog/test/system/nwfailure/tcn51b.sf Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/nwfailure/NetworkFailure.java =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/nwfailure/NetworkFailure.java 2008-06-06 19:57:35 UTC (rev 6646) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/nwfailure/NetworkFailure.java 2008-06-06 20:26:06 UTC (rev 6647) @@ -54,7 +54,7 @@ * *@exception Exception Description of the Exception */ - public void sfDeploy() throws SmartFrogException, RemoteException { + public synchronized void sfDeploy() throws SmartFrogException, RemoteException { super.sfDeploy(); // ask use to remove network cord to induce n/w failure BufferedReader br=null; @@ -86,9 +86,10 @@ /** * sfStart: starts counter thread * - *@exception Exception Description of the Exception + * @throws SmartFrogException SF problems + * @throws RemoteException network problems */ - public void sfStart() throws SmartFrogException, RemoteException { + public synchronized void sfStart() throws SmartFrogException, RemoteException { super.sfStart(); sfLog().info("In sfStart"); try { Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/nwfailure/NetworkFailureTest.java =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/nwfailure/NetworkFailureTest.java 2008-06-06 19:57:35 UTC (rev 6646) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/nwfailure/NetworkFailureTest.java 2008-06-06 20:26:06 UTC (rev 6647) @@ -29,13 +29,20 @@ public class NetworkFailureTest extends SmartFrogTestBase { private static final String FILES = "org/smartfrog/test/system/nwfailure/"; + private static final String CONNECTION_REFUSED = "Connection refused"; + private static final String CONNECT_IOEXCEPTION = "java.rmi.ConnectIOException"; + private static final String JAVA_NET_NO_ROUTE_TO_HOST_EXCEPTION = "java.net.NoRouteToHostException"; public NetworkFailureTest(String name) { super(name); } + /** + * test case + * @throws Throwable on failure + */ - public void testUnknownHostTCN50() throws Exception { + public void testUnknownHostTCN50() throws Throwable { deployExpectingException(FILES + "tcn50.sf", "tcn50", @@ -52,9 +59,9 @@ * java.rmi.ConnectIOException: Exception creating connection to: 192.6.19.80; * nested exception is: java.net.NoRouteToHostException: connect timed out: 192.6.19.80 * </pre> - * @throws Exception + * @throws Throwable on failure */ - public void testConnectionRefusedTCN51() throws Exception { + public void testConnectionRefusedTCN51() throws Throwable { Throwable thrown = deployExpectingException(FILES + "tcn51.sf", "tcn51", @@ -68,19 +75,25 @@ assertNotNull("No nested message", message); String faulttype=nested.getClass().getName(); if("java.rmi.ConnectException".equals(faulttype)) { - assertContains(message, "Connection refused"); + assertContains(message, CONNECTION_REFUSED); } else { - assertEquals("java.rmi.ConnectIOException",faulttype); + assertEquals(CONNECT_IOEXCEPTION,faulttype); } } - public void NotestConnectionRefusedTCN51b() throws Exception { + /** + * test case + * @throws Throwable on failure + */ + + public void testConnectionRefusedTCN51b() throws Throwable { + deployExpectingException(FILES + "tcn51b.sf", "tcn51b", "SmartFrogDeploymentException", - "Connection refused to host: 216.239.59.99", - "java.rmi.ConnectException", - "Connection refused"); + "Exception creating connection to", + CONNECT_IOEXCEPTION, + "No route to host"); } } Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/nwfailure/tcn51b.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/nwfailure/tcn51b.sf 2008-06-06 19:57:35 UTC (rev 6646) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/nwfailure/tcn51b.sf 2008-06-06 20:26:06 UTC (rev 6647) @@ -22,10 +22,10 @@ #include "org/smartfrog/test/system/nwfailure/component.sf" /* - * try deploying to an IP addr of google. Something in the router chain will reject this + * try deploying to an IP addr of a rarely used interface */ sfConfig extends Compound { - sfProcessHost "216.239.59.99"; + sfProcessHost "169.254.128.48"; noop extends Noop; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |