Defines the test case name for junit.
+ * @param testName The test case name. + */ + public AnnotationMultiValueWithObjectCollectionConverterImplTest( + String testName) throws Exception { + super(testName); + } + + public static Test suite() { + // All methods starting with "test" will be executed in the test suite. + return new RepositoryLifecycleTestSetup( + new TestSuite( + AnnotationMultiValueWithObjectCollectionConverterImplTest.class)); + } + + public void testMultiValue() { + checkMultiValue(new String[] { "Value1", "Value2", "Value3", "Value4", + "Value5" }, "/test-string", String.class); + checkMultiValue(new Long[] { 1L, 2L, 3L, 4L, 5L }, "/test-long", + Long.class); + } + + public void checkMultiValue(Object[] testData, String nodeName, Class klazz) { + try { + ObjectContentManager ocm = getObjectContentManager(); + + // -------------------------------------------------------------------------------- + // Create and store an object graph in the repository + // -------------------------------------------------------------------------------- + + MultiValueWithObjectCollection multiValue = new MultiValueWithObjectCollection(); + multiValue.setPath(nodeName); + + ArrayList values = new ArrayList(); + values.add(testData[0]); + values.add(testData[1]); + multiValue.setMultiValues(values); + + ocm.insert(multiValue); + ocm.save(); + + // -------------------------------------------------------------------------------- + // Get the object + // -------------------------------------------------------------------------------- + multiValue = (MultiValueWithObjectCollection) ocm + .getObject(nodeName); + assertNotNull("Object is null", multiValue); + assertNull("nullMultiValues field is not null", multiValue + .getNullMultiValues()); + assertTrue("Incorrect number of values", multiValue + .getMultiValues().size() == 2); + Iterator anIterator = multiValue.getMultiValues().iterator(); + assertEquals(testData[0], klazz.cast(anIterator.next())); + assertEquals(testData[1], klazz.cast(anIterator.next())); + + // -------------------------------------------------------------------------------- + // Update the object + // -------------------------------------------------------------------------------- + ArrayList values1 = new ArrayList(); + values1.add(testData[2]); + values1.add(testData[3]); + values1.add(testData[4]); + multiValue.setMultiValues(values1); + + ocm.update(multiValue); + ocm.save(); + + // -------------------------------------------------------------------------------- + // Get the object + // -------------------------------------------------------------------------------- + + multiValue = (MultiValueWithObjectCollection) ocm + .getObject(nodeName); + assertNotNull("Object is null", multiValue); + assertNull("nullMultiValues field is not null", multiValue + .getNullMultiValues()); + assertTrue("Incorrect number of values", multiValue + .getMultiValues().size() == 3); + assertEquals(testData[2], klazz.cast(multiValue.getMultiValues() + .iterator().next())); + + } catch (Exception e) { + e.printStackTrace(); + fail("Exception occurs during the unit test : " + e); + } + } + +} \ No newline at end of file Index: src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterMultiValueWithObjectCollectionConverterImplTest.java =================================================================== --- src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterMultiValueWithObjectCollectionConverterImplTest.java (revision 0) +++ src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterMultiValueWithObjectCollectionConverterImplTest.java (revision 0) @@ -0,0 +1,127 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.jackrabbit.ocm.manager.collectionconverter; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.GregorianCalendar; +import java.util.Iterator; + +import junit.framework.Test; +import junit.framework.TestSuite; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.jackrabbit.ocm.DigesterTestBase; +import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup; +import org.apache.jackrabbit.ocm.manager.ObjectContentManager; +import org.apache.jackrabbit.ocm.testmodel.MultiValueWithObjectCollection; + +/** + * Test NTCollectionConverterImpl + * + * @author : Boni Gopalan + */ +public class DigesterMultiValueWithObjectCollectionConverterImplTest extends DigesterTestBase +{ + private final static Log log = LogFactory.getLog(DigesterMultiValueWithObjectCollectionConverterImplTest.class); + + /** + *Defines the test case name for junit.
+ * @param testName The test case name. + */ + public DigesterMultiValueWithObjectCollectionConverterImplTest(String testName) throws Exception + { + super(testName); + } + + public static Test suite() + { + // All methods starting with "test" will be executed in the test suite. + return new RepositoryLifecycleTestSetup(new TestSuite(DigesterMultiValueWithObjectCollectionConverterImplTest.class)); + } + + public void testMultiValue(){ + checkMultiValue(new String [] {"Value1", "Value2", "Value3", "Value4", "Value5"}, "/test-string", String.class); + checkMultiValue(new Long [] {1L, 2L, 3L, 4L, 5L}, "/test-long", Long.class); + } + + public void checkMultiValue(Object [] testData, String nodeName, Class klazz ) + { + try + { + ObjectContentManager ocm = getObjectContentManager(); + + // -------------------------------------------------------------------------------- + // Create and store an object graph in the repository + // -------------------------------------------------------------------------------- + + MultiValueWithObjectCollection multiValue = new MultiValueWithObjectCollection(); + multiValue.setPath(nodeName); + + ArrayList values = new ArrayList(); + values.add(testData[0]); + values.add(testData[1]); + multiValue.setMultiValues(values); + + ocm.insert(multiValue); + ocm.save(); + + // -------------------------------------------------------------------------------- + // Get the object + // -------------------------------------------------------------------------------- + multiValue = (MultiValueWithObjectCollection) ocm.getObject( nodeName); + assertNotNull("Object is null", multiValue); + assertNull("nullMultiValues field is not null", multiValue.getNullMultiValues()); + assertTrue("Incorrect number of values", multiValue.getMultiValues().size() == 2); + Iterator anIterator = multiValue.getMultiValues().iterator(); + assertEquals(testData[0], klazz.cast(anIterator.next())); + assertEquals(testData[1], klazz.cast(anIterator.next())); + + // -------------------------------------------------------------------------------- + // Update the object + // -------------------------------------------------------------------------------- + ArrayList values1 = new ArrayList(); + values1.add(testData[2]); + values1.add(testData[3]); + values1.add(testData[4]); + multiValue.setMultiValues(values1); + + ocm.update(multiValue); + ocm.save(); + + // -------------------------------------------------------------------------------- + // Get the object + // -------------------------------------------------------------------------------- + + multiValue = (MultiValueWithObjectCollection) ocm.getObject(nodeName); + assertNotNull("Object is null", multiValue); + assertNull("nullMultiValues field is not null", multiValue.getNullMultiValues()); + assertTrue("Incorrect number of values", multiValue.getMultiValues().size() == 3); + assertEquals(testData[2], klazz.cast(multiValue.getMultiValues().iterator().next())); + + } + catch (Exception e) + { + e.printStackTrace(); + fail("Exception occurs during the unit test : " + e); + } + + } + + +} \ No newline at end of file Index: src/test/java/org/apache/jackrabbit/ocm/manager/uuid/DigesterUuidTest.java =================================================================== --- src/test/java/org/apache/jackrabbit/ocm/manager/uuid/DigesterUuidTest.java (revision 699762) +++ src/test/java/org/apache/jackrabbit/ocm/manager/uuid/DigesterUuidTest.java (working copy) @@ -512,5 +512,6 @@ } } + } \ No newline at end of file Index: src/test/java/org/apache/jackrabbit/ocm/testmodel/MultiValueWithObjectCollection.java =================================================================== --- src/test/java/org/apache/jackrabbit/ocm/testmodel/MultiValueWithObjectCollection.java (revision 0) +++ src/test/java/org/apache/jackrabbit/ocm/testmodel/MultiValueWithObjectCollection.java (revision 0) @@ -0,0 +1,86 @@ +package org.apache.jackrabbit.ocm.testmodel; + +import org.apache.jackrabbit.ocm.manager.collectionconverter.impl.MultiValueCollectionConverterImpl; +import org.apache.jackrabbit.ocm.mapper.impl.annotation.Collection; +import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field; +import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node; +@Node +public class MultiValueWithObjectCollection { + /** + * + * Simple object used to test multivalue properties + * + * @author Boni Gopalan + * @version $Id: Exp $ + */ + @Field(path=true) private String path; + + @Field private String name; + + @Collection(elementClassName=Object.class, collectionConverter=MultiValueCollectionConverterImpl.class) + private java.util.Collection multiValues; + + @Collection(elementClassName=Object.class, collectionConverter=MultiValueCollectionConverterImpl.class) + private java.util.Collection nullMultiValues; + + + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + + /** + * @return Returns the name. + */ + public String getName() + { + return name; + } + + /** + * @param name The name to set. + */ + public void setName(String name) + { + this.name = name; + } + + /** + * @return Returns the multiValues. + */ + public java.util.Collection getMultiValues() + { + return multiValues; + } + + /** + * @param multiValues + * The multiValues to set. + */ + public void setMultiValues(java.util.Collection multiValues) + { + this.multiValues = multiValues; + } + + /** + * @return Returns the nullMultiValues. + */ + public java.util.Collection getNullMultiValues() + { + return nullMultiValues; + } + + /** + * @param nullMultiValues + * The nullMultiValues to set. + */ + public void setNullMultiValues(java.util.Collection nullMultiValues) + { + this.nullMultiValues = nullMultiValues; + } + +} Index: src/test/test-config/jcrmapping-atomic.xml =================================================================== --- src/test/test-config/jcrmapping-atomic.xml (revision 699762) +++ src/test/test-config/jcrmapping-atomic.xml (working copy) @@ -53,6 +53,22 @@ + +