[jboss-cvs] JBossAS SVN: r80143 - in trunk/testsuite: src/main/org/jboss/test/profileservice/override and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 28 08:58:40 EDT 2008
Author: emuckenhuber
Date: 2008-10-28 08:58:40 -0400 (Tue, 28 Oct 2008)
New Revision: 80143
Added:
trunk/testsuite/src/main/org/jboss/test/profileservice/override/restart/
trunk/testsuite/src/main/org/jboss/test/profileservice/override/restart/test/
trunk/testsuite/src/main/org/jboss/test/profileservice/override/restart/test/PersistedDataSourceUnitTestCase.java
Modified:
trunk/testsuite/build.xml
trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/AbstractProfileServiceTest.java
trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/ProfileServiceOverrideTestCase.java
Log:
[JBAS-6036] add test to validate persisted changes to a managed component after restarting AS (although this is still disabled for now)
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2008-10-28 12:48:02 UTC (rev 80142)
+++ trunk/testsuite/build.xml 2008-10-28 12:58:40 UTC (rev 80143)
@@ -837,7 +837,12 @@
<include name="org/jboss/test/deployers/web/test/*UnitTestCase.class"/>
<include name="org/jboss/test/deployers/jbas2904/test/*UnitTestCase.class"/>
<include name="org/jboss/test/deployers/seam/test/*UnitTestCase.class"/>
+ <include name="org/jboss/test/profileservice/override/test/*TestCase.class"/>
</patternset>
+ <patternset id="profileservice.restart.includes">
+ <!-- include target for persisted admin changes -->
+ <include name="org/jboss/test/profileservice/override/restart/test/*TestCase.class"/>
+ </patternset>
<patternset id="profileservice.excludes">
<exclude name="org/jboss/test/profileservice/test/*TestCase.class"/>
<!-- deployers + seam -->
@@ -1029,6 +1034,15 @@
junit.configuration="profileservice"
/>
<server:stop name="profileservice"/>
+ <!-- TODO enable this tests. -->
+ <!-- test profileservice persistence, after restarting AS
+ <server:start name="profileservice"/>
+ <run-junit
+ junit.patternset="profileservice.restart.includes"
+ junit.configuration="profileservice"
+ />
+ <server:stop name="profileservice"/>
+ -->
</target>
<target name="profileservice-config" description="Create the full featured profile service config">
<create-profileservice-config baseconf="default" conf="profileservice"/>
Added: trunk/testsuite/src/main/org/jboss/test/profileservice/override/restart/test/PersistedDataSourceUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/override/restart/test/PersistedDataSourceUnitTestCase.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/override/restart/test/PersistedDataSourceUnitTestCase.java 2008-10-28 12:58:40 UTC (rev 80143)
@@ -0,0 +1,135 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.profileservice.override.restart.test;
+
+import org.jboss.deployers.spi.management.ManagementView;
+import org.jboss.managed.api.ManagedComponent;
+import org.jboss.managed.api.ManagedDeployment;
+import org.jboss.managed.api.ManagedDeployment.DeploymentPhase;
+import org.jboss.test.profileservice.override.test.AbstractProfileServiceTest;
+
+/**
+ * Test if the changes to the ManagedComponent from the ProfileServiceOverrideTestCase
+ * were persisted and restored corretly after restarting AS.
+ *
+ * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
+ * @version $Revision$
+ */
+public class PersistedDataSourceUnitTestCase extends AbstractProfileServiceTest
+{
+
+ /** The profile name */
+ private static final String PROFILENAME = "profileservice";
+
+ public PersistedDataSourceUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ public void testDS() throws Exception
+ {
+ String deploymentName = "profileservice-test-ds.xml";
+
+ try
+ {
+ // No deployment after restart
+// deployPackage(deploymentName);
+
+ ManagementView mgtView = getManagementView();
+ ManagedDeployment md = mgtView.getDeployment(deploymentName, DeploymentPhase.APPLICATION);
+ assertNotNull(md);
+
+ ManagedComponent mc = md.getComponent("ChangedDsJNDIName");
+ assertNotNull(mc);
+
+ // This should work too
+ ManagedComponent comp = getManagedComponent(mgtView, "ChangedDsJNDIName");
+ assertNotNull(comp);
+
+ ManagedComponent mc2 = getManagedComponent(mgtView, "ProfileServiceTestDS");
+ assertNull(mc2);
+
+ }
+ catch(Exception e)
+ {
+ log.error(e);
+ throw e;
+ }
+ finally
+ {
+ undeployPackage(new String[] { deploymentName });
+ }
+ }
+
+ public void testNestedDS() throws Exception
+ {
+ String deploymentName = "profileservice-datasource.ear";
+ try
+ {
+// deployPackage(deploymentName);
+ ManagementView mgtView = getManagementView();
+ ManagedDeployment md = mgtView.getDeployment(deploymentName, DeploymentPhase.APPLICATION);
+ assertNotNull(md);
+
+ assertNotNull(md.getChildren());
+ assertFalse(md.getChildren().isEmpty());
+
+ // get test-ds.xml child
+ for(ManagedDeployment d : md.getChildren())
+ {
+ if(d.getName().endsWith("test-ds.xml"))
+ {
+ md = d;
+ break;
+ }
+ }
+
+ ManagedComponent mc = md.getComponent("ChangedNestedDsJNDIName");
+ assertNotNull(mc);
+
+ // This should work too
+ ManagedComponent comp = getManagedComponent(mgtView, "ChangedNestedDsJNDIName");
+ assertNotNull(comp);
+
+ ManagedComponent comp3 = getManagedComponent(mgtView, "ProfileServiceNestedTestDS");
+ assertNull(comp3);
+
+ }
+ catch(Exception e)
+ {
+ log.error(e);
+ throw e;
+ }
+ finally
+ {
+ undeployPackage(new String[] { deploymentName });
+ }
+ }
+
+ @Override
+ protected String getProfileName()
+ {
+ return PROFILENAME;
+ }
+
+}
+
Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/AbstractProfileServiceTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/AbstractProfileServiceTest.java 2008-10-28 12:48:02 UTC (rev 80142)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/AbstractProfileServiceTest.java 2008-10-28 12:58:40 UTC (rev 80143)
@@ -32,6 +32,8 @@
import org.jboss.deployers.spi.management.deploy.DeploymentStatus;
import org.jboss.deployers.spi.management.deploy.ProgressEvent;
import org.jboss.deployers.spi.management.deploy.ProgressListener;
+import org.jboss.managed.api.ComponentType;
+import org.jboss.managed.api.ManagedComponent;
import org.jboss.managed.api.ManagedDeployment.DeploymentPhase;
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.ProfileService;
@@ -59,6 +61,13 @@
getLog().debug(eventInfo);
}
+ protected ManagedComponent getManagedComponent(ManagementView mgtView, String name) throws Exception
+ {
+ ComponentType type = new ComponentType("DataSource", "LocalTx");
+ ManagedComponent ds = mgtView.getComponent(name, type);
+ return ds;
+ }
+
protected String[] deployPackage(String name) throws Exception
{
DeploymentManager deployMgr = getDeploymentManager();
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-28 12:48:02 UTC (rev 80142)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/ProfileServiceOverrideTestCase.java 2008-10-28 12:58:40 UTC (rev 80143)
@@ -22,7 +22,6 @@
package org.jboss.test.profileservice.override.test;
import org.jboss.deployers.spi.management.ManagementView;
-import org.jboss.managed.api.ComponentType;
import org.jboss.managed.api.ManagedComponent;
import org.jboss.managed.api.ManagedDeployment;
import org.jboss.managed.api.ManagedProperty;
@@ -30,6 +29,10 @@
import org.jboss.metatype.api.values.SimpleValueSupport;
/**
+ * Update a DS managed component without undeploying it.
+ * The {@see PersistedDataSourceUnitTestCase} will test if the changes were restored
+ * correctly after restarting AS.
+ *
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
@@ -156,13 +159,6 @@
// undeployPackage(new String[] { deploymentName });
}
}
-
- private ManagedComponent getManagedComponent(ManagementView mgtView, String name) throws Exception
- {
- ComponentType type = new ComponentType("DataSource", "LocalTx");
- ManagedComponent ds = mgtView.getComponent(name, type);
- return ds;
- }
@Override
protected String getProfileName()
More information about the jboss-cvs-commits
mailing list