[jboss-cvs] JBossAS SVN: r108060 - branches/infinispan-int/testsuite/src/main/org/jboss/test/web/test.

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

Author: smarlow at redhat.com
Date: 2010-09-08 17:37:33 -0400 (Wed, 08 Sep 2010)
New Revision: 108060

Modified:
   branches/infinispan-int/testsuite/src/main/org/jboss/test/web/test/ClusteredSingleSignOnUnitTestCase.java
   branches/infinispan-int/testsuite/src/main/org/jboss/test/web/test/SSOBaseCase.java
Log:
disabled test logic that peeked into JBC cache (todo is reimplement for Infinispan).  Improved test log messages.

Modified: branches/infinispan-int/testsuite/src/main/org/jboss/test/web/test/ClusteredSingleSignOnUnitTestCase.java
===================================================================
--- branches/infinispan-int/testsuite/src/main/org/jboss/test/web/test/ClusteredSingleSignOnUnitTestCase.java	2010-09-08 21:29:42 UTC (rev 108059)
+++ branches/infinispan-int/testsuite/src/main/org/jboss/test/web/test/ClusteredSingleSignOnUnitTestCase.java	2010-09-08 21:37:33 UTC (rev 108060)
@@ -136,8 +136,7 @@
 
       HttpState state = httpConn.getState();
       
-      String sessionID = SSOBaseCase.getSessionIdFromState(state);
-      log.debug("Saw JSESSIONID="+sessionID);
+      log.debug("Saw JSESSIONID="+SSOBaseCase.getSessionIdValueFromState(state));
       
       // Submit the login form
       SSOBaseCase.executeFormLogin(httpConn, warA1);
@@ -240,14 +239,13 @@
       SSOBaseCase.checkAccessDenied(httpConn1, warA3 + "index.jsp");
       SSOBaseCase.executeFormLogin(httpConn1, warA3);
       HttpState state = httpConn1.getState();      
-      String sessionID1 = SSOBaseCase.getSessionIdFromState(state);
+      // String sessionID1 = SSOBaseCase.getSessionIdValueFromState(state);
       
       // Now the standard SSO tests
       HttpClient httpConn = new HttpClient();
       SSOBaseCase.checkAccessDenied(httpConn, warA3 + "index.jsp");
       state = httpConn.getState();      
-      String sessionID = SSOBaseCase.getSessionIdFromState(state);
-      log.debug("Saw JSESSIONID="+sessionID);
+      log.debug("Saw JSESSIONID="+SSOBaseCase.getSessionIdValueFromState(state));
       SSOBaseCase.executeFormLogin(httpConn, warA3);
       String ssoID = SSOBaseCase.processSSOCookie(state, serverA, serverB);
       log.debug("Saw JSESSIONIDSSO="+ssoID);
@@ -281,10 +279,11 @@
       SSOBaseCase.checkAccessDenied(httpConn, warB3 + "index.jsp");
       
       // Confirm that the SSO we created at the start was removed from the cache
-      assertFalse("node0 cache does not have SSO " + sessionID1,
-                  getCacheHasSSO(adaptors[0], sessionID1));
-      assertFalse("node1 cache does not have SSO " + sessionID1,
-            getCacheHasSSO(adaptors[1], sessionID1));
+      // TODO:  enable the following logic
+      //assertFalse("node0 cache does not have SSO " + sessionID1,
+      //            getCacheHasSSO(adaptors[0], sessionID1));
+      //assertFalse("node1 cache does not have SSO " + sessionID1,
+      //      getCacheHasSSO(adaptors[1], sessionID1));
    }
    
    private boolean getCacheHasSSO(MBeanServerConnection adaptor ,String ssoId)
@@ -294,6 +293,7 @@
                      "setCacheConfigName", 
                      new Object[] { "clustered-sso" }, 
                      new String[] { String.class.getName() });
+
       
       Boolean b = (Boolean) adaptor.invoke(CacheHelper.OBJECT_NAME, "getCacheHasSSO", 
                             new Object[] { ssoId }, 

Modified: branches/infinispan-int/testsuite/src/main/org/jboss/test/web/test/SSOBaseCase.java
===================================================================
--- branches/infinispan-int/testsuite/src/main/org/jboss/test/web/test/SSOBaseCase.java	2010-09-08 21:29:42 UTC (rev 108059)
+++ branches/infinispan-int/testsuite/src/main/org/jboss/test/web/test/SSOBaseCase.java	2010-09-08 21:37:33 UTC (rev 108060)
@@ -61,8 +61,7 @@
 
       HttpState state = httpConn.getState();
       
-      String sessionID = getSessionIdFromState(state);
-      log.debug("Saw JSESSIONID="+sessionID);
+      log.debug("Saw JSESSIONID="+getSessionIdValueFromState(state));
 
       // Submit the login form
       executeFormLogin(httpConn, warA1);
@@ -115,8 +114,7 @@
 
       HttpState state = httpConn.getState();
 
-      String sessionID = getSessionIdFromState(state);
-      log.debug("Saw JSESSIONID=" + sessionID);
+      log.debug("Saw JSESSIONID="+getSessionIdValueFromState(state));
 
       // Submit the login form
       executeFormLogin(httpConn, warA1);
@@ -202,7 +200,7 @@
       int responseCode = httpConn.executeMethod(indexGet);
       String body = indexGet.getResponseBodyAsString();
       assertTrue("Expected response code ==  OK but got "+responseCode+" for request=" + url, responseCode == HttpURLConnection.HTTP_OK);
-      assertTrue("Redirected to login page ("+body+")", body.indexOf("j_security_check") > 0 );
+      assertTrue("Redirected to login page for request=" + url +", body=[" +body+"]", body.indexOf("j_security_check") > 0 );
    }
 
    public static String processSSOCookie(HttpState state, String serverA, String serverB)
@@ -255,17 +253,18 @@
                                false);
       return copy;
    }
-   
-   public static String getSessionIdFromState(HttpState state)
+  
+
+      public static String getSessionIdValueFromState(HttpState state)
    {
       Cookie[] cookies = state.getCookies();
       String sessionID = null;
       for(int c = 0; c < cookies.length; c ++)
       {
          if( "JSESSIONID".equalsIgnoreCase(cookies[c].getName()) )
-            sessionID = cookies[c].getName();
+            sessionID = cookies[c].getValue();
       }
       return sessionID;
-      
+
    }
 }