[jboss-cvs] JBossAS SVN: r88573 - branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat May 9 09:21:17 EDT 2009
Author: emuckenhuber
Date: 2009-05-09 09:21:17 -0400 (Sat, 09 May 2009)
New Revision: 88573
Modified:
branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/AbstractPersistenceFormatTest.java
branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/ArrayValueUnitTestCase.java
branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/BasicPersistenceFormatUnitTestCase.java
branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/CollectionValueUnitTestCase.java
branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/MapCompositeUnitTestCase.java
branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/ObjectNameUnitTestCase.java
branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/TableValueUnitTestCase.java
Log:
update the basic persistence test cases.
Modified: branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/AbstractPersistenceFormatTest.java
===================================================================
--- branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/AbstractPersistenceFormatTest.java 2009-05-09 13:04:27 UTC (rev 88572)
+++ branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/AbstractPersistenceFormatTest.java 2009-05-09 13:21:17 UTC (rev 88573)
@@ -30,7 +30,10 @@
import org.jboss.managed.api.factory.ManagedObjectFactory;
import org.jboss.metatype.api.types.MetaTypeFactory;
import org.jboss.metatype.api.values.MetaValueFactory;
-import org.jboss.system.server.profileservice.persistence.ManagedObjectPeristenceHandler;
+import org.jboss.system.server.profileservice.persistence.DelegatingPersistencePlugin;
+import org.jboss.system.server.profileservice.persistence.DelegatingRecreationPlugin;
+import org.jboss.system.server.profileservice.persistence.ManagedObjectPersistencePlugin;
+import org.jboss.system.server.profileservice.persistence.ManagedObjectRecreationPlugin;
import org.jboss.system.server.profileservice.persistence.xml.PersistedManagedObject;
import org.jboss.test.BaseTestCase;
import org.jboss.xb.binding.Unmarshaller;
@@ -87,16 +90,13 @@
protected PersistedManagedObject restore(ManagedObject mo) throws Exception
{
- ManagedObjectPeristenceHandler persistence = new ManagedObjectPeristenceHandler();
- return restore(mo, persistence);
+ DelegatingPersistencePlugin plugin = new DelegatingPersistencePlugin();
+ return restore(mo, plugin);
}
- protected PersistedManagedObject restore(ManagedObject mo, ManagedObjectPeristenceHandler persistence) throws Exception
+ protected PersistedManagedObject restore(ManagedObject mo, ManagedObjectPersistencePlugin plugin) throws Exception
{
- PersistedManagedObject moElement = new PersistedManagedObject();
-
- // Process
- persistence.processManagedObject(moElement, mo);
+ PersistedManagedObject moElement = plugin.createPersistedManagedObject(mo);
File file = File.createTempFile("test", null);
serialize(moElement, file);
@@ -117,5 +117,22 @@
Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
return (PersistedManagedObject) unmarshaller.unmarshal(file.toURL().openStream(), resolver);
}
+
+ protected ManagedObject update(Object attachment, PersistedManagedObject moElement)
+ {
+ ManagedObject mo = getMOF().initManagedObject(attachment, null);
+ return update(mo, moElement);
+ }
+
+ protected ManagedObject update(ManagedObject mo, PersistedManagedObject moElement)
+ {
+ DelegatingRecreationPlugin plugin = new DelegatingRecreationPlugin();
+ return update(plugin, mo, moElement);
+ }
+
+ protected ManagedObject update(ManagedObjectRecreationPlugin plugin, ManagedObject mo, PersistedManagedObject moElement)
+ {
+ return plugin.createManagedObject(moElement, mo);
+ }
}
Modified: branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/ArrayValueUnitTestCase.java
===================================================================
--- branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/ArrayValueUnitTestCase.java 2009-05-09 13:04:27 UTC (rev 88572)
+++ branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/ArrayValueUnitTestCase.java 2009-05-09 13:21:17 UTC (rev 88573)
@@ -25,7 +25,6 @@
import org.jboss.managed.api.ManagedObject;
import org.jboss.metatype.api.values.ArrayValue;
-import org.jboss.system.server.profileservice.persistence.ManagedGenericOverrideHandler;
import org.jboss.system.server.profileservice.persistence.xml.PersistedManagedObject;
import org.jboss.test.server.profileservice.persistence.support.SimpleArrayMetaData;
@@ -49,10 +48,8 @@
PersistedManagedObject moElement = restore(mo);
assertNotNull(moElement);
+ ManagedObject restored = update(new SimpleArrayMetaData(), moElement);
- ManagedGenericOverrideHandler handler = new ManagedGenericOverrideHandler();
- ManagedObject restored = handler.update(new SimpleArrayMetaData(), moElement);
-
assertNotNull(restored.getProperties());
assertEquals(3, restored.getProperties().size());
Modified: branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/BasicPersistenceFormatUnitTestCase.java
===================================================================
--- branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/BasicPersistenceFormatUnitTestCase.java 2009-05-09 13:04:27 UTC (rev 88572)
+++ branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/BasicPersistenceFormatUnitTestCase.java 2009-05-09 13:21:17 UTC (rev 88573)
@@ -36,7 +36,6 @@
import org.jboss.metatype.api.values.MetaValue;
import org.jboss.metatype.api.values.SimpleValue;
import org.jboss.metatype.api.values.SimpleValueSupport;
-import org.jboss.system.server.profileservice.persistence.ManagedGenericOverrideHandler;
import org.jboss.system.server.profileservice.persistence.xml.PersistedManagedObject;
import org.jboss.test.server.profileservice.persistence.support.PrimitiveMetaData;
import org.jboss.test.server.profileservice.persistence.support.TestMetaData;
@@ -50,7 +49,6 @@
public BasicPersistenceFormatUnitTestCase(String name)
{
- // FIXME SimplePersistenceFormatUnitTestCase constructor
super(name);
}
public void testPrimitive() throws Throwable
@@ -72,8 +70,7 @@
PersistedManagedObject restored = restore(mo);
assertNotNull(restored);
- ManagedGenericOverrideHandler handler = new ManagedGenericOverrideHandler();
- mo = handler.update(createPrimitive(), restored);
+ mo = update(new PrimitiveMetaData(), restored);
assertEquals("newName", getMVF().unwrap(mo.getProperty("name").getValue()));
SimpleValue integer = (SimpleValue) mo.getProperty("integer").getValue();
@@ -112,9 +109,8 @@
PersistedManagedObject restored = restore(mo);
assertNotNull(restored);
- // Create again
- ManagedGenericOverrideHandler handler = new ManagedGenericOverrideHandler();
- mo = handler.update(createTestMetaData(), restored);
+ // Create empty
+ mo = update(new TestMetaData(), restored);
p = mo.getProperty("primitive");
nested = (CompositeValue) p.getValue();
@@ -148,8 +144,7 @@
PersistedManagedObject restored = restore(mo);
assertNotNull(restored);
- ManagedGenericOverrideHandler handler = new ManagedGenericOverrideHandler();
- mo = handler.update(createTestMetaData(), restored);
+ mo = update(new TestMetaData(), restored);
p = mo.getProperty("testMap");
assertNotNull(p);
@@ -180,8 +175,7 @@
assertNotNull(restored);
//
- ManagedGenericOverrideHandler handler = new ManagedGenericOverrideHandler();
- mo = handler.update(createTestMetaData(), restored);
+ mo = update(new TestMetaData(), restored);
p = mo.getProperty("charArray");
assertNotNull(p);
Modified: branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/CollectionValueUnitTestCase.java
===================================================================
--- branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/CollectionValueUnitTestCase.java 2009-05-09 13:04:27 UTC (rev 88572)
+++ branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/CollectionValueUnitTestCase.java 2009-05-09 13:21:17 UTC (rev 88573)
@@ -25,7 +25,6 @@
import java.util.List;
import org.jboss.managed.api.ManagedObject;
-import org.jboss.system.server.profileservice.persistence.ManagedGenericOverrideHandler;
import org.jboss.system.server.profileservice.persistence.xml.PersistedManagedObject;
import org.jboss.test.server.profileservice.persistence.support.CollectionMetaData;
@@ -47,8 +46,7 @@
PersistedManagedObject moElement = restore(mo);
assertNotNull(moElement);
- ManagedGenericOverrideHandler handler = new ManagedGenericOverrideHandler();
- ManagedObject restored = handler.update(createMetaData(), moElement);
+ ManagedObject restored = update(new CollectionMetaData(), moElement);
assertNotNull(restored);
Modified: branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/MapCompositeUnitTestCase.java
===================================================================
--- branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/MapCompositeUnitTestCase.java 2009-05-09 13:04:27 UTC (rev 88572)
+++ branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/MapCompositeUnitTestCase.java 2009-05-09 13:21:17 UTC (rev 88573)
@@ -27,7 +27,6 @@
import org.jboss.managed.api.ManagedObject;
import org.jboss.managed.api.ManagedProperty;
import org.jboss.metatype.api.values.MapCompositeValueSupport;
-import org.jboss.system.server.profileservice.persistence.ManagedGenericOverrideHandler;
import org.jboss.system.server.profileservice.persistence.xml.PersistedManagedObject;
import org.jboss.test.server.profileservice.persistence.support.SimpleStringMapMetaData;
@@ -58,9 +57,10 @@
PersistedManagedObject moElement = restore(mo);
assertNotNull(moElement);
- ManagedGenericOverrideHandler handler = new ManagedGenericOverrideHandler();
- ManagedObject restored = handler.update(createTestMetaData(), moElement);
+ ManagedObject restored = update(new SimpleStringMapMetaData(), moElement);
assertNotNull(restored);
+ SimpleStringMapMetaData metadata = (SimpleStringMapMetaData) restored.getAttachment();
+ assertTrue(metadata.getMap().equals(initMap()));
}
protected SimpleStringMapMetaData createTestMetaData()
Modified: branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/ObjectNameUnitTestCase.java
===================================================================
--- branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/ObjectNameUnitTestCase.java 2009-05-09 13:04:27 UTC (rev 88572)
+++ branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/ObjectNameUnitTestCase.java 2009-05-09 13:21:17 UTC (rev 88573)
@@ -26,7 +26,7 @@
import org.jboss.managed.api.ManagedObject;
import org.jboss.managed.api.ManagedProperty;
import org.jboss.metatype.api.values.CompositeValue;
-import org.jboss.system.server.profileservice.persistence.ManagedGenericOverrideHandler;
+import org.jboss.metatype.api.values.PropertiesMetaValue;
import org.jboss.system.server.profileservice.persistence.xml.PersistedCompositeValue;
import org.jboss.system.server.profileservice.persistence.xml.PersistedManagedObject;
import org.jboss.system.server.profileservice.persistence.xml.PersistedPropertiesValue;
@@ -54,6 +54,8 @@
ManagedProperty p = mo.getProperty("name");
CompositeValue c = (CompositeValue) p.getValue();
assertNotNull(c);
+ PropertiesMetaValue properties = (PropertiesMetaValue) c.get("keyPropertyList");
+ properties.put("v", "value5");
// Assert xml information
PersistedManagedObject restoredElement = restore(mo);
@@ -81,9 +83,10 @@
assertTrue(po.getValue() instanceof PersistedSimpleValue);
//
- ManagedGenericOverrideHandler handler = new ManagedGenericOverrideHandler();
- ManagedObject restored = handler.update(createMD(), restoredElement);
+ ManagedObject restored = update(new ObjectNameMetaData(), restoredElement);
assertNotNull(restored);
+ ObjectNameMetaData metaData = (ObjectNameMetaData) restored.getAttachment();
+ assertEquals(createObjectName("value5"), metaData.getName());
}
Modified: branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/TableValueUnitTestCase.java
===================================================================
--- branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/TableValueUnitTestCase.java 2009-05-09 13:04:27 UTC (rev 88572)
+++ branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/TableValueUnitTestCase.java 2009-05-09 13:21:17 UTC (rev 88573)
@@ -33,7 +33,6 @@
import org.jboss.metatype.api.values.SimpleValue;
import org.jboss.metatype.api.values.SimpleValueSupport;
import org.jboss.metatype.api.values.TableValue;
-import org.jboss.system.server.profileservice.persistence.ManagedGenericOverrideHandler;
import org.jboss.system.server.profileservice.persistence.xml.PersistedManagedObject;
import org.jboss.test.server.profileservice.persistence.support.SimpleTableMetaData;
@@ -63,8 +62,7 @@
assertNotNull(moElement.getProperties());
// Recreate MO
- ManagedGenericOverrideHandler handler = new ManagedGenericOverrideHandler();
- ManagedObject restored = handler.update(createTestMetaData(), moElement);
+ ManagedObject restored = update(new SimpleTableMetaData(), moElement);
// Assert
ManagedProperty p = restored.getProperty("map");
@@ -75,6 +73,9 @@
assertRow(table, 1, "one");
assertRow(table, 2, "two");
assertRow(table, 3, "three");
+
+ SimpleTableMetaData metaData = (SimpleTableMetaData) restored.getAttachment();
+ assertTrue(metaData.getMap().equals(initMap()));
}
protected void assertRow(TableValue table, Serializable key, Serializable value)
More information about the jboss-cvs-commits
mailing list