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

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

Author: emuckenhuber
Date: 2008-10-24 13:05:32 -0400 (Fri, 24 Oct 2008)
New Revision: 80059

Added:
   trunk/testsuite/src/resources/profileservice/override/profileservice-datasource.ear/META-INF/application.xml
Modified:
   trunk/testsuite/imports/sections/profileservice.xml
   trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/ProfileServiceOverrideTestCase.java
Log:
[JBAS-6036] update test

Modified: trunk/testsuite/imports/sections/profileservice.xml
===================================================================
--- trunk/testsuite/imports/sections/profileservice.xml	2008-10-24 17:03:53 UTC (rev 80058)
+++ trunk/testsuite/imports/sections/profileservice.xml	2008-10-24 17:05:32 UTC (rev 80059)
@@ -65,6 +65,9 @@
          <fileset dir="${build.resources}/profileservice/override/profileservice-datasource.ear">
              <include name="**/*.xml"/>
          </fileset>
+         <fileset dir="${build.lib}">
+         	<include name="testWarDeployment.war"/>
+         </fileset>
       </jar>
 
    </target>

Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/ProfileServiceOverrideTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/ProfileServiceOverrideTestCase.java	2008-10-24 17:03:53 UTC (rev 80058)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/ProfileServiceOverrideTestCase.java	2008-10-24 17:05:32 UTC (rev 80059)
@@ -69,15 +69,32 @@
          mgtView.updateComponent(mc);
          mgtView.process();
          
+         
+         // See if the changes are reflected in the managedView after a reload
+         mgtView = getManagementView();
+         
+         ManagedDeployment md2 = mgtView.getDeployment(deploymentName, DeploymentPhase.APPLICATION);
+         assertNotNull(md2);
+         
+         ManagedComponent mc2 = md2.getComponent("ChangedDsJNDIName");
+         assertNotNull(mc2);
+         
+         mc2 = md2.getComponent("ProfileServiceTestDS");
+         assertNull(mc2);
+         
+         mc2 = getManagedComponent(mgtView, "ProfileServiceTestDS");
+         assertNull(mc2);
       }
       catch(Exception e)
       {
          log.error(e);
+         undeployPackage(new String[] { deploymentName });
          throw e;
       }
       finally
       {
-         undeployPackage(new String[] { deploymentName });
+         // Do not undeploy deployment, if everything went ok
+         // undeployPackage(new String[] { deploymentName });
       }
    }
    
@@ -94,8 +111,15 @@
          assertNotNull(md.getChildren());
          assertFalse(md.getChildren().isEmpty());
          
-         // get first deployment (test-ds.xml)
-         md = md.getChildren().get(0);
+         // get test-ds.xml child
+         for(ManagedDeployment d : md.getChildren())
+         {
+            if(d.getName().endsWith("test-ds.xml"))
+            {
+               md = d;
+               break;
+            }
+         }
          
          ManagedComponent mc = md.getComponent("ProfileServiceNestedTestDS");
          assertNotNull(mc);
@@ -109,16 +133,27 @@
          
          mgtView.updateComponent(mc);
          mgtView.process();
+       
+         // See if the changes are reflected in the managedView after a reload
+         mgtView = getManagementView();
+
+         ManagedComponent comp2 = getManagedComponent(mgtView, "ChangedNestedDsJNDIName");
+         assertNotNull(comp2);
          
+         ManagedComponent comp3 = getManagedComponent(mgtView, "ProfileServiceNestedTestDS");
+         assertNull(comp3);
+
       }
       catch(Exception e)
       {
          log.error(e);
+         undeployPackage(new String[] { deploymentName });
          throw e;
       }
       finally
       {
-         undeployPackage(new String[] { deploymentName });
+         // Do not undeploy deployment, if everything went ok
+         // undeployPackage(new String[] { deploymentName });
       }
    }
    

Added: trunk/testsuite/src/resources/profileservice/override/profileservice-datasource.ear/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/profileservice/override/profileservice-datasource.ear/META-INF/application.xml	                        (rev 0)
+++ trunk/testsuite/src/resources/profileservice/override/profileservice-datasource.ear/META-INF/application.xml	2008-10-24 17:05:32 UTC (rev 80059)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" 
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+    http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
+    <description>ProfileService ear deployment test</description>
+    <display-name>another testEarDeployment</display-name>
+
+    <module>
+        <web>
+            <web-uri>testWarDeployment.war</web-uri>
+            <context-root>/testWarDeployment-ear</context-root>
+        </web>
+    </module>
+</application>