[jboss-cvs] JBossAS SVN: r83858 - in trunk/testsuite/src/main/org/jboss/test/profileservice/persistenceformat: test and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 4 11:22:05 EST 2009
Author: emuckenhuber
Date: 2009-02-04 11:22:05 -0500 (Wed, 04 Feb 2009)
New Revision: 83858
Removed:
trunk/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/support/
trunk/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/SimplePersistenceFormatUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/TestNestedPeristenceFormatUnitTestCase.java
Log:
remove some not needed attachment persistence tests
Deleted: trunk/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/SimplePersistenceFormatUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/SimplePersistenceFormatUnitTestCase.java 2009-02-04 15:55:55 UTC (rev 83857)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/SimplePersistenceFormatUnitTestCase.java 2009-02-04 16:22:05 UTC (rev 83858)
@@ -1,316 +0,0 @@
-/*
- * 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.persistenceformat.test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.jboss.managed.api.ManagedObject;
-import org.jboss.managed.api.ManagedProperty;
-import org.jboss.metatype.api.types.SimpleMetaType;
-import org.jboss.metatype.api.values.CompositeValue;
-import org.jboss.metatype.api.values.CompositeValueSupport;
-import org.jboss.metatype.api.values.MapCompositeValueSupport;
-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.ManagedObjectPeristenceHandler;
-import org.jboss.system.server.profileservice.persistence.ManagedObjectUpdateHandler;
-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.PersistedProperty;
-import org.jboss.system.server.profileservice.repository.AbstractFileAttachmentsSerializer;
-import org.jboss.test.profileservice.persistenceformat.support.PrimitiveMetaData;
-import org.jboss.test.profileservice.persistenceformat.support.TestMetaData;
-
-/**
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-public class SimplePersistenceFormatUnitTestCase extends AbstractPersistenceFormatTest
-{
-
- public SimplePersistenceFormatUnitTestCase(String name)
- {
- super(name);
- }
-
- public void testPrimitive() throws Exception
- {
- // Create initial model
- ManagedObject mo = createPrimitiveMO();
- assertNotNull(mo);
-
- ManagedProperty p = mo.getProperty("name");
- assertNotNull(p);
- p.setValue(SimpleValueSupport.wrap("newName"));
-
- p = mo.getProperty("integer");
- p.setValue(SimpleValueSupport.wrap(111));
-
- mo.getProperty("optionalName").setValue(SimpleValueSupport.wrap("optional"));
-
- // Assert the restored information
- PersistedManagedObject restored = process(mo);
- assertNotNull(restored);
- assertFalse(restored.values().isEmpty());
- assertEquals(3, restored.values().size());
- PersistedProperty pp0 = restored.get("name");
- assertNotNull(pp0);
- assertNotNull(pp0.getValue());
-
-
- ManagedObjectUpdateHandler merger = new ManagedObjectUpdateHandler();
- // init again;
- mo = createPrimitiveMO();
-
- assertEquals("testName", getMVF().unwrap(mo.getProperty("name").getValue()));
-
- merger.processManagedObject(restored, mo);
-
- assertEquals("newName", getMVF().unwrap(mo.getProperty("name").getValue()));
- assertEquals(111, getMVF().unwrap(mo.getProperty("integer").getValue()));
- assertEquals("optional", ((SimpleValue) mo.getProperty("optionalName").getValue()).getValue());
-
- }
-
- public void testMetaDataPrimitive() throws Exception
- {
- ManagedObject mo = createTestMetaDataMO();
- assertNotNull(mo);
- ManagedProperty p = mo.getProperty("primitive");
- assertNotNull(p);
-
- CompositeValue nested = (CompositeValue) p.getValue();
- MetaValue name = nested.get("name");
- assertNotNull(name);
- MetaValue integer = nested.get("integer");
- assertNotNull(integer);
-
- // Change values
- Map<String, MetaValue> changedMap = new HashMap<String, MetaValue>();
- changedMap.put("name", new SimpleValueSupport(
- (SimpleMetaType) name.getMetaType(), "newName"));
- changedMap.put("integer", new SimpleValueSupport(
- (SimpleMetaType) integer.getMetaType(), 111));
-
- // Set new values
- p.setValue(
- new CompositeValueSupport(nested.getMetaType(), changedMap)
- );
-
- // Save and restore
- PersistedManagedObject restored = process(mo);
- assertNotNull(restored);
- assertFalse(restored.values().isEmpty());
- PersistedProperty pp0 = restored.get("primitive");
- assertNotNull(pp0);
- PersistedCompositeValue pp1 = (PersistedCompositeValue) pp0.getValue();
- assertNotNull(pp1);
- assertFalse(pp1.values().isEmpty());
-
- // Create again
- mo = createTestMetaDataMO();
-
-
- // Merge
- ManagedObjectUpdateHandler merger = new ManagedObjectUpdateHandler();
- merger.processManagedObject(restored, mo);
-
- p = mo.getProperty("primitive");
- nested = (CompositeValue) p.getValue();
- name = nested.get("name");
- assertNotNull(name);
- integer = nested.get("integer");
- assertNotNull(integer);
-
- //
- assertEquals(111, ((SimpleValue) integer).getValue());
- assertEquals("newName", ((SimpleValue) name).getValue());
- }
-
-// public void testMetaDataList() throws Exception
-// {
-//
-// ManagedObject mo = createTestMetaDataMO();
-// assertNotNull(mo);
-//
-// ManagedProperty p = mo.getProperty("list");
-// assertNotNull(p);
-//
-// CollectionValue cv = (CollectionValue) p.getValue();
-// assertNotNull(cv);
-//
-// // TODO merge list
-// fail("TODO merge list");
-// }
-
-
- public void testMetaDataMap() throws Exception
- {
- ManagedObject mo = createTestMetaDataMO();
- assertNotNull(mo);
-
- ManagedProperty p = mo.getProperty("testMap");
- assertNotNull(p);
-
- MapCompositeValueSupport composite = (MapCompositeValueSupport) p.getValue();
- assertNotNull(composite);
-
- SimpleValue v = (SimpleValue) composite.get("testString2");
- assertNotNull(v);
-
- composite.put("testString2", SimpleValueSupport.wrap("changedString"));
-
- PersistedManagedObject restored = process(mo);
- assertNotNull(restored);
-
- mo = createTestMetaDataMO();
-
- ManagedObjectUpdateHandler handler = new ManagedObjectUpdateHandler();
- handler.processManagedObject(restored, mo);
-
- p = mo.getProperty("testMap");
- assertNotNull(p);
-
- CompositeValue changedComposite = (CompositeValue) p.getValue();
- assertNotNull(changedComposite);
-
- v = (SimpleValue) changedComposite.get("testString2");
- assertEquals("changedString", v.getValue());
- }
-
- // TODO
-// public void testPrimitiveArray() throws Exception
-// {
-// ManagedObject mo = createTestMetaDataMO();
-// assertNotNull(mo);
-//
-// ManagedProperty p = mo.getProperty("charArray");
-// assertNotNull(p);
-//
-// ArrayValue a = (ArrayValue) p.getValue();
-// assertNotNull(a);
-//
-// SimpleValueSupport svs = (SimpleValueSupport) a.getValue(1);
-// assertNotNull(svs);
-// svs.setValue('H');
-//
-// PersistedManagedObject restored = process(mo);
-// assertNotNull(restored);
-//
-// //
-// mo = createTestMetaDataMO();
-//
-// ManagedObjectUpdateHandler handler = new ManagedObjectUpdateHandler();
-// handler.processManagedObject(restored, mo);
-//
-// p = mo.getProperty("charArray");
-// assertNotNull(p);
-//
-// a = (ArrayValue) p.getValue();
-// assertNotNull(a);
-//
-// assertEquals('H', ((SimpleValue) a.getValue(1)).getValue());
-// }
-
- protected PersistedManagedObject process(ManagedObject mo) throws Exception
- {
- // Create root;
- PersistedManagedObject persisted = new PersistedManagedObject();
- // Create xml elements
- ManagedObjectPeristenceHandler handler = new ManagedObjectPeristenceHandler();
- handler.processManagedObject(persisted, mo);
-
- // Save
- AbstractFileAttachmentsSerializer serializer = getAttachmentSerializer(true);
- serializer.saveAttachment("test", persisted);
- // Restore
- return serializer.loadAttachment("test", PersistedManagedObject.class);
- }
-
- protected ManagedObject createMO(Object o)
- {
- return getMOF().initManagedObject(o, null);
- }
-
- protected ManagedObject createPrimitiveMO()
- {
- PrimitiveMetaData md = createPrimitive();
- assertNotNull(md);
- return createMO(md);
- }
-
- protected ManagedObject createTestMetaDataMO()
- {
- return createMO(createTestMetaData());
- }
-
- protected TestMetaData createTestMetaData()
- {
- TestMetaData test = new TestMetaData();
- test.setPrimitive(createPrimitive());
-
- // Create list
- List<String> list = new ArrayList<String>();
-
- list.add("String1");
- list.add("String2");
- list.add("String3");
-
- test.setList(list);
-
- // Create map
- Map<String, String> map = new HashMap<String, String>();
-
- map.put("testString1", "string1");
- map.put("testString2", "string2");
- map.put("testString3", "string3");
-
- test.setTestMap(map);
-
-
- // Create primitive array
-
- Character[] array = new Character[3];
-
- array[0] = 'A';
- array[1] = 'B';
- array[2] = 'C';
-
- test.setCharArray(array);
-
- return test;
- }
-
- protected PrimitiveMetaData createPrimitive()
- {
- PrimitiveMetaData primitive = new PrimitiveMetaData();
- primitive.setInteger(12);
- primitive.setName("testName");
- return primitive;
- }
-
-}
-
Deleted: trunk/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/TestNestedPeristenceFormatUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/TestNestedPeristenceFormatUnitTestCase.java 2009-02-04 15:55:55 UTC (rev 83857)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/TestNestedPeristenceFormatUnitTestCase.java 2009-02-04 16:22:05 UTC (rev 83858)
@@ -1,254 +0,0 @@
-/*
- * 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.persistenceformat.test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.jboss.managed.api.ManagedObject;
-import org.jboss.managed.api.ManagedProperty;
-import org.jboss.metatype.api.types.SimpleMetaType;
-import org.jboss.metatype.api.values.CollectionValue;
-import org.jboss.metatype.api.values.CompositeValue;
-import org.jboss.metatype.api.values.CompositeValueSupport;
-import org.jboss.metatype.api.values.GenericValue;
-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.ManagedObjectPeristenceHandler;
-import org.jboss.system.server.profileservice.persistence.ManagedObjectUpdateHandler;
-import org.jboss.system.server.profileservice.persistence.xml.PersistedCollectionValue;
-import org.jboss.system.server.profileservice.persistence.xml.PersistedGenericValue;
-import org.jboss.system.server.profileservice.persistence.xml.PersistedManagedObject;
-import org.jboss.system.server.profileservice.repository.AbstractFileAttachmentsSerializer;
-import org.jboss.test.profileservice.persistenceformat.support.NestedTestMetaData;
-import org.jboss.test.profileservice.persistenceformat.support.PrimitiveMetaData;
-import org.jboss.test.profileservice.persistenceformat.support.TestMetaData;
-
-/**
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-public class TestNestedPeristenceFormatUnitTestCase extends AbstractPersistenceFormatTest
-{
-
- public TestNestedPeristenceFormatUnitTestCase(String name)
- {
- super(name);
- }
-
- public void test() throws Exception
- {
- ManagedObject mo = createNestedMO();
-
- // deployment1
- ManagedObject deployment = getDeployment("testDeployment1", mo);
- assertNotNull(deployment);
- deployment.getProperty("");
-
- ManagedProperty p = deployment.getProperty("primitive");
- assertNotNull(p);
-
- CompositeValue composite = (CompositeValue) p.getValue();
-
- Map<String, MetaValue> valueMap = new HashMap<String, MetaValue>();
- valueMap.put("optionalName",
- new SimpleValueSupport(SimpleMetaType.STRING, "changed"));
- valueMap.put("integer", new SimpleValueSupport(
- SimpleMetaType.INTEGER, 111));
-
- //
- p.setValue(new CompositeValueSupport(composite.getMetaType(), valueMap));
-
- ManagedProperty property = deployment.getProperty("name");
- assertNotNull(property);
- property.setValue(SimpleValueSupport.wrap("ChangedName"));
-
- // deployment3
- deployment = getDeployment("testDeployment3", mo);
- assertNotNull(deployment);
-
- property = deployment.getProperty("name");
- assertNotNull(property);
- property.setValue(SimpleValueSupport.wrap("ChangedName3"));
-
- PersistedManagedObject restored = process(mo);
- assertNotNull(restored);
- PersistedCollectionValue collection = (PersistedCollectionValue) restored.getProperties().get(0).getValue();
- assertNotNull(collection);
- PersistedManagedObject o = ((PersistedGenericValue) collection.getValues().get(0)).getManagedObject();
- assertNotNull(o);
-
- // Recreate
- mo = createNestedMO();
-
- ManagedObjectUpdateHandler handler = new ManagedObjectUpdateHandler();
- handler.processManagedObject(restored, mo);
-
- deployment = getDeployment("ChangedName", mo);
- assertNotNull("changed name deployment null", deployment);
-
- p = deployment.getProperty("primitive");
- assertNotNull(p);
-
- composite = (CompositeValue) p.getValue();
- assertNotNull(composite);
-
- assertEquals("changed", ((SimpleValue)composite.get("optionalName")).getValue());
-
-
- deployment = getDeployment("testDeployment2", mo);
- assertNotNull(deployment);
-
- deployment = getDeployment("ChangedName3", mo);
- assertNotNull(deployment);
-
- // Null
- deployment = getDeployment("testDeployment1", mo);
- assertNull(deployment);
- // Null
- deployment = getDeployment("testDeployment3", mo);
- assertNull(deployment);
-
- NestedTestMetaData md = (NestedTestMetaData) mo.getAttachment();
- assertNotNull(md);
-
- for(TestMetaData tmd : md.getDeployments())
- log.debug(tmd);
- }
-
- protected ManagedObject getDeployment(String name, ManagedObject mo)
- {
-
- ManagedProperty p = mo.getProperty("deployments");
- CollectionValue collection = (CollectionValue) p.getValue();
-
- assertTrue(p.getMetaType().isCollection());
- assertNotNull("null collection", collection);
- assertEquals(3, collection.getSize());;
-
- for(MetaValue value : collection)
- {
- ManagedObject deployment = (ManagedObject) ((GenericValue) value).getValue();
-
- ManagedProperty nameProp = deployment.getProperty("name");
- assertNotNull(nameProp);
-
- String deploymentName = (String) ((SimpleValue) deployment.getProperty("name").getValue()).getValue();
-
- if(name.equals(deploymentName))
- return deployment;
- }
- return null;
- }
-
- protected PersistedManagedObject process(ManagedObject mo) throws Exception
- {
- // Create root;
- PersistedManagedObject persisted = new PersistedManagedObject();
- // Create xml elements
- ManagedObjectPeristenceHandler handler = new ManagedObjectPeristenceHandler();
- handler.processManagedObject(persisted, mo);
-
- // Save
- AbstractFileAttachmentsSerializer serializer = getAttachmentSerializer(true);
- serializer.saveAttachment("test", persisted);
- // Restore
- return serializer.loadAttachment("test", PersistedManagedObject.class);
- }
-
- protected ManagedObject createNestedMO()
- {
- return createMO(createNestedTestMetaData());
- }
-
- protected ManagedObject createMO(Object o)
- {
- return getMOF().initManagedObject(o, null);
- }
-
- protected NestedTestMetaData createNestedTestMetaData()
- {
- NestedTestMetaData test = new NestedTestMetaData();
-
- List<TestMetaData> deployments = new ArrayList<TestMetaData>();
-
- deployments.add(createTestMetaData("testDeployment1"));
- deployments.add(createTestMetaData("testDeployment2"));
- deployments.add(createTestMetaData("testDeployment3"));
-
- test.setDeployments(deployments);
- return test;
- }
-
- protected TestMetaData createTestMetaData(String name)
- {
- TestMetaData test = new TestMetaData();
-
- //
- test.setName(name);
-
- // primitive
- test.setPrimitive(createPrimitive());
-
- // Create list
- List<String> list = new ArrayList<String>();
-
- list.add("String1");
- list.add("String2");
- list.add("String3");
-
- test.setList(list);
-
- // Create map
- Map<String, String> map = new HashMap<String, String>();
-
- map.put("testString1", "string1");
- map.put("testString2", "string2");
- map.put("testString3", "string3");
-
- test.setTestMap(map);
-
- // Create primitive array
-
- Character[] array = new Character[3];
-
- array[0] = 'A';
- array[1] = 'B';
- array[2] = 'C';
-
- test.setCharArray(array);
-
- return test;
- }
-
- protected PrimitiveMetaData createPrimitive()
- {
- PrimitiveMetaData primitive = new PrimitiveMetaData();
- primitive.setInteger(12);
- primitive.setName("testName");
- return primitive;
- }
-}
-
More information about the jboss-cvs-commits
mailing list