diff options
author | kmoore | 2011-08-02 13:24:47 +0000 |
---|---|---|
committer | kmoore | 2011-08-02 13:24:47 +0000 |
commit | 3d505d221f38ced0b003a7ab4c3bec329e66520d (patch) | |
tree | 523ab7f29009dc5f54adcc0d373d46a5c9db78c1 /jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests | |
parent | a940ce0028751421c5c7312b19128b3a5f518386 (diff) | |
download | webtools.dali-3d505d221f38ced0b003a7ab4c3bec329e66520d.tar.gz webtools.dali-3d505d221f38ced0b003a7ab4c3bec329e66520d.tar.xz webtools.dali-3d505d221f38ced0b003a7ab4c3bec329e66520d.zip |
changing the rest of the Iterator API to Iterable
Diffstat (limited to 'jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests')
19 files changed, 334 insertions, 334 deletions
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkEntityMappingsTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkEntityMappingsTests.java index dd6d7d1567..98c7627066 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkEntityMappingsTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkEntityMappingsTests.java @@ -41,7 +41,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertEquals(0, resourceEntityMappings.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlConverter resourceConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlConverter(); @@ -55,7 +55,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); assertEquals(1, resourceEntityMappings.getConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlConverter resourceConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlConverter(); @@ -72,7 +72,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); assertEquals(2, resourceEntityMappings.getConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceEntityMappings.getConverters().move(0, 1); @@ -86,7 +86,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); assertEquals(2, resourceEntityMappings.getConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntityMappings.getConverters().remove(0); @@ -97,7 +97,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); assertEquals(1, resourceEntityMappings.getConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntityMappings.getConverters().remove(resourceConverter2); @@ -105,7 +105,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertFalse(ormContextConverterHolder.getCustomConverters().iterator().hasNext()); assertEquals(0, resourceEntityMappings.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyCustomConverters() throws Exception { @@ -116,7 +116,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertEquals(0, resourceEntityMappings.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkCustomConverter contextConverter = ormContextConverterHolder.addCustomConverter(0); @@ -131,7 +131,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe EclipseLinkCustomConverter ormContextConverter = ormContextConverters.next(); assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkCustomConverter contextConverter2 = ormContextConverterHolder.addCustomConverter(0); @@ -151,7 +151,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe ormContextConverter = ormContextConverters.next(); assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveCustomConverter(0, 1); @@ -169,7 +169,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe ormContextConverter = ormContextConverters.next(); assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeCustomConverter(0); @@ -182,7 +182,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe ormContextConverter = ormContextConverters.next(); assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeCustomConverter(contextConverter2); @@ -190,7 +190,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertFalse(ormContextConverterHolder.getCustomConverters().iterator().hasNext()); assertEquals(0, resourceEntityMappings.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateTypeConverters() throws Exception { @@ -201,7 +201,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertEquals(0, resourceEntityMappings.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlTypeConverter resourceTypeConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverter(); @@ -215,7 +215,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); assertEquals(1, resourceEntityMappings.getTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlTypeConverter resourceTypeConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverter(); @@ -232,7 +232,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); assertEquals(2, resourceEntityMappings.getTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceEntityMappings.getTypeConverters().move(0, 1); @@ -246,7 +246,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); assertEquals(2, resourceEntityMappings.getTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntityMappings.getTypeConverters().remove(0); @@ -257,7 +257,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); assertEquals(1, resourceEntityMappings.getTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntityMappings.getTypeConverters().remove(resourceTypeConverter2); @@ -265,7 +265,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertFalse(ormContextConverterHolder.getTypeConverters().iterator().hasNext()); assertEquals(0, resourceEntityMappings.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyTypeConverters() throws Exception { @@ -276,7 +276,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertEquals(0, resourceEntityMappings.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkTypeConverter contextTypeConverter = ormContextConverterHolder.addTypeConverter(0); @@ -291,7 +291,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe EclipseLinkTypeConverter ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkTypeConverter contextTypeConverter2 = ormContextConverterHolder.addTypeConverter(0); @@ -311,7 +311,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveTypeConverter(0, 1); @@ -329,7 +329,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeTypeConverter(0); @@ -342,7 +342,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeTypeConverter(contextTypeConverter2); @@ -350,7 +350,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertFalse(ormContextConverterHolder.getTypeConverters().iterator().hasNext()); assertEquals(0, resourceEntityMappings.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateObjectTypeConverters() throws Exception { @@ -361,7 +361,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertEquals(0, resourceEntityMappings.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlObjectTypeConverter resourceObjectTypeConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverter(); @@ -375,7 +375,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); assertEquals(1, resourceEntityMappings.getObjectTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlObjectTypeConverter resourceObjectTypeConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverter(); @@ -392,7 +392,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); assertEquals(2, resourceEntityMappings.getObjectTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceEntityMappings.getObjectTypeConverters().move(0, 1); @@ -406,7 +406,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); assertEquals(2, resourceEntityMappings.getObjectTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntityMappings.getObjectTypeConverters().remove(0); @@ -417,7 +417,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); assertEquals(1, resourceEntityMappings.getObjectTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntityMappings.getObjectTypeConverters().remove(resourceObjectTypeConverter2); @@ -425,7 +425,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertFalse(ormContextConverterHolder.getObjectTypeConverters().iterator().hasNext()); assertEquals(0, resourceEntityMappings.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyObjectTypeConverters() throws Exception { @@ -436,7 +436,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertEquals(0, resourceEntityMappings.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkObjectTypeConverter contextObjectTypeConverter = ormContextConverterHolder.addObjectTypeConverter(0); @@ -451,7 +451,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe EclipseLinkObjectTypeConverter ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkObjectTypeConverter contextObjectTypeConverter2 = ormContextConverterHolder.addObjectTypeConverter(0); @@ -471,7 +471,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveObjectTypeConverter(0, 1); @@ -489,7 +489,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeObjectTypeConverter(0); @@ -502,7 +502,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeObjectTypeConverter(contextObjectTypeConverter2); @@ -510,7 +510,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertFalse(ormContextConverterHolder.getObjectTypeConverters().iterator().hasNext()); assertEquals(0, resourceEntityMappings.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateStructConverters() throws Exception { @@ -521,7 +521,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertEquals(0, resourceEntityMappings.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlStructConverter resourceStructConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverter(); @@ -535,7 +535,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); assertEquals(1, resourceEntityMappings.getStructConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlStructConverter resourceStructConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverter(); @@ -552,7 +552,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); assertEquals(2, resourceEntityMappings.getStructConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceEntityMappings.getStructConverters().move(0, 1); @@ -566,7 +566,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); assertEquals(2, resourceEntityMappings.getStructConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntityMappings.getStructConverters().remove(0); @@ -577,7 +577,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); assertEquals(1, resourceEntityMappings.getStructConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntityMappings.getStructConverters().remove(resourceStructConverter2); @@ -585,7 +585,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertFalse(ormContextConverterHolder.getStructConverters().iterator().hasNext()); assertEquals(0, resourceEntityMappings.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyStructConverters() throws Exception { @@ -596,7 +596,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertEquals(0, resourceEntityMappings.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkStructConverter contextStructConverter = ormContextConverterHolder.addStructConverter(0); @@ -611,7 +611,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe EclipseLinkStructConverter ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkStructConverter contextStructConverter2 = ormContextConverterHolder.addStructConverter(0); @@ -631,7 +631,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveStructConverter(0, 1); @@ -649,7 +649,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeStructConverter(0); @@ -662,7 +662,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeStructConverter(contextStructConverter2); @@ -670,6 +670,6 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertFalse(ormContextConverterHolder.getStructConverters().iterator().hasNext()); assertEquals(0, resourceEntityMappings.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } }
\ No newline at end of file diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEmbeddableTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEmbeddableTests.java index ef2d770104..7bbfb71487 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEmbeddableTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEmbeddableTests.java @@ -393,7 +393,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertEquals(0, resourceEmbeddable.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlConverter resourceConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlConverter(); @@ -407,7 +407,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); assertEquals(1, resourceEmbeddable.getConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlConverter resourceConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlConverter(); @@ -424,7 +424,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); assertEquals(2, resourceEmbeddable.getConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceEmbeddable.getConverters().move(0, 1); @@ -438,7 +438,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); assertEquals(2, resourceEmbeddable.getConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEmbeddable.getConverters().remove(0); @@ -449,7 +449,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); assertEquals(1, resourceEmbeddable.getConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEmbeddable.getConverters().remove(resourceConverter2); @@ -457,7 +457,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertFalse(ormContextConverterHolder.getCustomConverters().iterator().hasNext()); assertEquals(0, resourceEmbeddable.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyCustomConverters() throws Exception { @@ -551,7 +551,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertEquals(0, resourceEmbeddable.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlTypeConverter resourceTypeConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverter(); @@ -565,7 +565,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); assertEquals(1, resourceEmbeddable.getTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlTypeConverter resourceTypeConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverter(); @@ -582,7 +582,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); assertEquals(2, resourceEmbeddable.getTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceEmbeddable.getTypeConverters().move(0, 1); @@ -596,7 +596,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); assertEquals(2, resourceEmbeddable.getTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEmbeddable.getTypeConverters().remove(0); @@ -607,7 +607,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); assertEquals(1, resourceEmbeddable.getTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEmbeddable.getTypeConverters().remove(resourceTypeConverter2); @@ -615,7 +615,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertFalse(ormContextConverterHolder.getTypeConverters().iterator().hasNext()); assertEquals(0, resourceEmbeddable.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyTypeConverters() throws Exception { @@ -628,7 +628,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertEquals(0, resourceEmbeddable.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkTypeConverter contextTypeConverter = ormContextConverterHolder.addTypeConverter(0); @@ -643,7 +643,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes EclipseLinkTypeConverter ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkTypeConverter contextTypeConverter2 = ormContextConverterHolder.addTypeConverter(0); @@ -663,7 +663,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveTypeConverter(0, 1); @@ -681,7 +681,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeTypeConverter(0); @@ -694,7 +694,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeTypeConverter(contextTypeConverter2); @@ -702,7 +702,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertFalse(ormContextConverterHolder.getTypeConverters().iterator().hasNext()); assertEquals(0, resourceEmbeddable.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateObjectTypeConverters() throws Exception { @@ -715,7 +715,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertEquals(0, resourceEmbeddable.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlObjectTypeConverter resourceObjectTypeConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverter(); @@ -729,7 +729,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); assertEquals(1, resourceEmbeddable.getObjectTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlObjectTypeConverter resourceObjectTypeConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverter(); @@ -746,7 +746,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); assertEquals(2, resourceEmbeddable.getObjectTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceEmbeddable.getObjectTypeConverters().move(0, 1); @@ -760,7 +760,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); assertEquals(2, resourceEmbeddable.getObjectTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEmbeddable.getObjectTypeConverters().remove(0); @@ -771,7 +771,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); assertEquals(1, resourceEmbeddable.getObjectTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEmbeddable.getObjectTypeConverters().remove(resourceObjectTypeConverter2); @@ -779,7 +779,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertFalse(ormContextConverterHolder.getObjectTypeConverters().iterator().hasNext()); assertEquals(0, resourceEmbeddable.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyObjectTypeConverters() throws Exception { @@ -792,7 +792,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertEquals(0, resourceEmbeddable.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkObjectTypeConverter contextObjectTypeConverter = ormContextConverterHolder.addObjectTypeConverter(0); @@ -807,7 +807,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes EclipseLinkObjectTypeConverter ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkObjectTypeConverter contextObjectTypeConverter2 = ormContextConverterHolder.addObjectTypeConverter(0); @@ -827,7 +827,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveObjectTypeConverter(0, 1); @@ -845,7 +845,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeObjectTypeConverter(0); @@ -858,7 +858,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeObjectTypeConverter(contextObjectTypeConverter2); @@ -866,7 +866,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertFalse(ormContextConverterHolder.getObjectTypeConverters().iterator().hasNext()); assertEquals(0, resourceEmbeddable.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateStructConverters() throws Exception { @@ -879,7 +879,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertEquals(0, resourceEmbeddable.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlStructConverter resourceStructConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverter(); @@ -893,7 +893,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); assertEquals(1, resourceEmbeddable.getStructConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlStructConverter resourceStructConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverter(); @@ -910,7 +910,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); assertEquals(2, resourceEmbeddable.getStructConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceEmbeddable.getStructConverters().move(0, 1); @@ -924,7 +924,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); assertEquals(2, resourceEmbeddable.getStructConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEmbeddable.getStructConverters().remove(0); @@ -935,7 +935,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); assertEquals(1, resourceEmbeddable.getStructConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEmbeddable.getStructConverters().remove(resourceStructConverter2); @@ -943,7 +943,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertFalse(ormContextConverterHolder.getStructConverters().iterator().hasNext()); assertEquals(0, resourceEmbeddable.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyStructConverters() throws Exception { @@ -956,7 +956,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertEquals(0, resourceEmbeddable.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkStructConverter contextStructConverter = ormContextConverterHolder.addStructConverter(0); @@ -971,7 +971,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes EclipseLinkStructConverter ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkStructConverter contextStructConverter2 = ormContextConverterHolder.addStructConverter(0); @@ -991,7 +991,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveStructConverter(0, 1); @@ -1009,7 +1009,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeStructConverter(0); @@ -1022,7 +1022,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeStructConverter(contextStructConverter2); @@ -1030,6 +1030,6 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertFalse(ormContextConverterHolder.getStructConverters().iterator().hasNext()); assertEquals(0, resourceEmbeddable.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } }
\ No newline at end of file diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEntityTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEntityTests.java index ac89b5cfe0..d80263af79 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEntityTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEntityTests.java @@ -1746,7 +1746,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertEquals(0, resourceEntity.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlConverter resourceConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlConverter(); @@ -1760,7 +1760,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); assertEquals(1, resourceEntity.getConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlConverter resourceConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlConverter(); @@ -1777,7 +1777,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); assertEquals(2, resourceEntity.getConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceEntity.getConverters().move(0, 1); @@ -1791,7 +1791,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); assertEquals(2, resourceEntity.getConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntity.getConverters().remove(0); @@ -1802,7 +1802,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); assertEquals(1, resourceEntity.getConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntity.getConverters().remove(resourceConverter2); @@ -1810,7 +1810,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertFalse(ormContextConverterHolder.getCustomConverters().iterator().hasNext()); assertEquals(0, resourceEntity.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyCustomConverters() throws Exception { @@ -1823,7 +1823,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertEquals(0, resourceEntity.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkCustomConverter contextConverter = ormContextConverterHolder.addCustomConverter(0); @@ -1838,7 +1838,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas EclipseLinkCustomConverter ormContextConverter = ormContextConverters.next(); assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkCustomConverter contextConverter2 = ormContextConverterHolder.addCustomConverter(0); @@ -1858,7 +1858,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas ormContextConverter = ormContextConverters.next(); assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveCustomConverter(0, 1); @@ -1876,7 +1876,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas ormContextConverter = ormContextConverters.next(); assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeCustomConverter(0); @@ -1889,7 +1889,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas ormContextConverter = ormContextConverters.next(); assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeCustomConverter(contextConverter2); @@ -1897,7 +1897,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertFalse(ormContextConverterHolder.getCustomConverters().iterator().hasNext()); assertEquals(0, resourceEntity.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateTypeConverters() throws Exception { @@ -1910,7 +1910,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertEquals(0, resourceEntity.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlTypeConverter resourceTypeConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverter(); @@ -1924,7 +1924,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); assertEquals(1, resourceEntity.getTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlTypeConverter resourceTypeConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverter(); @@ -1941,7 +1941,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); assertEquals(2, resourceEntity.getTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceEntity.getTypeConverters().move(0, 1); @@ -1955,7 +1955,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); assertEquals(2, resourceEntity.getTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntity.getTypeConverters().remove(0); @@ -1966,7 +1966,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); assertEquals(1, resourceEntity.getTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntity.getTypeConverters().remove(resourceTypeConverter2); @@ -1974,7 +1974,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertFalse(ormContextConverterHolder.getTypeConverters().iterator().hasNext()); assertEquals(0, resourceEntity.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyTypeConverters() throws Exception { @@ -1987,7 +1987,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertEquals(0, resourceEntity.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkTypeConverter contextTypeConverter = ormContextConverterHolder.addTypeConverter(0); @@ -2002,7 +2002,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas EclipseLinkTypeConverter ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkTypeConverter contextTypeConverter2 = ormContextConverterHolder.addTypeConverter(0); @@ -2022,7 +2022,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveTypeConverter(0, 1); @@ -2040,7 +2040,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeTypeConverter(0); @@ -2053,7 +2053,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeTypeConverter(contextTypeConverter2); @@ -2061,7 +2061,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertFalse(ormContextConverterHolder.getTypeConverters().iterator().hasNext()); assertEquals(0, resourceEntity.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateObjectTypeConverters() throws Exception { @@ -2074,7 +2074,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertEquals(0, resourceEntity.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlObjectTypeConverter resourceObjectTypeConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverter(); @@ -2088,7 +2088,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); assertEquals(1, resourceEntity.getObjectTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlObjectTypeConverter resourceObjectTypeConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverter(); @@ -2105,7 +2105,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); assertEquals(2, resourceEntity.getObjectTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceEntity.getObjectTypeConverters().move(0, 1); @@ -2119,7 +2119,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); assertEquals(2, resourceEntity.getObjectTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntity.getObjectTypeConverters().remove(0); @@ -2130,7 +2130,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); assertEquals(1, resourceEntity.getObjectTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntity.getObjectTypeConverters().remove(resourceObjectTypeConverter2); @@ -2138,7 +2138,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertFalse(ormContextConverterHolder.getObjectTypeConverters().iterator().hasNext()); assertEquals(0, resourceEntity.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyObjectTypeConverters() throws Exception { @@ -2151,7 +2151,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertEquals(0, resourceEntity.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkObjectTypeConverter contextObjectTypeConverter = ormContextConverterHolder.addObjectTypeConverter(0); @@ -2166,7 +2166,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas EclipseLinkObjectTypeConverter ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkObjectTypeConverter contextObjectTypeConverter2 = ormContextConverterHolder.addObjectTypeConverter(0); @@ -2186,7 +2186,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveObjectTypeConverter(0, 1); @@ -2204,7 +2204,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeObjectTypeConverter(0); @@ -2217,7 +2217,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeObjectTypeConverter(contextObjectTypeConverter2); @@ -2225,7 +2225,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertFalse(ormContextConverterHolder.getObjectTypeConverters().iterator().hasNext()); assertEquals(0, resourceEntity.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateStructConverters() throws Exception { @@ -2238,7 +2238,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertEquals(0, resourceEntity.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlStructConverter resourceStructConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverter(); @@ -2252,7 +2252,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); assertEquals(1, resourceEntity.getStructConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlStructConverter resourceStructConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverter(); @@ -2269,7 +2269,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); assertEquals(2, resourceEntity.getStructConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceEntity.getStructConverters().move(0, 1); @@ -2283,7 +2283,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); assertEquals(2, resourceEntity.getStructConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntity.getStructConverters().remove(0); @@ -2294,7 +2294,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); assertEquals(1, resourceEntity.getStructConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntity.getStructConverters().remove(resourceStructConverter2); @@ -2302,7 +2302,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertFalse(ormContextConverterHolder.getStructConverters().iterator().hasNext()); assertEquals(0, resourceEntity.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyStructConverters() throws Exception { @@ -2315,7 +2315,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertEquals(0, resourceEntity.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkStructConverter contextStructConverter = ormContextConverterHolder.addStructConverter(0); @@ -2330,7 +2330,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas EclipseLinkStructConverter ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkStructConverter contextStructConverter2 = ormContextConverterHolder.addStructConverter(0); @@ -2350,7 +2350,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveStructConverter(0, 1); @@ -2368,7 +2368,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeStructConverter(0); @@ -2381,7 +2381,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeStructConverter(contextStructConverter2); @@ -2389,6 +2389,6 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertFalse(ormContextConverterHolder.getStructConverters().iterator().hasNext()); assertEquals(0, resourceEntity.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } } diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmMappedSuperclassTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmMappedSuperclassTests.java index 6d90b84e77..1d5231019b 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmMappedSuperclassTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmMappedSuperclassTests.java @@ -1499,7 +1499,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertEquals(0, resourceMappedSuperclass.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlConverter resourceConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlConverter(); @@ -1513,7 +1513,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); assertEquals(1, resourceMappedSuperclass.getConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlConverter resourceConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlConverter(); @@ -1530,7 +1530,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); assertEquals(2, resourceMappedSuperclass.getConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceMappedSuperclass.getConverters().move(0, 1); @@ -1544,7 +1544,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); assertEquals(2, resourceMappedSuperclass.getConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getConverters().remove(0); @@ -1555,7 +1555,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); assertEquals(1, resourceMappedSuperclass.getConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getConverters().remove(resourceConverter2); @@ -1563,7 +1563,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertFalse(ormContextConverterHolder.getCustomConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyCustomConverters() throws Exception { @@ -1576,7 +1576,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertEquals(0, resourceMappedSuperclass.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkCustomConverter contextConverter = ormContextConverterHolder.addCustomConverter(0); @@ -1591,7 +1591,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo EclipseLinkCustomConverter ormContextConverter = ormContextConverters.next(); assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkCustomConverter contextConverter2 = ormContextConverterHolder.addCustomConverter(0); @@ -1611,7 +1611,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo ormContextConverter = ormContextConverters.next(); assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveCustomConverter(0, 1); @@ -1629,7 +1629,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo ormContextConverter = ormContextConverters.next(); assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeCustomConverter(0); @@ -1642,7 +1642,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo ormContextConverter = ormContextConverters.next(); assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeCustomConverter(contextConverter2); @@ -1650,7 +1650,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertFalse(ormContextConverterHolder.getCustomConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateTypeConverters() throws Exception { @@ -1663,7 +1663,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertEquals(0, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlTypeConverter resourceTypeConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverter(); @@ -1677,7 +1677,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); assertEquals(1, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlTypeConverter resourceTypeConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverter(); @@ -1694,7 +1694,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); assertEquals(2, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceMappedSuperclass.getTypeConverters().move(0, 1); @@ -1708,7 +1708,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); assertEquals(2, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getTypeConverters().remove(0); @@ -1719,7 +1719,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); assertEquals(1, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getTypeConverters().remove(resourceTypeConverter2); @@ -1727,7 +1727,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertFalse(ormContextConverterHolder.getTypeConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyTypeConverters() throws Exception { @@ -1740,7 +1740,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertEquals(0, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkTypeConverter contextTypeConverter = ormContextConverterHolder.addTypeConverter(0); @@ -1755,7 +1755,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo EclipseLinkTypeConverter ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkTypeConverter contextTypeConverter2 = ormContextConverterHolder.addTypeConverter(0); @@ -1775,7 +1775,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveTypeConverter(0, 1); @@ -1793,7 +1793,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeTypeConverter(0); @@ -1806,7 +1806,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeTypeConverter(contextTypeConverter2); @@ -1814,7 +1814,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertFalse(ormContextConverterHolder.getTypeConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateObjectTypeConverters() throws Exception { @@ -1827,7 +1827,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertEquals(0, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlObjectTypeConverter resourceObjectTypeConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverter(); @@ -1841,7 +1841,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); assertEquals(1, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlObjectTypeConverter resourceObjectTypeConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverter(); @@ -1858,7 +1858,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); assertEquals(2, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceMappedSuperclass.getObjectTypeConverters().move(0, 1); @@ -1872,7 +1872,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); assertEquals(2, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getObjectTypeConverters().remove(0); @@ -1883,7 +1883,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); assertEquals(1, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getObjectTypeConverters().remove(resourceObjectTypeConverter2); @@ -1891,7 +1891,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertFalse(ormContextConverterHolder.getObjectTypeConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyObjectTypeConverters() throws Exception { @@ -1904,7 +1904,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertEquals(0, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkObjectTypeConverter contextObjectTypeConverter = ormContextConverterHolder.addObjectTypeConverter(0); @@ -1919,7 +1919,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo EclipseLinkObjectTypeConverter ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkObjectTypeConverter contextObjectTypeConverter2 = ormContextConverterHolder.addObjectTypeConverter(0); @@ -1939,7 +1939,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveObjectTypeConverter(0, 1); @@ -1957,7 +1957,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeObjectTypeConverter(0); @@ -1970,7 +1970,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeObjectTypeConverter(contextObjectTypeConverter2); @@ -1978,7 +1978,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertFalse(ormContextConverterHolder.getObjectTypeConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateStructConverters() throws Exception { @@ -1991,7 +1991,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertEquals(0, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlStructConverter resourceStructConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverter(); @@ -2005,7 +2005,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); assertEquals(1, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlStructConverter resourceStructConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverter(); @@ -2022,7 +2022,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); assertEquals(2, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceMappedSuperclass.getStructConverters().move(0, 1); @@ -2036,7 +2036,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); assertEquals(2, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getStructConverters().remove(0); @@ -2047,7 +2047,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); assertEquals(1, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getStructConverters().remove(resourceStructConverter2); @@ -2055,7 +2055,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertFalse(ormContextConverterHolder.getStructConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyStructConverters() throws Exception { @@ -2068,7 +2068,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertEquals(0, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkStructConverter contextStructConverter = ormContextConverterHolder.addStructConverter(0); @@ -2083,7 +2083,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo EclipseLinkStructConverter ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkStructConverter contextStructConverter2 = ormContextConverterHolder.addStructConverter(0); @@ -2103,7 +2103,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveStructConverter(0, 1); @@ -2121,7 +2121,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeStructConverter(0); @@ -2134,7 +2134,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeStructConverter(contextStructConverter2); @@ -2142,6 +2142,6 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertFalse(ormContextConverterHolder.getStructConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } } diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToManyMappingTests.java index a322f9d211..fc6bb89af4 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToManyMappingTests.java @@ -523,7 +523,7 @@ public class EclipseLinkOrmOneToManyMappingTests OneToManyMapping oneToManyMapping = (OneToManyMapping) ormPersistentType.getAttributeNamed("addresses").getMapping(); Iterator<String> mapKeyNames = - oneToManyMapping.candidateMapKeyNames(); + oneToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals("id", mapKeyNames.next()); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); @@ -543,11 +543,11 @@ public class EclipseLinkOrmOneToManyMappingTests OneToManyMapping ormOneToManyMapping = (OneToManyMapping) ormPersistentType.getAttributeNamed("addresses").getMapping(); JavaOneToManyMapping javaOneToManyMapping = (JavaOneToManyMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("addresses").getMapping(); - Iterator<String> mapKeyNames = ormOneToManyMapping.candidateMapKeyNames(); + Iterator<String> mapKeyNames = ormOneToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals(false, mapKeyNames.hasNext()); javaOneToManyMapping.setSpecifiedTargetEntity("test.Address"); - mapKeyNames = ormOneToManyMapping.candidateMapKeyNames(); + mapKeyNames = ormOneToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals("id", mapKeyNames.next()); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); @@ -556,11 +556,11 @@ public class EclipseLinkOrmOneToManyMappingTests ormPersistentType.getAttributeNamed("addresses").convertToSpecified(); ormOneToManyMapping = (OneToManyMapping) ormPersistentType.getAttributeNamed("addresses").getMapping(); - mapKeyNames = ormOneToManyMapping.candidateMapKeyNames(); + mapKeyNames = ormOneToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals(false, mapKeyNames.hasNext()); ormOneToManyMapping.setSpecifiedTargetEntity("test.Address"); - mapKeyNames = ormOneToManyMapping.candidateMapKeyNames(); + mapKeyNames = ormOneToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals("id", mapKeyNames.next()); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); @@ -568,7 +568,7 @@ public class EclipseLinkOrmOneToManyMappingTests assertFalse(mapKeyNames.hasNext()); ormOneToManyMapping.setSpecifiedTargetEntity("String"); - mapKeyNames = ormOneToManyMapping.candidateMapKeyNames(); + mapKeyNames = ormOneToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals(false, mapKeyNames.hasNext()); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/caching/CachingAdapterTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/caching/CachingAdapterTests.java index bb2a737f6d..97bb3f7123 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/caching/CachingAdapterTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/caching/CachingAdapterTests.java @@ -159,10 +159,10 @@ public class CachingAdapterTests extends EclipseLinkPersistenceUnitTestCase public void testEntitiesList() throws Exception { // add this.clearEvent(); - int originalNumberOfEntities = this.caching.entitiesSize(); + int originalNumberOfEntities = this.caching.getEntitiesSize(); this.caching.addEntity(ENTITY_TEST_2); - assertEquals("Entity not added", this.caching.entitiesSize(), originalNumberOfEntities + 1); + assertEquals("Entity not added", this.caching.getEntitiesSize(), originalNumberOfEntities + 1); // verify event received assertNotNull("No Event Fired.", this.entitiesEvent); @@ -172,7 +172,7 @@ public class CachingAdapterTests extends EclipseLinkPersistenceUnitTestCase // remove this.clearEvent(); this.caching.removeEntity(ENTITY_TEST_2); - assertEquals("Entity not removed", this.caching.entitiesSize(), originalNumberOfEntities); + assertEquals("Entity not removed", this.caching.getEntitiesSize(), originalNumberOfEntities); // verify event received assertNotNull("No Event Fired.", this.entitiesEvent); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/customization/EclipseLinkCustomizationTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/customization/EclipseLinkCustomizationTests.java index 76904218c8..7d4e493420 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/customization/EclipseLinkCustomizationTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/customization/EclipseLinkCustomizationTests.java @@ -306,7 +306,7 @@ public class EclipseLinkCustomizationTests extends EclipseLinkPersistenceUnitTes else if (propertyName.equals(Customization.PROFILER_PROPERTY)) modelValue = this.customization.getProfiler(); else if (propertyName.equals(Customization.SESSION_CUSTOMIZER_PROPERTY)) { - ListIterator<String> iterator = this.customization.sessionCustomizers(); + ListIterator<String> iterator = this.customization.getSessionCustomizers().iterator(); if(iterator.hasNext()) { modelValue = iterator.next(); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaElementCollectionMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaElementCollectionMappingTests.java index af5ca8e731..12807cdd60 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaElementCollectionMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaElementCollectionMappingTests.java @@ -890,7 +890,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests ElementCollectionMapping2_0 elementCollectionMapping2_0 = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); Iterator<String> mapKeyNames = - elementCollectionMapping2_0.candidateMapKeyNames(); + elementCollectionMapping2_0.getCandidateMapKeyNames().iterator(); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); assertEquals("state.name", mapKeyNames.next()); @@ -910,11 +910,11 @@ public class EclipseLink2_0JavaElementCollectionMappingTests PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping2_0 = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); - Iterator<String> mapKeyNames = elementCollectionMapping2_0.candidateMapKeyNames(); + Iterator<String> mapKeyNames = elementCollectionMapping2_0.getCandidateMapKeyNames().iterator(); assertEquals(false, mapKeyNames.hasNext()); elementCollectionMapping2_0.setSpecifiedTargetClass("Address"); - mapKeyNames = elementCollectionMapping2_0.candidateMapKeyNames(); + mapKeyNames = elementCollectionMapping2_0.getCandidateMapKeyNames().iterator(); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); assertEquals("state.name", mapKeyNames.next()); @@ -923,7 +923,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests assertFalse(mapKeyNames.hasNext()); elementCollectionMapping2_0.setSpecifiedTargetClass("String"); - mapKeyNames = elementCollectionMapping2_0.candidateMapKeyNames(); + mapKeyNames = elementCollectionMapping2_0.getCandidateMapKeyNames().iterator(); assertEquals(false, mapKeyNames.hasNext()); } @@ -2067,6 +2067,6 @@ public class EclipseLink2_0JavaElementCollectionMappingTests //If there is a StackOverflowError you will not be able to get the mapping JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().getAttributeNamed("elementCollection").getMapping(); - assertFalse(elementCollectionMapping.allOverridableAttributeMappingNames().hasNext()); + assertFalse(elementCollectionMapping.getAllOverridableAttributeMappingNames().iterator().hasNext()); } } diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaEntityTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaEntityTests.java index 1e520f001b..4b9896219d 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaEntityTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaEntityTests.java @@ -350,13 +350,13 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<String> overridableAttributes = getJavaEntity().overridableAttributeNames(); + Iterator<String> overridableAttributes = getJavaEntity().getOverridableAttributeNames().iterator(); assertFalse(overridableAttributes.hasNext()); getJavaEntity().setSpecifiedInheritanceStrategy(InheritanceType.TABLE_PER_CLASS); - overridableAttributes = getJavaEntity().overridableAttributeNames(); + overridableAttributes = getJavaEntity().getOverridableAttributeNames().iterator(); assertEquals("id", overridableAttributes.next()); assertEquals("name", overridableAttributes.next()); assertFalse(overridableAttributes.hasNext()); @@ -366,13 +366,13 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<String> overridableAttributeNames = getJavaEntity().overridableAttributeNames(); + Iterator<String> overridableAttributeNames = getJavaEntity().getOverridableAttributeNames().iterator(); assertFalse(overridableAttributeNames.hasNext()); getJavaEntity().setSpecifiedInheritanceStrategy(InheritanceType.TABLE_PER_CLASS); - overridableAttributeNames = getJavaEntity().overridableAttributeNames(); + overridableAttributeNames = getJavaEntity().getOverridableAttributeNames().iterator(); assertEquals("id", overridableAttributeNames.next()); assertEquals("name", overridableAttributeNames.next()); assertFalse(overridableAttributeNames.hasNext()); @@ -384,7 +384,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<String> overridableAttributes = getJavaEntity().allOverridableAttributeNames(); + Iterator<String> overridableAttributes = getJavaEntity().getAllOverridableAttributeNames().iterator(); assertEquals("id", overridableAttributes.next()); assertEquals("name", overridableAttributes.next()); assertEquals("foo", overridableAttributes.next()); @@ -397,7 +397,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<String> overridableAttributes = getJavaEntity().allOverridableAttributeNames(); + Iterator<String> overridableAttributes = getJavaEntity().getAllOverridableAttributeNames().iterator(); assertEquals("id", overridableAttributes.next()); assertEquals("name", overridableAttributes.next()); assertEquals("foo", overridableAttributes.next()); @@ -407,7 +407,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes ListIterator<ClassRef> classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); JavaEntity abstractEntity = (JavaEntity) classRefs.next().getJavaPersistentType().getMapping(); - overridableAttributes = abstractEntity.allOverridableAttributeNames(); + overridableAttributes = abstractEntity.getAllOverridableAttributeNames().iterator(); assertEquals("id", overridableAttributes.next()); assertEquals("name", overridableAttributes.next()); assertEquals("foo", overridableAttributes.next()); @@ -420,7 +420,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<String> overridableAssociations = getJavaEntity().allOverridableAssociationNames(); + Iterator<String> overridableAssociations = getJavaEntity().getAllOverridableAssociationNames().iterator(); assertEquals("address", overridableAssociations.next()); assertEquals("address2", overridableAssociations.next()); assertEquals("address3", overridableAssociations.next()); @@ -431,7 +431,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes ListIterator<ClassRef> classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); JavaEntity abstractEntity = (JavaEntity) classRefs.next().getJavaPersistentType().getMapping(); - overridableAssociations = abstractEntity.allOverridableAssociationNames(); + overridableAssociations = abstractEntity.getAllOverridableAssociationNames().iterator(); assertEquals("address", overridableAssociations.next()); assertEquals("address2", overridableAssociations.next()); assertEquals("address3", overridableAssociations.next()); @@ -445,7 +445,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - Iterator<String> overridableAttributes = getJavaEntity().allOverridableAttributeNames(); + Iterator<String> overridableAttributes = getJavaEntity().getAllOverridableAttributeNames().iterator(); assertEquals("id", overridableAttributes.next()); assertEquals("name", overridableAttributes.next()); assertEquals("foo", overridableAttributes.next()); @@ -458,7 +458,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<String> overridableAttributeNames = getJavaEntity().allOverridableAttributeNames(); + Iterator<String> overridableAttributeNames = getJavaEntity().getAllOverridableAttributeNames().iterator(); assertEquals("id", overridableAttributeNames.next()); assertEquals("name", overridableAttributeNames.next()); assertEquals("foo", overridableAttributeNames.next()); @@ -923,7 +923,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<String> overridableAssociations = getJavaEntity().overridableAssociationNames(); + Iterator<String> overridableAssociations = getJavaEntity().getOverridableAssociationNames().iterator(); assertFalse(overridableAssociations.hasNext()); } @@ -931,7 +931,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<String> overridableAssociationNames = getJavaEntity().overridableAssociationNames(); + Iterator<String> overridableAssociationNames = getJavaEntity().getOverridableAssociationNames().iterator(); assertFalse(overridableAssociationNames.hasNext()); } @@ -942,7 +942,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<String> overridableAssociationNames = getJavaEntity().allOverridableAssociationNames(); + Iterator<String> overridableAssociationNames = getJavaEntity().getAllOverridableAssociationNames().iterator(); assertEquals("address", overridableAssociationNames.next()); assertEquals("address2", overridableAssociationNames.next()); assertEquals("address3", overridableAssociationNames.next()); @@ -956,7 +956,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - Iterator<String> overridableAssociations = getJavaEntity().allOverridableAssociationNames(); + Iterator<String> overridableAssociations = getJavaEntity().getAllOverridableAssociationNames().iterator(); assertEquals("address", overridableAssociations.next()); assertEquals("address2", overridableAssociations.next()); assertEquals("address3", overridableAssociations.next()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaManyToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaManyToManyMappingTests.java index 4f72f0730f..8cdee1a20a 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaManyToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaManyToManyMappingTests.java @@ -442,7 +442,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); Iterator<String> attributeNames = - manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames(); + manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator(); assertEquals("id", attributeNames.next()); assertEquals("city", attributeNames.next()); assertEquals("state", attributeNames.next()); @@ -454,12 +454,12 @@ public class EclipseLink2_0JavaManyToManyMappingTests manyToManyMapping.setSpecifiedTargetEntity("foo"); attributeNames = - manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames(); + manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator(); assertFalse(attributeNames.hasNext()); manyToManyMapping.setSpecifiedTargetEntity(null); attributeNames = - manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames(); + manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator(); assertEquals("id", attributeNames.next()); assertEquals("city", attributeNames.next()); assertEquals("state", attributeNames.next()); @@ -485,7 +485,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); Iterator<String> attributeNames = - manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames(); + manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator(); assertEquals("id", attributeNames.next()); assertEquals("city", attributeNames.next()); assertEquals("state", attributeNames.next()); @@ -496,12 +496,12 @@ public class EclipseLink2_0JavaManyToManyMappingTests manyToManyMapping.setSpecifiedTargetEntity("foo"); attributeNames = - manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames(); + manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator(); assertFalse(attributeNames.hasNext()); manyToManyMapping.setSpecifiedTargetEntity(null); attributeNames = - manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames(); + manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator(); assertEquals("id", attributeNames.next()); assertEquals("city", attributeNames.next()); assertEquals("state", attributeNames.next()); @@ -590,7 +590,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests ManyToManyMapping manyToManyMapping2_0 = (ManyToManyMapping) persistentAttribute.getMapping(); Iterator<String> mapKeyNames = - manyToManyMapping2_0.candidateMapKeyNames(); + manyToManyMapping2_0.getCandidateMapKeyNames().iterator(); assertEquals("id", mapKeyNames.next()); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); @@ -612,11 +612,11 @@ public class EclipseLink2_0JavaManyToManyMappingTests PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping2_0 = (ManyToManyMapping) persistentAttribute.getMapping(); - Iterator<String> mapKeyNames = manyToManyMapping2_0.candidateMapKeyNames(); + Iterator<String> mapKeyNames = manyToManyMapping2_0.getCandidateMapKeyNames().iterator(); assertEquals(false, mapKeyNames.hasNext()); manyToManyMapping2_0.setSpecifiedTargetEntity("Address"); - mapKeyNames = manyToManyMapping2_0.candidateMapKeyNames(); + mapKeyNames = manyToManyMapping2_0.getCandidateMapKeyNames().iterator(); assertEquals("id", mapKeyNames.next()); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); @@ -627,7 +627,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests assertFalse(mapKeyNames.hasNext()); manyToManyMapping2_0.setSpecifiedTargetEntity("String"); - mapKeyNames = manyToManyMapping2_0.candidateMapKeyNames(); + mapKeyNames = manyToManyMapping2_0.getCandidateMapKeyNames().iterator(); assertEquals(false, mapKeyNames.hasNext()); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaOneToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaOneToManyMappingTests.java index ccfde75502..691f934b40 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaOneToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaOneToManyMappingTests.java @@ -543,7 +543,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests JavaOneToManyMapping javaOneToManyMapping = (JavaOneToManyMapping) getJavaPersistentType().getAttributeNamed("addresses").getMapping(); Iterator<String> mapKeyNames = - javaOneToManyMapping.candidateMapKeyNames(); + javaOneToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals("id", mapKeyNames.next()); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); @@ -565,11 +565,11 @@ public class EclipseLink2_0JavaOneToManyMappingTests JavaOneToManyMapping javaOneToManyMapping = (JavaOneToManyMapping) getJavaPersistentType().getAttributeNamed("addresses").getMapping(); - Iterator<String> mapKeyNames = javaOneToManyMapping.candidateMapKeyNames(); + Iterator<String> mapKeyNames = javaOneToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals(false, mapKeyNames.hasNext()); javaOneToManyMapping.setSpecifiedTargetEntity("test.Address"); - mapKeyNames = javaOneToManyMapping.candidateMapKeyNames(); + mapKeyNames = javaOneToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals("id", mapKeyNames.next()); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaOneToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaOneToOneMappingTests.java index 97a7df409a..e401729e91 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaOneToOneMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaOneToOneMappingTests.java @@ -431,7 +431,7 @@ public class EclipseLink2_0JavaOneToOneMappingTests OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); Iterator<String> attributeNames = - oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames(); + oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator(); assertEquals("id", attributeNames.next()); assertEquals("city", attributeNames.next()); assertEquals("state", attributeNames.next()); @@ -442,12 +442,12 @@ public class EclipseLink2_0JavaOneToOneMappingTests oneToOneMapping.setSpecifiedTargetEntity("foo"); attributeNames = - oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames(); + oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator(); assertFalse(attributeNames.hasNext()); oneToOneMapping.setSpecifiedTargetEntity(null); attributeNames = - oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames(); + oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator(); assertEquals("id", attributeNames.next()); assertEquals("city", attributeNames.next()); assertEquals("state", attributeNames.next()); @@ -472,7 +472,7 @@ public class EclipseLink2_0JavaOneToOneMappingTests OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); Iterator<String> attributeNames = - oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames(); + oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator(); assertEquals("id", attributeNames.next()); assertEquals("city", attributeNames.next()); assertEquals("state", attributeNames.next()); @@ -483,12 +483,12 @@ public class EclipseLink2_0JavaOneToOneMappingTests oneToOneMapping.setSpecifiedTargetEntity("foo"); attributeNames = - oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames(); + oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator(); assertFalse(attributeNames.hasNext()); oneToOneMapping.setSpecifiedTargetEntity(null); attributeNames = - oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames(); + oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator(); assertEquals("id", attributeNames.next()); assertEquals("city", attributeNames.next()); assertEquals("state", attributeNames.next()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java index a92ff3cfb2..675815dc1a 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java @@ -784,7 +784,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests extends EclipseLink2 ElementCollectionMapping2_0 virtualElementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentType.getAttributeNamed("addresses").getMapping(); Iterator<String> mapKeyNames = - virtualElementCollectionMapping.candidateMapKeyNames(); + virtualElementCollectionMapping.getCandidateMapKeyNames().iterator(); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); assertEquals("state.name", mapKeyNames.next()); @@ -805,11 +805,11 @@ public class EclipseLink2_0OrmElementCollectionMappingTests extends EclipseLink2 ElementCollectionMapping2_0 virtualElementCollectionMapping = (ElementCollectionMapping2_0) attribute.getMapping(); JavaElementCollectionMapping2_0 javaElementCollectionMapping = (JavaElementCollectionMapping2_0) ormPersistentType.getJavaPersistentType().getAttributeNamed("addresses").getMapping(); - Iterator<String> mapKeyNames = virtualElementCollectionMapping.candidateMapKeyNames(); + Iterator<String> mapKeyNames = virtualElementCollectionMapping.getCandidateMapKeyNames().iterator(); assertEquals(false, mapKeyNames.hasNext()); javaElementCollectionMapping.setSpecifiedTargetClass("test.Address"); - mapKeyNames = virtualElementCollectionMapping.candidateMapKeyNames(); + mapKeyNames = virtualElementCollectionMapping.getCandidateMapKeyNames().iterator(); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); assertEquals("state.name", mapKeyNames.next()); @@ -819,11 +819,11 @@ public class EclipseLink2_0OrmElementCollectionMappingTests extends EclipseLink2 attribute.convertToSpecified(); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentType.getAttributeNamed("addresses").getMapping(); - mapKeyNames = ormElementCollectionMapping.candidateMapKeyNames(); + mapKeyNames = ormElementCollectionMapping.getCandidateMapKeyNames().iterator(); assertEquals(false, mapKeyNames.hasNext()); ormElementCollectionMapping.setSpecifiedTargetClass("test.Address"); - mapKeyNames = ormElementCollectionMapping.candidateMapKeyNames(); + mapKeyNames = ormElementCollectionMapping.getCandidateMapKeyNames().iterator(); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); assertEquals("state.name", mapKeyNames.next()); @@ -832,7 +832,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests extends EclipseLink2 assertFalse(mapKeyNames.hasNext()); ormElementCollectionMapping.setSpecifiedTargetClass("String"); - mapKeyNames = ormElementCollectionMapping.candidateMapKeyNames(); + mapKeyNames = ormElementCollectionMapping.getCandidateMapKeyNames().iterator(); assertEquals(false, mapKeyNames.hasNext()); } @@ -1441,6 +1441,6 @@ public class EclipseLink2_0OrmElementCollectionMappingTests extends EclipseLink2 OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Foo"); ElementCollectionMapping2_0 mapping = (ElementCollectionMapping2_0) persistentType.getAttributeNamed("elementCollection").getMapping(); - assertFalse(mapping.allOverridableAttributeMappingNames().hasNext()); + assertFalse(mapping.getAllOverridableAttributeMappingNames().iterator().hasNext()); } }
\ No newline at end of file diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmEntityTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmEntityTests.java index 2ee3a207bb..b005c63f7f 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmEntityTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmEntityTests.java @@ -340,13 +340,13 @@ public class EclipseLink2_0OrmEntityTests extends EclipseLink2_0OrmContextModelT OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmEntity entity = (OrmEntity) ormPersistentType.getMapping(); - Iterator<String> overridableAttributes = entity.overridableAttributeNames(); + Iterator<String> overridableAttributes = entity.getOverridableAttributeNames().iterator(); assertFalse(overridableAttributes.hasNext()); entity.setSpecifiedInheritanceStrategy(InheritanceType.TABLE_PER_CLASS); - overridableAttributes = entity.overridableAttributeNames(); + overridableAttributes = entity.getOverridableAttributeNames().iterator(); assertEquals("id", overridableAttributes.next()); assertEquals("name", overridableAttributes.next()); assertFalse(overridableAttributes.hasNext()); @@ -357,13 +357,13 @@ public class EclipseLink2_0OrmEntityTests extends EclipseLink2_0OrmContextModelT OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmEntity entity = (OrmEntity) ormPersistentType.getMapping(); - Iterator<String> overridableAttributeNames = entity.overridableAttributeNames(); + Iterator<String> overridableAttributeNames = entity.getOverridableAttributeNames().iterator(); assertFalse(overridableAttributeNames.hasNext()); entity.setSpecifiedInheritanceStrategy(InheritanceType.TABLE_PER_CLASS); - overridableAttributeNames = entity.overridableAttributeNames(); + overridableAttributeNames = entity.getOverridableAttributeNames().iterator(); assertEquals("id", overridableAttributeNames.next()); assertEquals("name", overridableAttributeNames.next()); assertFalse(overridableAttributeNames.hasNext()); @@ -375,7 +375,7 @@ public class EclipseLink2_0OrmEntityTests extends EclipseLink2_0OrmContextModelT addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<String> overridableAttributes = getJavaEntity().allOverridableAttributeNames(); + Iterator<String> overridableAttributes = getJavaEntity().getAllOverridableAttributeNames().iterator(); assertEquals("id", overridableAttributes.next()); assertEquals("name", overridableAttributes.next()); assertEquals("foo", overridableAttributes.next()); @@ -389,7 +389,7 @@ public class EclipseLink2_0OrmEntityTests extends EclipseLink2_0OrmContextModelT getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); - Iterator<String> overridableAttributes = ormEntity.allOverridableAttributeNames(); + Iterator<String> overridableAttributes = ormEntity.getAllOverridableAttributeNames().iterator(); assertEquals("id", overridableAttributes.next()); assertEquals("name", overridableAttributes.next()); assertEquals("foo", overridableAttributes.next()); @@ -397,7 +397,7 @@ public class EclipseLink2_0OrmEntityTests extends EclipseLink2_0OrmContextModelT OrmEntity abstractEntity = (OrmEntity) ormEntity.getParentEntity(); - overridableAttributes = abstractEntity.allOverridableAttributeNames(); + overridableAttributes = abstractEntity.getAllOverridableAttributeNames().iterator(); assertEquals("id", overridableAttributes.next()); assertEquals("name", overridableAttributes.next()); assertEquals("foo", overridableAttributes.next()); @@ -411,7 +411,7 @@ public class EclipseLink2_0OrmEntityTests extends EclipseLink2_0OrmContextModelT getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); - Iterator<String> overridableAssociations = ormEntity.allOverridableAssociationNames(); + Iterator<String> overridableAssociations = ormEntity.getAllOverridableAssociationNames().iterator(); assertEquals("address", overridableAssociations.next()); assertEquals("address2", overridableAssociations.next()); assertEquals("address3", overridableAssociations.next()); @@ -420,7 +420,7 @@ public class EclipseLink2_0OrmEntityTests extends EclipseLink2_0OrmContextModelT OrmEntity abstractEntity = (OrmEntity) ormEntity.getParentEntity(); - overridableAssociations = abstractEntity.allOverridableAssociationNames(); + overridableAssociations = abstractEntity.getAllOverridableAssociationNames().iterator(); assertEquals("address", overridableAssociations.next()); assertEquals("address2", overridableAssociations.next()); assertEquals("address3", overridableAssociations.next()); @@ -448,7 +448,7 @@ public class EclipseLink2_0OrmEntityTests extends EclipseLink2_0OrmContextModelT getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); - Iterator<String> overridableAttributeNames = ormEntity.allOverridableAttributeNames(); + Iterator<String> overridableAttributeNames = ormEntity.getAllOverridableAttributeNames().iterator(); assertEquals("id", overridableAttributeNames.next()); assertEquals("name", overridableAttributeNames.next()); assertEquals("foo", overridableAttributeNames.next()); @@ -886,7 +886,7 @@ public class EclipseLink2_0OrmEntityTests extends EclipseLink2_0OrmContextModelT OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "test.AnnotationTestTypeChild"); OrmEntity entity = (OrmEntity) ormPersistentType.getMapping(); - Iterator<String> overridableAssociationNames = entity.overridableAssociationNames(); + Iterator<String> overridableAssociationNames = entity.getOverridableAssociationNames().iterator(); assertFalse(overridableAssociationNames.hasNext()); } @@ -898,7 +898,7 @@ public class EclipseLink2_0OrmEntityTests extends EclipseLink2_0OrmContextModelT getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); - Iterator<String> overridableAssociationNames = ormEntity.allOverridableAssociationNames(); + Iterator<String> overridableAssociationNames = ormEntity.getAllOverridableAssociationNames().iterator(); assertEquals("address", overridableAssociationNames.next()); assertEquals("address2", overridableAssociationNames.next()); assertEquals("address3", overridableAssociationNames.next()); @@ -913,7 +913,7 @@ public class EclipseLink2_0OrmEntityTests extends EclipseLink2_0OrmContextModelT getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); - Iterator<String> overridableAssociations = ormEntity.allOverridableAssociationNames(); + Iterator<String> overridableAssociations = ormEntity.getAllOverridableAssociationNames().iterator(); assertEquals("address", overridableAssociations.next()); assertEquals("address2", overridableAssociations.next()); assertEquals("address3", overridableAssociations.next()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmManyToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmManyToManyMappingTests.java index eb4a17332c..3b016d2ef4 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmManyToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmManyToManyMappingTests.java @@ -255,7 +255,7 @@ public class EclipseLink2_0OrmManyToManyMappingTests ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); Iterator<String> attributeNames = - manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames(); + manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator(); assertEquals("id", attributeNames.next()); assertEquals("city", attributeNames.next()); assertEquals("state", attributeNames.next()); @@ -266,12 +266,12 @@ public class EclipseLink2_0OrmManyToManyMappingTests manyToManyMapping.setSpecifiedTargetEntity("foo"); attributeNames = - manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames(); + manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator(); assertFalse(attributeNames.hasNext()); manyToManyMapping.setSpecifiedTargetEntity(null); attributeNames = - manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames(); + manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator(); assertEquals("id", attributeNames.next()); assertEquals("city", attributeNames.next()); assertEquals("state", attributeNames.next()); @@ -301,7 +301,7 @@ public class EclipseLink2_0OrmManyToManyMappingTests ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); Iterator<String> attributeNames = - manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames(); + manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator(); assertEquals("id", attributeNames.next()); assertEquals("city", attributeNames.next()); assertEquals("state", attributeNames.next()); @@ -312,12 +312,12 @@ public class EclipseLink2_0OrmManyToManyMappingTests manyToManyMapping.setSpecifiedTargetEntity("foo"); attributeNames = - manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames(); + manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator(); assertFalse(attributeNames.hasNext()); manyToManyMapping.setSpecifiedTargetEntity(null); attributeNames = - manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames(); + manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator(); assertEquals("id", attributeNames.next()); assertEquals("city", attributeNames.next()); assertEquals("state", attributeNames.next()); @@ -427,7 +427,7 @@ public class EclipseLink2_0OrmManyToManyMappingTests ManyToManyMapping virtualManyToManyMapping = (ManyToManyMapping) ormPersistentType.getAttributeNamed("addresses").getMapping(); Iterator<String> mapKeyNames = - virtualManyToManyMapping.candidateMapKeyNames(); + virtualManyToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals("id", mapKeyNames.next()); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); @@ -449,11 +449,11 @@ public class EclipseLink2_0OrmManyToManyMappingTests ManyToManyMapping virtualManyToManyMapping = (ManyToManyMapping) ormPersistentType.getAttributeNamed("addresses").getMapping(); JavaManyToManyMapping javaManyToManyMapping = (JavaManyToManyMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("addresses").getMapping(); - Iterator<String> mapKeyNames = virtualManyToManyMapping.candidateMapKeyNames(); + Iterator<String> mapKeyNames = virtualManyToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals(false, mapKeyNames.hasNext()); javaManyToManyMapping.setSpecifiedTargetEntity("test.Address"); - mapKeyNames = virtualManyToManyMapping.candidateMapKeyNames(); + mapKeyNames = virtualManyToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals("id", mapKeyNames.next()); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); @@ -464,11 +464,11 @@ public class EclipseLink2_0OrmManyToManyMappingTests ormPersistentType.getAttributeNamed("addresses").convertToSpecified(); OrmManyToManyMapping specifiedManyToManyMapping = (OrmManyToManyMapping) ormPersistentType.getAttributeNamed("addresses").getMapping(); - mapKeyNames = specifiedManyToManyMapping.candidateMapKeyNames(); + mapKeyNames = specifiedManyToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals(false, mapKeyNames.hasNext()); specifiedManyToManyMapping.setSpecifiedTargetEntity("test.Address"); - mapKeyNames = specifiedManyToManyMapping.candidateMapKeyNames(); + mapKeyNames = specifiedManyToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals("id", mapKeyNames.next()); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); @@ -478,7 +478,7 @@ public class EclipseLink2_0OrmManyToManyMappingTests assertFalse(mapKeyNames.hasNext()); specifiedManyToManyMapping.setSpecifiedTargetEntity("String"); - mapKeyNames = specifiedManyToManyMapping.candidateMapKeyNames(); + mapKeyNames = specifiedManyToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals(false, mapKeyNames.hasNext()); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmMappedSuperclassTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmMappedSuperclassTests.java index 99ea27f12a..92809bac2b 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmMappedSuperclassTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmMappedSuperclassTests.java @@ -1526,7 +1526,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertEquals(0, resourceMappedSuperclass.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlConverter resourceConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlConverter(); @@ -1540,7 +1540,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); assertEquals(1, resourceMappedSuperclass.getConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlConverter resourceConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlConverter(); @@ -1557,7 +1557,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); assertEquals(2, resourceMappedSuperclass.getConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceMappedSuperclass.getConverters().move(0, 1); @@ -1571,7 +1571,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); assertEquals(2, resourceMappedSuperclass.getConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getConverters().remove(0); @@ -1582,7 +1582,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); assertEquals(1, resourceMappedSuperclass.getConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getConverters().remove(resourceConverter2); @@ -1590,7 +1590,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertFalse(ormContextConverterHolder.getCustomConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyCustomConverters() throws Exception { @@ -1603,7 +1603,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertEquals(0, resourceMappedSuperclass.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkCustomConverter contextConverter = ormContextConverterHolder.addCustomConverter(0); @@ -1618,7 +1618,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon EclipseLinkCustomConverter ormContextConverter = ormContextConverters.next(); assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkCustomConverter contextConverter2 = ormContextConverterHolder.addCustomConverter(0); @@ -1638,7 +1638,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon ormContextConverter = ormContextConverters.next(); assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveCustomConverter(0, 1); @@ -1656,7 +1656,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon ormContextConverter = ormContextConverters.next(); assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeCustomConverter(0); @@ -1669,7 +1669,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon ormContextConverter = ormContextConverters.next(); assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeCustomConverter(contextConverter2); @@ -1677,7 +1677,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertFalse(ormContextConverterHolder.getCustomConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateTypeConverters() throws Exception { @@ -1690,7 +1690,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertEquals(0, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlTypeConverter resourceTypeConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverter(); @@ -1704,7 +1704,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); assertEquals(1, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlTypeConverter resourceTypeConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverter(); @@ -1721,7 +1721,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); assertEquals(2, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceMappedSuperclass.getTypeConverters().move(0, 1); @@ -1735,7 +1735,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); assertEquals(2, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getTypeConverters().remove(0); @@ -1746,7 +1746,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); assertEquals(1, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getTypeConverters().remove(resourceTypeConverter2); @@ -1754,7 +1754,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertFalse(ormContextConverterHolder.getTypeConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyTypeConverters() throws Exception { @@ -1767,7 +1767,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertEquals(0, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkTypeConverter contextTypeConverter = ormContextConverterHolder.addTypeConverter(0); @@ -1782,7 +1782,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon EclipseLinkTypeConverter ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkTypeConverter contextTypeConverter2 = ormContextConverterHolder.addTypeConverter(0); @@ -1802,7 +1802,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveTypeConverter(0, 1); @@ -1820,7 +1820,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeTypeConverter(0); @@ -1833,7 +1833,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeTypeConverter(contextTypeConverter2); @@ -1841,7 +1841,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertFalse(ormContextConverterHolder.getTypeConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateObjectTypeConverters() throws Exception { @@ -1854,7 +1854,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertEquals(0, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlObjectTypeConverter resourceObjectTypeConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverter(); @@ -1868,7 +1868,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); assertEquals(1, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlObjectTypeConverter resourceObjectTypeConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverter(); @@ -1885,7 +1885,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); assertEquals(2, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceMappedSuperclass.getObjectTypeConverters().move(0, 1); @@ -1899,7 +1899,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); assertEquals(2, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getObjectTypeConverters().remove(0); @@ -1910,7 +1910,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); assertEquals(1, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getObjectTypeConverters().remove(resourceObjectTypeConverter2); @@ -1918,7 +1918,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertFalse(ormContextConverterHolder.getObjectTypeConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyObjectTypeConverters() throws Exception { @@ -1931,7 +1931,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertEquals(0, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkObjectTypeConverter contextObjectTypeConverter = ormContextConverterHolder.addObjectTypeConverter(0); @@ -1946,7 +1946,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon EclipseLinkObjectTypeConverter ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkObjectTypeConverter contextObjectTypeConverter2 = ormContextConverterHolder.addObjectTypeConverter(0); @@ -1966,7 +1966,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveObjectTypeConverter(0, 1); @@ -1984,7 +1984,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeObjectTypeConverter(0); @@ -1997,7 +1997,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeObjectTypeConverter(contextObjectTypeConverter2); @@ -2005,7 +2005,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertFalse(ormContextConverterHolder.getObjectTypeConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateStructConverters() throws Exception { @@ -2018,7 +2018,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertEquals(0, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlStructConverter resourceStructConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverter(); @@ -2032,7 +2032,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); assertEquals(1, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlStructConverter resourceStructConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverter(); @@ -2049,7 +2049,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); assertEquals(2, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceMappedSuperclass.getStructConverters().move(0, 1); @@ -2063,7 +2063,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); assertEquals(2, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getStructConverters().remove(0); @@ -2074,7 +2074,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); assertEquals(1, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getStructConverters().remove(resourceStructConverter2); @@ -2082,7 +2082,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertFalse(ormContextConverterHolder.getStructConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyStructConverters() throws Exception { @@ -2095,7 +2095,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertEquals(0, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkStructConverter contextStructConverter = ormContextConverterHolder.addStructConverter(0); @@ -2110,7 +2110,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon EclipseLinkStructConverter ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkStructConverter contextStructConverter2 = ormContextConverterHolder.addStructConverter(0); @@ -2130,7 +2130,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveStructConverter(0, 1); @@ -2148,7 +2148,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeStructConverter(0); @@ -2161,7 +2161,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeStructConverter(contextStructConverter2); @@ -2169,7 +2169,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertFalse(ormContextConverterHolder.getStructConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testSetSpecifiedCacheable() throws Exception { diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmOneToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmOneToManyMappingTests.java index 7e36b6f41c..3642b60abc 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmOneToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmOneToManyMappingTests.java @@ -336,7 +336,7 @@ public class EclipseLink2_0OrmOneToManyMappingTests OneToManyMapping virtualOneToManyMapping = (OneToManyMapping) ormPersistentType.getAttributeNamed("addresses").getMapping(); Iterator<String> mapKeyNames = - virtualOneToManyMapping.candidateMapKeyNames(); + virtualOneToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals("id", mapKeyNames.next()); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); @@ -358,11 +358,11 @@ public class EclipseLink2_0OrmOneToManyMappingTests OneToManyMapping virtualOneToManyMapping = (OneToManyMapping) ormPersistentType.getAttributeNamed("addresses").getMapping(); JavaOneToManyMapping javaOneToManyMapping = (JavaOneToManyMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("addresses").getMapping(); - Iterator<String> mapKeyNames = virtualOneToManyMapping.candidateMapKeyNames(); + Iterator<String> mapKeyNames = virtualOneToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals(false, mapKeyNames.hasNext()); javaOneToManyMapping.setSpecifiedTargetEntity("test.Address"); - mapKeyNames = virtualOneToManyMapping.candidateMapKeyNames(); + mapKeyNames = virtualOneToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals("id", mapKeyNames.next()); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); @@ -373,11 +373,11 @@ public class EclipseLink2_0OrmOneToManyMappingTests ormPersistentType.getAttributeNamed("addresses").convertToSpecified(); OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentType.getAttributeNamed("addresses").getMapping(); - mapKeyNames = ormOneToManyMapping.candidateMapKeyNames(); + mapKeyNames = ormOneToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals(false, mapKeyNames.hasNext()); ormOneToManyMapping.setSpecifiedTargetEntity("test.Address"); - mapKeyNames = ormOneToManyMapping.candidateMapKeyNames(); + mapKeyNames = ormOneToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals("id", mapKeyNames.next()); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); @@ -387,7 +387,7 @@ public class EclipseLink2_0OrmOneToManyMappingTests assertFalse(mapKeyNames.hasNext()); ormOneToManyMapping.setSpecifiedTargetEntity("String"); - mapKeyNames = ormOneToManyMapping.candidateMapKeyNames(); + mapKeyNames = ormOneToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals(false, mapKeyNames.hasNext()); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmOneToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmOneToOneMappingTests.java index 8a36665aa1..5cae3a36dd 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmOneToOneMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmOneToOneMappingTests.java @@ -419,7 +419,7 @@ public class EclipseLink2_0OrmOneToOneMappingTests OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); Iterator<String> attributeNames = - oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames(); + oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator(); assertEquals("id", attributeNames.next()); assertEquals("city", attributeNames.next()); assertEquals("state", attributeNames.next()); @@ -430,12 +430,12 @@ public class EclipseLink2_0OrmOneToOneMappingTests oneToOneMapping.setSpecifiedTargetEntity("foo"); attributeNames = - oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames(); + oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator(); assertFalse(attributeNames.hasNext()); oneToOneMapping.setSpecifiedTargetEntity(null); attributeNames = - oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames(); + oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator(); assertEquals("id", attributeNames.next()); assertEquals("city", attributeNames.next()); assertEquals("state", attributeNames.next()); @@ -465,7 +465,7 @@ public class EclipseLink2_0OrmOneToOneMappingTests OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); Iterator<String> attributeNames = - oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames(); + oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator(); assertEquals("id", attributeNames.next()); assertEquals("city", attributeNames.next()); assertEquals("state", attributeNames.next()); @@ -476,12 +476,12 @@ public class EclipseLink2_0OrmOneToOneMappingTests oneToOneMapping.setSpecifiedTargetEntity("foo"); attributeNames = - oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames(); + oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator(); assertFalse(attributeNames.hasNext()); oneToOneMapping.setSpecifiedTargetEntity(null); attributeNames = - oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames(); + oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator(); assertEquals("id", attributeNames.next()); assertEquals("city", attributeNames.next()); assertEquals("state", attributeNames.next()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/persistence/EclipseLink2_0OptionsTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/persistence/EclipseLink2_0OptionsTests.java index f1e676a7b8..dfee68d6ec 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/persistence/EclipseLink2_0OptionsTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/persistence/EclipseLink2_0OptionsTests.java @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright (c) 2009, 2010 Oracle. All rights reserved. +* Copyright (c) 2009, 2011 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -110,15 +110,15 @@ public class EclipseLink2_0OptionsTests extends EclipseLink2_0PersistenceUnitTes else if (propertyName.equals(Options2_0.QUERY_TIMEOUT_PROPERTY)) modelValue = this.options.getQueryTimeout(); else if (propertyName.equals(Options2_0.VALIDATION_GROUP_PRE_PERSIST_PROPERTY)) { - ListIterator<String> iterator = this.options.validationGroupPrePersists(); + ListIterator<String> iterator = this.options.getValidationGroupPrePersists().iterator(); modelValue = this.getFirstElement(iterator); } else if (propertyName.equals(Options2_0.VALIDATION_GROUP_PRE_UPDATE_PROPERTY)) { - ListIterator<String> iterator = this.options.validationGroupPreUpdates(); + ListIterator<String> iterator = this.options.getValidationGroupPreUpdates().iterator(); modelValue = this.getFirstElement(iterator); } else if (propertyName.equals(Options2_0.VALIDATION_GROUP_PRE_REMOVE_PROPERTY)) { - ListIterator<String> iterator = this.options.validationGroupPreRemoves(); + ListIterator<String> iterator = this.options.getValidationGroupPreRemoves().iterator(); modelValue = this.getFirstElement(iterator); } else @@ -493,11 +493,11 @@ public class EclipseLink2_0OptionsTests extends EclipseLink2_0PersistenceUnitTes private int getValidationGroupSize(String propertyName) throws NoSuchFieldException { int result = 0; if (propertyName.equals(Options2_0.VALIDATION_GROUP_PRE_PERSIST_PROPERTY)) - result = this.options.validationGroupPrePersistsSize(); + result = this.options.getValidationGroupPrePersistsSize(); else if (propertyName.equals(Options2_0.VALIDATION_GROUP_PRE_UPDATE_PROPERTY)) - result = this.options.validationGroupPreUpdatesSize(); + result = this.options.getValidationGroupPreUpdatesSize(); else if (propertyName.equals(Options2_0.VALIDATION_GROUP_PRE_REMOVE_PROPERTY)) - result = this.options.validationGroupPreRemovesSize(); + result = this.options.getValidationGroupPreRemovesSize(); else this.throwMissingDefinition("verifyValidationGroupSize", propertyName); return result; |