[jboss-cvs] JBossAS SVN: r85221 - trunk/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test.

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

Author: emuckenhuber
Date: 2009-03-04 09:27:15 -0500 (Wed, 04 Mar 2009)
New Revision: 85221

Modified:
   trunk/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/JMSDestinationPersistenceFormatTestCase.java
   trunk/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/LocalDataSourcePersistenceFormatTestCase.java
Log:
update persistence tests.

Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/JMSDestinationPersistenceFormatTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/JMSDestinationPersistenceFormatTestCase.java	2009-03-04 14:23:43 UTC (rev 85220)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/JMSDestinationPersistenceFormatTestCase.java	2009-03-04 14:27:15 UTC (rev 85221)
@@ -38,7 +38,7 @@
 import org.jboss.system.metadata.ServiceMetaData;
 import org.jboss.system.metadata.ServiceMetaDataParser;
 import org.jboss.system.metadata.ServiceTextValueMetaData;
-import org.jboss.system.server.profileservice.persistence.ManagedObjectOverrideHandler;
+import org.jboss.system.server.profileservice.persistence.ManagedGenericOverrideHandler;
 import org.jboss.system.server.profileservice.persistence.xml.PersistedManagedObject;
 import org.w3c.dom.Document;
 
@@ -62,17 +62,17 @@
       enableTrace("org.jboss.system");      
    }
    
-   public void testTopic() throws Exception
+   public void testTopic() throws Throwable
    {
       doTestMerge("profileservice/override/testTopic-service.xml");
    }
    
-   public void testQueue() throws Exception
+   public void testQueue() throws Throwable
    {
       doTestMerge("profileservice/override/testQueue-service.xml");
    }
    
-   protected void doTestMerge(String xmlName) throws Exception
+   protected void doTestMerge(String xmlName) throws Throwable
    {
       // Set the ICF
       getMOF().addInstanceClassFactory(new ServiceMetaDataICF());
@@ -84,10 +84,9 @@
       getProperty(deploymentMO, "downCacheSize").setValue(SimpleValueSupport.wrap(123456));
       
       PersistedManagedObject moElement = restore(deploymentMO);
-      ManagedObjectOverrideHandler override = new ManagedObjectOverrideHandler();
       
-      //
-      ManagedObject restored = override.updateManagedObject(moElement, deploymentMO);
+      ManagedGenericOverrideHandler handler = new ManagedGenericOverrideHandler();
+      ManagedObject restored = handler.update(parseJbossServiceXml(xmlName), moElement);
       
       // assert
       assertEquals(SimpleValueSupport.wrap(123456), getProperty(restored, "downCacheSize").getValue());

Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/LocalDataSourcePersistenceFormatTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/LocalDataSourcePersistenceFormatTestCase.java	2009-03-04 14:23:43 UTC (rev 85220)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/LocalDataSourcePersistenceFormatTestCase.java	2009-03-04 14:27:15 UTC (rev 85221)
@@ -39,7 +39,7 @@
 import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentMetaData;
 import org.jboss.system.deployers.managed.ServiceMetaDataICF;
 import org.jboss.system.metadata.ServiceMetaData;
-import org.jboss.system.server.profileservice.persistence.ManagedObjectOverrideHandler;
+import org.jboss.system.server.profileservice.persistence.ManagedGenericOverrideHandler;
 import org.jboss.system.server.profileservice.persistence.xml.PersistedManagedObject;
 import org.jboss.util.xml.JBossEntityResolver;
 import org.xml.sax.InputSource;
@@ -60,11 +60,11 @@
       super(name);
    }
    
-   public void testProfileServiceTestDS() throws Exception
+   public void testProfileServiceTestDS() throws Throwable
    {
       getMOF().addInstanceClassFactory(new LocalDSInstanceClassFactory());
       // FIXME
-//      getMOF().addInstanceClassFactory(new ServiceMetaDataICF());
+      getMOF().addInstanceClassFactory(new ServiceMetaDataICF());
 
       // Initial parsing of the dataSource deployment
       ManagedConnectionFactoryDeploymentGroup deployment = parseDataSource("profileservice/persistence/profileservice-test-ds.xml");
@@ -81,10 +81,16 @@
 
       enableTrace("org.jboss.system");
 
-      ManagedObjectOverrideHandler override = new ManagedObjectOverrideHandler();
-      ManagedObject restored = override.updateManagedObject(moelement, mo);
+      // Recreate
+      deployment = parseDataSource("profileservice/persistence/profileservice-test-ds.xml");
+      ManagedGenericOverrideHandler handler = new ManagedGenericOverrideHandler();
+      ManagedObject restored = handler.update(deployment, moelement);
       assertNotNull(restored);
 
+      assertEquals(SimpleValueSupport.wrap(13), getManagedProperty(mo, "min-pool-size").getValue());
+      assertEquals(SimpleValueSupport.wrap(53), getManagedProperty(mo, "max-pool-size").getValue());
+      
+      
       ManagedConnectionFactoryDeploymentGroup mcfdg = (ManagedConnectionFactoryDeploymentGroup) restored.getAttachment();
       assertNotNull(mcfdg);
       // Assert services