[jboss-cvs] JBossAS SVN: r81172 - in trunk/testsuite/src: main/org/jboss/test/profileservice/override/test and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 17 11:41:31 EST 2008
Author: emuckenhuber
Date: 2008-11-17 11:41:31 -0500 (Mon, 17 Nov 2008)
New Revision: 81172
Added:
trunk/testsuite/src/resources/profileservice/override/profileservice-datasource.ear/test-second-ds.xml
Modified:
trunk/testsuite/src/main/org/jboss/test/profileservice/override/restart/test/PersistedDataSourceUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/ProfileServiceOverrideTestCase.java
trunk/testsuite/src/resources/profileservice/override/profileservice-datasource.ear/META-INF/jboss-app.xml
Log:
[JBAS-6036] additional tests, that persisted changes are not lost when updating a different component
Modified: 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 2008-11-17 16:41:28 UTC (rev 81171)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/override/restart/test/PersistedDataSourceUnitTestCase.java 2008-11-17 16:41:31 UTC (rev 81172)
@@ -24,12 +24,14 @@
import org.jboss.deployers.spi.management.ManagementView;
import org.jboss.managed.api.ManagedComponent;
import org.jboss.managed.api.ManagedDeployment;
+import org.jboss.managed.api.ManagedProperty;
import org.jboss.managed.api.ManagedDeployment.DeploymentPhase;
+import org.jboss.metatype.api.values.SimpleValueSupport;
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.
+ * were persisted and restored correctly after restarting AS.
*
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
@@ -61,6 +63,9 @@
ManagedComponent mc = md.getComponent("ChangedDsJNDIName");
assertNotNull(mc);
+ ManagedProperty property = mc.getProperty("prepared-statement-cache-size");
+ assertEquals("prepared-statement-cache-size: "+ property.getValue(), SimpleValueSupport.wrap(34), property.getValue());
+
// This should work too
ManagedComponent comp = getManagedComponent(mgtView, "ChangedDsJNDIName");
assertNotNull(comp);
@@ -87,14 +92,16 @@
{
// deployPackage(deploymentName);
ManagementView mgtView = getManagementView();
- ManagedDeployment md = mgtView.getDeployment(deploymentName, DeploymentPhase.APPLICATION);
- assertNotNull(md);
+ ManagedDeployment deployment = mgtView.getDeployment(deploymentName, DeploymentPhase.APPLICATION);
+ assertNotNull(deployment);
- assertNotNull(md.getChildren());
- assertFalse(md.getChildren().isEmpty());
+ assertNotNull(deployment.getChildren());
+ assertFalse(deployment.getChildren().isEmpty());
+ // Check first dataSource
// get test-ds.xml child
- for(ManagedDeployment d : md.getChildren())
+ ManagedDeployment md = null;
+ for(ManagedDeployment d : deployment.getChildren())
{
if(d.getName().endsWith("test-ds.xml"))
{
@@ -102,9 +109,12 @@
break;
}
}
+ assertNotNull(md);
ManagedComponent mc = md.getComponent("ChangedNestedDsJNDIName");
- assertNotNull(mc);
+ assertNotNull("test-ds.xml", mc);
+ ManagedProperty property = mc.getProperty("prepared-statement-cache-size");
+ assertEquals("prepared-statement-cache-size: "+ property.getValue(), SimpleValueSupport.wrap(34), property.getValue());
// This should work too
ManagedComponent comp = getManagedComponent(mgtView, "ChangedNestedDsJNDIName");
@@ -113,6 +123,28 @@
ManagedComponent comp3 = getManagedComponent(mgtView, "ProfileServiceNestedTestDS");
assertNull(comp3);
+ // Check 2nd dataSource
+ md = null;
+ for(ManagedDeployment d : deployment.getChildren())
+ {
+ if(d.getName().endsWith("test-second-ds.xml"))
+ {
+ md = d;
+ break;
+ }
+ }
+ assertNotNull(md);
+
+ mc = md.getComponent("OtherNestedTestDS");
+ assertNotNull("test-second-ds.xml", mc);
+
+ // prepared-statement-cache-size
+ property = mc.getProperty("prepared-statement-cache-size");
+ assertEquals(property.getValue(), SimpleValueSupport.wrap(33));
+ // max-pool-size
+ property = mc.getProperty("max-pool-size");
+ assertEquals(property.getValue(), SimpleValueSupport.wrap(19));
+
}
catch(Exception e)
{
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-11-17 16:41:28 UTC (rev 81171)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/ProfileServiceOverrideTestCase.java 2008-11-17 16:41:31 UTC (rev 81172)
@@ -66,9 +66,20 @@
ManagedComponent comp = getManagedComponent(mgtView, "ProfileServiceTestDS");
assertNotNull(comp);
- ManagedProperty p = mc.getProperty("jndi-name");
- p.setValue(SimpleValueSupport.wrap("ChangedDsJNDIName"));
+ ManagedProperty jndiName = mc.getProperty("jndi-name");
+ // assert
+ assertEquals(jndiName.getValue(), SimpleValueSupport.wrap("ProfileServiceTestDS"));
+ // change value
+ jndiName.setValue(SimpleValueSupport.wrap("ChangedDsJNDIName"));
+
+ ManagedProperty property = mc.getProperty("prepared-statement-cache-size");
+ // assert
+ assertEquals("prepared-statement-cache-size: "+ property.getValue(), SimpleValueSupport.wrap(32), property.getValue());
+ // change value
+ property.setValue(SimpleValueSupport.wrap(34));
+
+ // update component
mgtView.updateComponent(mc);
mgtView.process();
@@ -82,6 +93,9 @@
ManagedComponent mc2 = md2.getComponent("ChangedDsJNDIName");
assertNotNull(mc2);
+ ManagedProperty changedProperty = mc2.getProperty("prepared-statement-cache-size");
+ assertEquals(changedProperty.getValue(), SimpleValueSupport.wrap(34));
+
mc2 = md2.getComponent("ProfileServiceTestDS");
assertNull(mc2);
@@ -108,14 +122,16 @@
{
deployPackage(deploymentName);
ManagementView mgtView = getManagementView();
- ManagedDeployment md = mgtView.getDeployment(deploymentName, DeploymentPhase.APPLICATION);
- assertNotNull(md);
+ ManagedDeployment deployment = mgtView.getDeployment(deploymentName, DeploymentPhase.APPLICATION);
+ assertNotNull(deployment);
- assertNotNull(md.getChildren());
- assertFalse(md.getChildren().isEmpty());
-
+ assertNotNull(deployment.getChildren());
+ assertFalse(deployment.getChildren().isEmpty());
+
+ // Update first DataSource
// get test-ds.xml child
- for(ManagedDeployment d : md.getChildren())
+ ManagedDeployment md = null;
+ for(ManagedDeployment d : deployment.getChildren())
{
if(d.getName().endsWith("test-ds.xml"))
{
@@ -123,6 +139,7 @@
break;
}
}
+ assertNotNull(md);
ManagedComponent mc = md.getComponent("ProfileServiceNestedTestDS");
assertNotNull(mc);
@@ -134,8 +151,48 @@
ManagedProperty p = mc.getProperty("jndi-name");
p.setValue(SimpleValueSupport.wrap("ChangedNestedDsJNDIName"));
+ // Update prepared-statement-cache-size
+ ManagedProperty property = mc.getProperty("prepared-statement-cache-size");
+ // assert
+ assertEquals("prepared-statement-cache-size: "+ property.getValue(), SimpleValueSupport.wrap(32), property.getValue());
+ // change value
+ property.setValue(SimpleValueSupport.wrap(34));
+
+ // updateComponent and process()
mgtView.updateComponent(mc);
mgtView.process();
+
+ //
+ // Update 2nd DataSource
+ md = null;
+ for(ManagedDeployment d : deployment.getChildren())
+ {
+ if(d.getName().endsWith("test-second-ds.xml"))
+ {
+ md = d;
+ break;
+ }
+ }
+ assertNotNull(md);
+ mc = md.getComponent("OtherNestedTestDS");
+
+ // prepared-statement-cache-size
+ property = mc.getProperty("prepared-statement-cache-size");
+ // assert
+ assertEquals(property.getValue(), SimpleValueSupport.wrap(12));
+ // change
+ property.setValue(SimpleValueSupport.wrap(33));
+
+ // max-pool-size
+ property = mc.getProperty("max-pool-size");
+ // assert
+ assertEquals(property.getValue(), SimpleValueSupport.wrap(22));
+ // change
+ property.setValue(SimpleValueSupport.wrap(19));
+
+ // updateComponent and process()
+ mgtView.updateComponent(mc);
+ mgtView.process();
// See if the changes are reflected in the managedView after a reload
mgtView = getManagementView();
Modified: trunk/testsuite/src/resources/profileservice/override/profileservice-datasource.ear/META-INF/jboss-app.xml
===================================================================
--- trunk/testsuite/src/resources/profileservice/override/profileservice-datasource.ear/META-INF/jboss-app.xml 2008-11-17 16:41:28 UTC (rev 81171)
+++ trunk/testsuite/src/resources/profileservice/override/profileservice-datasource.ear/META-INF/jboss-app.xml 2008-11-17 16:41:31 UTC (rev 81172)
@@ -6,5 +6,6 @@
<jboss-app>
<module><service>test-ds.xml</service></module>
+ <module><service>test-second-ds.xml</service></module>
</jboss-app>
\ No newline at end of file
Added: trunk/testsuite/src/resources/profileservice/override/profileservice-datasource.ear/test-second-ds.xml
===================================================================
--- trunk/testsuite/src/resources/profileservice/override/profileservice-datasource.ear/test-second-ds.xml (rev 0)
+++ trunk/testsuite/src/resources/profileservice/override/profileservice-datasource.ear/test-second-ds.xml 2008-11-17 16:41:31 UTC (rev 81172)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>OtherNestedTestDS</jndi-name>
+ <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}localDB</connection-url>
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+ <user-name>sa</user-name>
+ <password></password>
+ <min-pool-size>2</min-pool-size>
+ <max-pool-size>22</max-pool-size>
+ <idle-timeout-minutes>0</idle-timeout-minutes>
+ <security-domain>HsqlDbRealm</security-domain>
+ <prepared-statement-cache-size>12</prepared-statement-cache-size>
+ <metadata>
+ <type-mapping>Hypersonic SQL</type-mapping>
+ </metadata>
+ </local-tx-datasource>
+
+
+ <mbean code="org.jboss.jdbc.HypersonicDatabase"
+ name="jboss:service=Hypersonic,database=otherProfileserviceTestDB">
+ <attribute name="Database">otherProfileserviceTestDB</attribute>
+ <attribute name="InProcessMode">true</attribute>
+ </mbean>
+
+</datasources>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list