[jboss-cvs] JBossAS SVN: r63623 - in trunk/testsuite/src/main/org/jboss/test/cluster: test and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2007-06-23 08:47:57 -0400 (Sat, 23 Jun 2007)
New Revision: 63623

Modified:
   trunk/testsuite/src/main/org/jboss/test/cluster/apache_tomcat/HttpSessionReplicationTestCase.java
   trunk/testsuite/src/main/org/jboss/test/cluster/test/BaseTest.java
   trunk/testsuite/src/main/org/jboss/test/cluster/test/CrossContextCallsTestCase.java
   trunk/testsuite/src/main/org/jboss/test/cluster/test/SessionBasedConcurrentTestCase.java
   trunk/testsuite/src/main/org/jboss/test/cluster/test/SimpleTestCase.java
   trunk/testsuite/src/main/org/jboss/test/cluster/web/jk/test/JvmRouteURLRewritingTestCase.java
Log:
Update httpclient users to handle IOException from GetMethod

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/apache_tomcat/HttpSessionReplicationTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/apache_tomcat/HttpSessionReplicationTestCase.java	2007-06-23 12:11:12 UTC (rev 63622)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/apache_tomcat/HttpSessionReplicationTestCase.java	2007-06-23 12:47:57 UTC (rev 63623)
@@ -247,6 +247,7 @@
     * @return session attribute
     */
    private String makeGet(HttpClient client, HttpMethod method)
+      throws IOException
    {
       try
       {

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/test/BaseTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/test/BaseTest.java	2007-06-23 12:11:12 UTC (rev 63622)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/test/BaseTest.java	2007-06-23 12:47:57 UTC (rev 63623)
@@ -98,6 +98,7 @@
     * @return session attribute
     */
    protected String makeGet(HttpClient client, String url)
+      throws IOException
    {
       getLog().debug("makeGet(): trying to get from url " +url);
 
@@ -136,6 +137,7 @@
     * @return session attribute
     */
    protected String makeGetFailed(HttpClient client, String url)
+      throws IOException
    {
       getLog().debug("makeGetFailed(): trying to get from url " +url);
 
@@ -174,6 +176,7 @@
     * @return session attribute
     */
    protected String makeGetWithState(HttpClient client, String url)
+      throws IOException
    {
       getLog().debug("makeGetWithState(): trying to get from url " +url);
       GetMethod method = new GetMethod(url);

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/test/CrossContextCallsTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/test/CrossContextCallsTestCase.java	2007-06-23 12:11:12 UTC (rev 63622)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/test/CrossContextCallsTestCase.java	2007-06-23 12:47:57 UTC (rev 63623)
@@ -47,6 +47,7 @@
    }
 
    protected String makeGet(HttpClient client, String url)
+      throws IOException
    {
       getLog().debug("makeGet(): trying to get from url " +url);
 
@@ -87,6 +88,7 @@
     * @return session attribute
     */
    protected String makeGetWithState(HttpClient client, String url)
+      throws IOException
    {
       getLog().debug("makeGetWithState(): trying to get from url " +url);
       GetMethod method = new GetMethod(url);
@@ -113,6 +115,7 @@
    }
    
    private String extractResponse(GetMethod method)
+      throws IOException
    {
       Header header = method.getResponseHeader("FIRST");
    

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/test/SessionBasedConcurrentTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/test/SessionBasedConcurrentTestCase.java	2007-06-23 12:11:12 UTC (rev 63622)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/test/SessionBasedConcurrentTestCase.java	2007-06-23 12:47:57 UTC (rev 63623)
@@ -144,19 +144,19 @@
             // Create an instance of HttpClient.
             HttpClient client = new HttpClient();
 
-            // Set the session attribute first
-            makeGet(client, baseURL0 +setURLName);
-
-            // Get the Attribute set by testsessionreplication.jsp
-            attr = makeGetWithState(client, baseURL0 +getURLName);
-
-            // Let's switch to server 2 to retrieve the session attribute.
-            getLog().debug("Switching to server " +server2);
-            setCookieDomainToThisServer(client, server2);
-            String attr2 = makeGet(client, baseURL1 +getURLName);
-
-            // Check the result
             try {
+               // Set the session attribute first
+               makeGet(client, baseURL0 +setURLName);
+   
+               // Get the Attribute set by testsessionreplication.jsp
+               attr = makeGetWithState(client, baseURL0 +getURLName);
+   
+               // Let's switch to server 2 to retrieve the session attribute.
+               getLog().debug("Switching to server " +server2);
+               setCookieDomainToThisServer(client, server2);
+               String attr2 = makeGet(client, baseURL1 +getURLName);
+   
+               // Check the result
               assertEquals("Http session replication attribtues retrieved from both servers ", attr, attr2);
             } catch (Throwable ex) {
                ex_ = ex;

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/test/SimpleTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/test/SimpleTestCase.java	2007-06-23 12:11:12 UTC (rev 63622)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/test/SimpleTestCase.java	2007-06-23 12:47:57 UTC (rev 63623)
@@ -164,6 +164,7 @@
    }
    
    public void testMaxUnreplicatedInterval()
+      throws Exception
    {
       getLog().debug("Enter testMaxUnreplicatedInterval");
 

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/web/jk/test/JvmRouteURLRewritingTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/web/jk/test/JvmRouteURLRewritingTestCase.java	2007-06-23 12:11:12 UTC (rev 63622)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/web/jk/test/JvmRouteURLRewritingTestCase.java	2007-06-23 12:47:57 UTC (rev 63623)
@@ -46,6 +46,7 @@
                                           String urlBase,
                                           String sessionId,
                                           String expectedCount)
+      throws IOException
    {
       String url = urlBase + "/http-jk/accessSession.jsp";
       if (sessionId != null)