[jboss-cvs] JBossAS SVN: r58937 - in branches/JBoss_4_0_3_SP1_JBAS-3808/testsuite: imports src/main/org/jboss/test/web/test src/resources/web/sso

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

Author: bstansberry at jboss.com
Date: 2006-12-08 17:00:33 -0500 (Fri, 08 Dec 2006)
New Revision: 58937

Modified:
   branches/JBoss_4_0_3_SP1_JBAS-3808/testsuite/imports/test-jars.xml
   branches/JBoss_4_0_3_SP1_JBAS-3808/testsuite/src/main/org/jboss/test/web/test/ClusteredSingleSignOnUnitTestCase.java
   branches/JBoss_4_0_3_SP1_JBAS-3808/testsuite/src/resources/web/sso/application.xml
Log:
Test undeploy of both distributed and non-distributed webapps

Modified: branches/JBoss_4_0_3_SP1_JBAS-3808/testsuite/imports/test-jars.xml
===================================================================
--- branches/JBoss_4_0_3_SP1_JBAS-3808/testsuite/imports/test-jars.xml	2006-12-08 21:57:57 UTC (rev 58936)
+++ branches/JBoss_4_0_3_SP1_JBAS-3808/testsuite/imports/test-jars.xml	2006-12-08 22:00:33 UTC (rev 58937)
@@ -5038,6 +5038,21 @@
         <include name="**/*.jsp"/>
       </fileset>
     </war>
+    <war destfile="${build.lib}/sso-form-auth-clustered.war"
+      webxml="${build.resources}/web/sso/war/web-form-auth-clustered.xml">
+      <webinf dir="${build.resources}/web/sso/war">
+        <include name="jboss-web.xml"/>
+      </webinf>
+      <classes dir="${build.classes}">
+        <include name="org/jboss/test/web/servlets/EJBServlet.class"/>
+        <include name="org/jboss/test/web/servlets/LogoutServlet.class"/>
+        <include name="org/jboss/test/web/util/Util*"/>
+      </classes>
+      <fileset dir="${build.resources}/web/sso/war">
+        <include name="**/*.html"/>
+        <include name="**/*.jsp"/>
+      </fileset>
+    </war>
     <war destfile="${build.lib}/sso-expire.war"
       webxml="${build.resources}/web/sso/war/web-sso-expire.xml">
       <webinf dir="${build.resources}/web/sso/war">
@@ -5064,6 +5079,10 @@
         fullpath="sso-form-auth1.war"/>
       <zipfileset dir="${build.lib}" includes="sso-form-auth.war"
         fullpath="sso-form-auth2.war"/>
+        <zipfileset dir="${build.lib}" includes="sso-form-auth-clustered.war"
+          fullpath="sso-form-auth4.war"/>
+        <zipfileset dir="${build.lib}" includes="sso-form-auth-clustered.war"
+          fullpath="sso-form-auth5.war"/>
       <zipfileset dir="${build.lib}" includes="sso-expire.war"/>
       <zipfileset dir="${build.lib}" includes="jbosstest-web-ejbs.jar"/>
     </zip>

Modified: branches/JBoss_4_0_3_SP1_JBAS-3808/testsuite/src/main/org/jboss/test/web/test/ClusteredSingleSignOnUnitTestCase.java
===================================================================
--- branches/JBoss_4_0_3_SP1_JBAS-3808/testsuite/src/main/org/jboss/test/web/test/ClusteredSingleSignOnUnitTestCase.java	2006-12-08 21:57:57 UTC (rev 58936)
+++ branches/JBoss_4_0_3_SP1_JBAS-3808/testsuite/src/main/org/jboss/test/web/test/ClusteredSingleSignOnUnitTestCase.java	2006-12-08 22:00:33 UTC (rev 58937)
@@ -63,10 +63,9 @@
       TestSuite suite = new TestSuite();
       suite.addTest(new ClusteredSingleSignOnUnitTestCase("testSessionExpiration"));
       suite.addTest(new ClusteredSingleSignOnUnitTestCase("testFormAuthSingleSignOn"));
-      suite.addTest(new ClusteredSingleSignOnUnitTestCase("testWebappUndeploy"));
+      suite.addTest(new ClusteredSingleSignOnUnitTestCase("testUndeployNonClusteredWebapp"));
+      suite.addTest(new ClusteredSingleSignOnUnitTestCase("testUndeployClusteredWebapp"));
       
-//      return JBossClusteredTestCase.getDeploySetup(suite, "web-sso-clustered.ear");
-      
       return JBossClusteredTestCase.getDeploySetup(suite, "web-sso.ear");
    }
 
@@ -100,6 +99,20 @@
       log.debug("deployed1 = " + deployed1);
    }
    
+   public void testUndeployNonClusteredWebapp() throws Exception
+   {
+      log.info("+++ testUndeployNonClusteredWebapp");
+      
+      webappUndeployTest("war1", "war2");
+   }
+   
+   public void testUndeployClusteredWebapp() throws Exception
+   {
+      log.info("+++ testUndeployClusteredWebapp");
+      
+      webappUndeployTest("war4", "war5");
+   }
+   
    /**
     * Tests that undeploying a webapp on one server doesn't kill an sso
     * that also has a session from another webapp associated with it.
@@ -110,7 +123,7 @@
     *
     * @throws Exception
     */
-   public void testWebappUndeploy() throws Exception
+   private void webappUndeployTest(String firstWar, String secondWar) throws Exception
    {
       log.info("+++ testWebappUndeploy");
       
@@ -119,9 +132,9 @@
       String serverA = httpURLs[0];
       String serverB = httpURLs[1];
       
-      String warA1 = serverA + "/war1/";
-      String warB1 = serverB + "/war1/";
-      String warB2 = serverB + "/war2/";
+      String warA1 = serverA + "/" + firstWar +"/";
+      String warB1 = serverB + "/" + firstWar +"/";
+      String warB2 = serverB + "/" + secondWar +"/";
       
       // Start by accessing the secured index.html of war1
       HttpClient httpConn = new HttpClient();

Modified: branches/JBoss_4_0_3_SP1_JBAS-3808/testsuite/src/resources/web/sso/application.xml
===================================================================
--- branches/JBoss_4_0_3_SP1_JBAS-3808/testsuite/src/resources/web/sso/application.xml	2006-12-08 21:57:57 UTC (rev 58936)
+++ branches/JBoss_4_0_3_SP1_JBAS-3808/testsuite/src/resources/web/sso/application.xml	2006-12-08 22:00:33 UTC (rev 58937)
@@ -25,6 +25,18 @@
       </web>
    </module>
    <module>
+      <web>
+         <web-uri>sso-form-auth4.war</web-uri>
+         <context-root>/war4</context-root>
+      </web>
+   </module>
+   <module>
+      <web>
+         <web-uri>sso-form-auth5.war</web-uri>
+         <context-root>/war5</context-root>
+      </web>
+   </module>
+   <module>
       <ejb>jbosstest-web-ejbs.jar</ejb>
    </module>
 </application>