diff options
Diffstat (limited to 'jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmEntity2_0Tests.java')
| -rw-r--r-- | jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmEntity2_0Tests.java | 290 |
1 files changed, 145 insertions, 145 deletions
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmEntity2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmEntity2_0Tests.java index 9a9268ed11..7e997b5020 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmEntity2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmEntity2_0Tests.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. @@ -361,12 +361,12 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase assertEquals(LockModeType2_0.WRITE, this.lockModeOf(resourceQuery)); assertEquals("FOO", entityResource.getNamedQueries().get(2).getName()); - ListIterator<OrmNamedQuery> namedQueries = ormEntity.getQueryContainer().namedQueries(); + ListIterator<OrmNamedQuery> namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); assertEquals(namedQuery2, namedQueries.next()); assertEquals(namedQuery3, namedQueries.next()); assertEquals(namedQuery, namedQueries.next()); - namedQueries = ormEntity.getQueryContainer().namedQueries(); + namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); @@ -424,7 +424,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase ormEntity.getQueryContainer().moveNamedQuery(2, 0); - ListIterator<OrmNamedQuery> namedQueries = ormEntity.getQueryContainer().namedQueries(); + ListIterator<OrmNamedQuery> namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); namedQuery1 = (OrmNamedQuery2_0) namedQueries.next(); assertEquals("BAR", namedQuery1.getName()); assertEquals(LockModeType2_0.OPTIMISTIC, namedQuery1.getLockMode()); @@ -439,7 +439,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase ormEntity.getQueryContainer().moveNamedQuery(0, 1); - namedQueries = ormEntity.getQueryContainer().namedQueries(); + namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAZ", namedQueries.next().getName()); namedQuery1 = (OrmNamedQuery2_0) namedQueries.next(); assertEquals("BAR", namedQuery1.getName()); @@ -457,7 +457,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmEntity ormEntity = (OrmEntity) persistentType.getMapping(); - assertEquals(0, ormEntity.getPersistenceUnit().queriesSize()); + assertEquals(0, ormEntity.getPersistenceUnit().getQueriesSize()); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); entityResource.getNamedQueries().add(OrmFactory.eINSTANCE.createXmlNamedQuery()); @@ -469,17 +469,17 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase xmlQuery.setName("BAZ"); xmlQuery.setLockMode(org.eclipse.jpt.jpa.core.resource.orm.v2_0.LockModeType_2_0.OPTIMISTIC); - ListIterator<OrmNamedQuery> namedQueries = ormEntity.getQueryContainer().namedQueries(); + ListIterator<OrmNamedQuery> namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); assertEquals("FOO", namedQueries.next().getName()); assertEquals("BAR", namedQueries.next().getName()); OrmNamedQuery2_0 namedQuery1 = (OrmNamedQuery2_0) namedQueries.next(); assertEquals("BAZ", namedQuery1.getName()); assertEquals(LockModeType2_0.OPTIMISTIC, namedQuery1.getLockMode()); assertFalse(namedQueries.hasNext()); - assertEquals(3, ormEntity.getPersistenceUnit().queriesSize()); + assertEquals(3, ormEntity.getPersistenceUnit().getQueriesSize()); entityResource.getNamedQueries().move(2, 0); - namedQueries = ormEntity.getQueryContainer().namedQueries(); + namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAR", namedQueries.next().getName()); namedQuery1 = (OrmNamedQuery2_0) namedQueries.next(); assertEquals("BAZ", namedQuery1.getName()); @@ -488,7 +488,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase assertFalse(namedQueries.hasNext()); entityResource.getNamedQueries().move(0, 1); - namedQueries = ormEntity.getQueryContainer().namedQueries(); + namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); namedQuery1 = (OrmNamedQuery2_0) namedQueries.next(); assertEquals("BAZ", namedQuery1.getName()); assertEquals(LockModeType2_0.OPTIMISTIC, namedQuery1.getLockMode()); @@ -497,25 +497,25 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase assertFalse(namedQueries.hasNext()); entityResource.getNamedQueries().remove(1); - namedQueries = ormEntity.getQueryContainer().namedQueries(); + namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); namedQuery1 = (OrmNamedQuery2_0) namedQueries.next(); assertEquals("BAZ", namedQuery1.getName()); assertEquals(LockModeType2_0.OPTIMISTIC, namedQuery1.getLockMode()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(2, ormEntity.getPersistenceUnit().queriesSize()); + assertEquals(2, ormEntity.getPersistenceUnit().getQueriesSize()); entityResource.getNamedQueries().remove(1); - namedQueries = ormEntity.getQueryContainer().namedQueries(); + namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); namedQuery1 = (OrmNamedQuery2_0) namedQueries.next(); assertEquals("BAZ", namedQuery1.getName()); assertEquals(LockModeType2_0.OPTIMISTIC, namedQuery1.getLockMode()); assertFalse(namedQueries.hasNext()); - assertEquals(1, ormEntity.getPersistenceUnit().queriesSize()); + assertEquals(1, ormEntity.getPersistenceUnit().getQueriesSize()); entityResource.getNamedQueries().remove(0); - assertFalse(ormEntity.getQueryContainer().namedQueries().hasNext()); - assertEquals(0, ormEntity.getPersistenceUnit().queriesSize()); + assertFalse(ormEntity.getQueryContainer().getNamedQueries().iterator().hasNext()); + assertEquals(0, ormEntity.getPersistenceUnit().getQueriesSize()); } @@ -662,7 +662,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity entity = (OrmEntity) ormPersistentType.getMapping(); OrmAttributeOverrideContainer overrideContainer = entity.getAttributeOverrideContainer(); - ListIterator<OrmAttributeOverride> specifiedAttributeOverrides = overrideContainer.specifiedOverrides(); + ListIterator<OrmAttributeOverride> specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAttributeOverrides.hasNext()); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); @@ -670,13 +670,13 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase //add an annotation to the resource model and verify the context model is updated entityResource.getAttributeOverrides().add(0, OrmFactory.eINSTANCE.createXmlAttributeOverride()); entityResource.getAttributeOverrides().get(0).setName("FOO"); - specifiedAttributeOverrides = overrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); entityResource.getAttributeOverrides().add(1, OrmFactory.eINSTANCE.createXmlAttributeOverride()); entityResource.getAttributeOverrides().get(1).setName("BAR"); - specifiedAttributeOverrides = overrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); @@ -684,7 +684,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase entityResource.getAttributeOverrides().add(0, OrmFactory.eINSTANCE.createXmlAttributeOverride()); entityResource.getAttributeOverrides().get(0).setName("BAZ"); - specifiedAttributeOverrides = overrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); @@ -692,25 +692,25 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase //move an annotation to the resource model and verify the context model is updated entityResource.getAttributeOverrides().move(1, 0); - specifiedAttributeOverrides = overrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); entityResource.getAttributeOverrides().remove(0); - specifiedAttributeOverrides = overrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); entityResource.getAttributeOverrides().remove(0); - specifiedAttributeOverrides = overrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); entityResource.getAttributeOverrides().remove(0); - specifiedAttributeOverrides = overrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAttributeOverrides.hasNext()); } @@ -725,8 +725,8 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); assertEquals(0, entityResource.getAttributeOverrides().size()); - assertEquals(3, overrideContainer.virtualOverridesSize()); - VirtualAttributeOverride virtualAttributeOverride = overrideContainer.virtualOverrides().next(); + assertEquals(3, overrideContainer.getVirtualOverridesSize()); + VirtualAttributeOverride virtualAttributeOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("id", virtualAttributeOverride.getName()); assertEquals("id", virtualAttributeOverride.getColumn().getName()); assertEquals(SUB_TYPE_NAME, virtualAttributeOverride.getColumn().getTable()); @@ -741,8 +741,8 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase assertEquals(0, entityResource.getAttributeOverrides().size()); - assertEquals(3, overrideContainer.virtualOverridesSize()); - virtualAttributeOverride = overrideContainer.virtualOverrides().next(); + assertEquals(3, overrideContainer.getVirtualOverridesSize()); + virtualAttributeOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("id", virtualAttributeOverride.getName()); assertEquals("FOO", virtualAttributeOverride.getColumn().getName()); assertEquals("BAR", virtualAttributeOverride.getColumn().getTable()); @@ -751,13 +751,13 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase idMapping.getColumn().setSpecifiedTable(null); assertEquals(0, entityResource.getAttributeOverrides().size()); - virtualAttributeOverride = overrideContainer.virtualOverrides().next(); + virtualAttributeOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("id", virtualAttributeOverride.getName()); assertEquals("id", virtualAttributeOverride.getColumn().getName()); assertEquals(SUB_TYPE_NAME, virtualAttributeOverride.getColumn().getTable()); virtualAttributeOverride.convertToSpecified(); - assertEquals(2, overrideContainer.virtualOverridesSize()); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); } public void testDefaultAttributeOverridesEntityHierachy() throws Exception { @@ -771,8 +771,8 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); assertEquals(0, entityResource.getAttributeOverrides().size()); - assertEquals(3, overrideContainer.virtualOverridesSize()); - VirtualAttributeOverride virtualAttributeOverride = overrideContainer.virtualOverrides().next(); + assertEquals(3, overrideContainer.getVirtualOverridesSize()); + VirtualAttributeOverride virtualAttributeOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("id", virtualAttributeOverride.getName()); assertEquals("id", virtualAttributeOverride.getColumn().getName()); assertEquals(SUB_TYPE_NAME, virtualAttributeOverride.getColumn().getTable()); @@ -787,8 +787,8 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase assertEquals(0, entityResource.getAttributeOverrides().size()); - assertEquals(3, overrideContainer.virtualOverridesSize()); - virtualAttributeOverride = overrideContainer.virtualOverrides().next(); + assertEquals(3, overrideContainer.getVirtualOverridesSize()); + virtualAttributeOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("id", virtualAttributeOverride.getName()); assertEquals("FOO", virtualAttributeOverride.getColumn().getName()); assertEquals("BAR", virtualAttributeOverride.getColumn().getTable()); @@ -797,13 +797,13 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase idMapping.getColumn().setSpecifiedTable(null); assertEquals(0, entityResource.getAttributeOverrides().size()); - virtualAttributeOverride = overrideContainer.virtualOverrides().next(); + virtualAttributeOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("id", virtualAttributeOverride.getName()); assertEquals("id", virtualAttributeOverride.getColumn().getName()); assertEquals(SUB_TYPE_NAME, virtualAttributeOverride.getColumn().getTable()); virtualAttributeOverride.convertToSpecified(); - assertEquals(2, overrideContainer.virtualOverridesSize()); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); } public void testSpecifiedAttributeOverridesSize() throws Exception { @@ -812,7 +812,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); AttributeOverrideContainer overrideContainer = ormEntity.getAttributeOverrideContainer(); - assertEquals(0, overrideContainer.specifiedOverridesSize()); + assertEquals(0, overrideContainer.getSpecifiedOverridesSize()); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); @@ -822,7 +822,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase entityResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); entityResource.getAttributeOverrides().get(0).setName("BAR"); - assertEquals(2, overrideContainer.specifiedOverridesSize()); + assertEquals(2, overrideContainer.getSpecifiedOverridesSize()); } public void testDefaultAttributeOverridesSize() throws Exception { @@ -834,16 +834,16 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); AttributeOverrideContainer overrideContainer = ormEntity.getAttributeOverrideContainer(); - assertEquals(3, overrideContainer.virtualOverridesSize()); + assertEquals(3, overrideContainer.getVirtualOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(2, overrideContainer.virtualOverridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(1, overrideContainer.virtualOverridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(1, overrideContainer.getVirtualOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(0, overrideContainer.virtualOverridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(0, overrideContainer.getVirtualOverridesSize()); } public void testAttributeOverridesSize() throws Exception { @@ -855,19 +855,19 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); AttributeOverrideContainer overrideContainer = ormEntity.getAttributeOverrideContainer(); - assertEquals(3, overrideContainer.overridesSize()); + assertEquals(3, overrideContainer.getOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(3, overrideContainer.overridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(3, overrideContainer.getOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(3, overrideContainer.overridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(3, overrideContainer.getOverridesSize()); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); entityResource.getAttributeOverrides().add(0, OrmFactory.eINSTANCE.createXmlAttributeOverride()); entityResource.getAttributeOverrides().get(0).setName("bar"); - assertEquals(4, overrideContainer.overridesSize()); + assertEquals(4, overrideContainer.getOverridesSize()); } public void testAttributeOverrideSetVirtual() throws Exception { @@ -879,8 +879,8 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); AttributeOverrideContainer overrideContainer = ormEntity.getAttributeOverrideContainer(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); @@ -898,10 +898,10 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAttributeOverrideContainer overrideContainer = ormEntity.getAttributeOverrideContainer(); - ListIterator<OrmVirtualAttributeOverride> virtualAttributeOverrides = overrideContainer.virtualOverrides(); + ListIterator<OrmVirtualAttributeOverride> virtualAttributeOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualAttributeOverrides.next(); virtualAttributeOverrides.next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); @@ -919,37 +919,37 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAttributeOverrideContainer overrideContainer = ormEntity.getAttributeOverrideContainer(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); assertEquals(3, entityResource.getAttributeOverrides().size()); - overrideContainer.specifiedOverrides().next().convertToVirtual(); + overrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); assertEquals("name", entityResource.getAttributeOverrides().get(0).getName()); assertEquals("foo", entityResource.getAttributeOverrides().get(1).getName()); assertEquals(2, entityResource.getAttributeOverrides().size()); - Iterator<OrmAttributeOverride> attributeOverrides = overrideContainer.specifiedOverrides(); + Iterator<OrmAttributeOverride> attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("name", attributeOverrides.next().getName()); assertEquals("foo", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); - overrideContainer.specifiedOverrides().next().convertToVirtual(); + overrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); assertEquals("foo", entityResource.getAttributeOverrides().get(0).getName()); assertEquals(1, entityResource.getAttributeOverrides().size()); - attributeOverrides = overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("foo", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); - overrideContainer.specifiedOverrides().next().convertToVirtual(); + overrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); assertEquals(0, entityResource.getAttributeOverrides().size()); - attributeOverrides = overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(attributeOverrides.hasNext()); } @@ -962,9 +962,9 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAttributeOverrideContainer overrideContainer = ormEntity.getAttributeOverrideContainer(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); @@ -972,7 +972,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase overrideContainer.moveSpecifiedOverride(2, 0); - ListIterator<OrmAttributeOverride> attributeOverrides = overrideContainer.specifiedOverrides(); + ListIterator<OrmAttributeOverride> attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("name", attributeOverrides.next().getName()); assertEquals("foo", attributeOverrides.next().getName()); assertEquals("id", attributeOverrides.next().getName()); @@ -983,7 +983,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase overrideContainer.moveSpecifiedOverride(0, 1); - attributeOverrides = overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("foo", attributeOverrides.next().getName()); assertEquals("name", attributeOverrides.next().getName()); assertEquals("id", attributeOverrides.next().getName()); @@ -1008,39 +1008,39 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase entityResource.getAttributeOverrides().add(2, OrmFactory.eINSTANCE.createXmlAttributeOverride()); entityResource.getAttributeOverrides().get(2).setName("BAZ"); - ListIterator<OrmAttributeOverride> attributeOverrides = overrideContainer.specifiedOverrides(); + ListIterator<OrmAttributeOverride> attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", attributeOverrides.next().getName()); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("BAZ", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); entityResource.getAttributeOverrides().move(2, 0); - attributeOverrides = overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); entityResource.getAttributeOverrides().move(0, 1); - attributeOverrides = overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); entityResource.getAttributeOverrides().remove(1); - attributeOverrides = overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); entityResource.getAttributeOverrides().remove(1); - attributeOverrides = overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); entityResource.getAttributeOverrides().remove(0); - attributeOverrides = overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(attributeOverrides.hasNext()); } @@ -1052,7 +1052,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAttributeOverrideContainer overrideContainer = ormEntity.getAttributeOverrideContainer(); - ListIterator<OrmVirtualAttributeOverride> virtualAttributeOverrides = overrideContainer.virtualOverrides(); + ListIterator<OrmVirtualAttributeOverride> virtualAttributeOverrides = overrideContainer.getVirtualOverrides().iterator(); OrmVirtualAttributeOverride virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("id", virtualAttributeOverride.getName()); assertTrue(virtualAttributeOverride.isVirtual()); @@ -1066,12 +1066,12 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase assertTrue(virtualAttributeOverride.isVirtual()); assertFalse(virtualAttributeOverrides.hasNext()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - AttributeOverride specifiedAttributeOverride = overrideContainer.specifiedOverrides().next(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + AttributeOverride specifiedAttributeOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); assertFalse(specifiedAttributeOverride.isVirtual()); - virtualAttributeOverrides = overrideContainer.virtualOverrides(); + virtualAttributeOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("name", virtualAttributeOverride.getName()); assertTrue(virtualAttributeOverride.isVirtual()); @@ -1130,7 +1130,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); - ListIterator<OrmAssociationOverride> specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + ListIterator<OrmAssociationOverride> specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAssociationOverrides.hasNext()); @@ -1140,14 +1140,14 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase XmlAssociationOverride xmlAssociationOverride = OrmFactory.eINSTANCE.createXmlAssociationOverride(); entityResource.getAssociationOverrides().add(0, xmlAssociationOverride); xmlAssociationOverride.setName("FOO"); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); xmlAssociationOverride = OrmFactory.eINSTANCE.createXmlAssociationOverride(); entityResource.getAssociationOverrides().add(1, xmlAssociationOverride); xmlAssociationOverride.setName("BAR"); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAssociationOverrides.next().getName()); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); @@ -1156,7 +1156,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase xmlAssociationOverride = OrmFactory.eINSTANCE.createXmlAssociationOverride(); entityResource.getAssociationOverrides().add(0, xmlAssociationOverride); xmlAssociationOverride.setName("BAZ"); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", specifiedAssociationOverrides.next().getName()); assertEquals("FOO", specifiedAssociationOverrides.next().getName()); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); @@ -1164,26 +1164,26 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase //move an annotation to the resource model and verify the context model is updated entityResource.getAssociationOverrides().move(1, 0); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAssociationOverrides.next().getName()); assertEquals("BAZ", specifiedAssociationOverrides.next().getName()); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); entityResource.getAssociationOverrides().remove(0); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", specifiedAssociationOverrides.next().getName()); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); entityResource.getAssociationOverrides().remove(0); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); entityResource.getAssociationOverrides().remove(0); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAssociationOverrides.hasNext()); } @@ -1199,8 +1199,8 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase assertEquals(FULLY_QUALIFIED_SUB_TYPE_NAME, entityResource.getClassName()); assertTrue(entityResource.getAssociationOverrides().isEmpty()); - assertEquals(4, overrideContainer.virtualOverridesSize()); - VirtualAssociationOverride virtualAssociationOverride = overrideContainer.virtualOverrides().next(); + assertEquals(4, overrideContainer.getVirtualOverridesSize()); + VirtualAssociationOverride virtualAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("address", virtualAssociationOverride.getName()); // @@ -1213,8 +1213,8 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase // assertNull(typeResource.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); // assertNull(typeResource.getAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); - assertEquals(4, overrideContainer.virtualOverridesSize()); - virtualAssociationOverride = overrideContainer.virtualOverrides().next(); + assertEquals(4, overrideContainer.getVirtualOverridesSize()); + virtualAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("address", virtualAssociationOverride.getName()); // //idMapping.getColumn().setSpecifiedName(null); @@ -1223,11 +1223,11 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase // assertNull(typeResource.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); // assertNull(typeResource.getAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); - virtualAssociationOverride = overrideContainer.virtualOverrides().next(); + virtualAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("address", virtualAssociationOverride.getName()); virtualAssociationOverride.convertToSpecified(); - assertEquals(3, overrideContainer.virtualOverridesSize()); + assertEquals(3, overrideContainer.getVirtualOverridesSize()); @@ -1282,7 +1282,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); - assertEquals(0, overrideContainer.specifiedOverridesSize()); + assertEquals(0, overrideContainer.getSpecifiedOverridesSize()); //add to the resource model and verify the context model is updated entityResource.getAssociationOverrides().add(OrmFactory.eINSTANCE.createXmlAssociationOverride()); @@ -1290,7 +1290,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase entityResource.getAssociationOverrides().add(0, OrmFactory.eINSTANCE.createXmlAssociationOverride()); entityResource.getAssociationOverrides().get(0).setName("BAR"); - assertEquals(2, overrideContainer.specifiedOverridesSize()); + assertEquals(2, overrideContainer.getSpecifiedOverridesSize()); } public void testDefaultAssociationOverridesSize() throws Exception { @@ -1302,19 +1302,19 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); AssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); - assertEquals(4, overrideContainer.virtualOverridesSize()); + assertEquals(4, overrideContainer.getVirtualOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(3, overrideContainer.virtualOverridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(3, overrideContainer.getVirtualOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(2, overrideContainer.virtualOverridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(1, overrideContainer.virtualOverridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(1, overrideContainer.getVirtualOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(0, overrideContainer.virtualOverridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(0, overrideContainer.getVirtualOverridesSize()); } public void testAssociationOverridesSize() throws Exception { @@ -1326,19 +1326,19 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); AssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); - assertEquals(4, overrideContainer.overridesSize()); + assertEquals(4, overrideContainer.getOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(4, overrideContainer.overridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(4, overrideContainer.getOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(4, overrideContainer.overridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(4, overrideContainer.getOverridesSize()); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); entityResource.getAssociationOverrides().add(0, OrmFactory.eINSTANCE.createXmlAssociationOverride()); entityResource.getAssociationOverrides().get(0).setName("bar"); - assertEquals(5, overrideContainer.overridesSize()); + assertEquals(5, overrideContainer.getOverridesSize()); } public void testAssociationOverrideSetVirtual() throws Exception { @@ -1350,8 +1350,8 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); AssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); @@ -1369,10 +1369,10 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); - ListIterator<OrmVirtualAssociationOverride> virtualAssociationOverrides = overrideContainer.virtualOverrides(); + ListIterator<OrmVirtualAssociationOverride> virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualAssociationOverrides.next(); virtualAssociationOverrides.next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); @@ -1390,25 +1390,25 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); assertEquals(2, entityResource.getAssociationOverrides().size()); - overrideContainer.specifiedOverrides().next().convertToVirtual(); + overrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); assertEquals("address2", entityResource.getAssociationOverrides().get(0).getName()); assertEquals(1, entityResource.getAssociationOverrides().size()); - Iterator<OrmAssociationOverride> associationOverrides = overrideContainer.specifiedOverrides(); + Iterator<OrmAssociationOverride> associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("address2", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - overrideContainer.specifiedOverrides().next().convertToVirtual(); + overrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); assertEquals(0, entityResource.getAssociationOverrides().size()); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(associationOverrides.hasNext()); } @@ -1421,15 +1421,15 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); assertEquals(2, entityResource.getAssociationOverrides().size()); overrideContainer.moveSpecifiedOverride(1, 0); - ListIterator<OrmAssociationOverride> associationOverrides = overrideContainer.specifiedOverrides(); + ListIterator<OrmAssociationOverride> associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("address2", associationOverrides.next().getName()); assertEquals("address", associationOverrides.next().getName()); @@ -1438,7 +1438,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase overrideContainer.moveSpecifiedOverride(0, 1); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("address", associationOverrides.next().getName()); assertEquals("address2", associationOverrides.next().getName()); @@ -1463,39 +1463,39 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase entityResource.getAssociationOverrides().add(2, OrmFactory.eINSTANCE.createXmlAssociationOverride()); entityResource.getAssociationOverrides().get(2).setName("BAZ"); - ListIterator<OrmAssociationOverride> associationOverrides = overrideContainer.specifiedOverrides(); + ListIterator<OrmAssociationOverride> associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", associationOverrides.next().getName()); assertEquals("BAR", associationOverrides.next().getName()); assertEquals("BAZ", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); entityResource.getAssociationOverrides().move(2, 0); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", associationOverrides.next().getName()); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); entityResource.getAssociationOverrides().move(0, 1); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("BAR", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); entityResource.getAssociationOverrides().remove(1); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); entityResource.getAssociationOverrides().remove(1); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); entityResource.getAssociationOverrides().remove(0); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(associationOverrides.hasNext()); } @@ -1508,7 +1508,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); - ListIterator<OrmVirtualAssociationOverride> virtualAssociationOverrides = overrideContainer.virtualOverrides(); + ListIterator<OrmVirtualAssociationOverride> virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); OrmVirtualAssociationOverride virtualAssociationOverride = virtualAssociationOverrides.next(); assertEquals("address", virtualAssociationOverride.getName()); assertTrue(virtualAssociationOverride.isVirtual()); @@ -1526,12 +1526,12 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase assertTrue(virtualAssociationOverride.isVirtual()); assertFalse(virtualAssociationOverrides.hasNext()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - AssociationOverride specifiedAssociationOverride = overrideContainer.specifiedOverrides().next(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + AssociationOverride specifiedAssociationOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); assertFalse(specifiedAssociationOverride.isVirtual()); - virtualAssociationOverrides = overrideContainer.virtualOverrides(); + virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualAssociationOverride = virtualAssociationOverrides.next(); assertEquals("address2", virtualAssociationOverride.getName()); assertTrue(virtualAssociationOverride.isVirtual()); @@ -1558,8 +1558,8 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmAttributeOverrideContainer attributeOverrideContainer = ((OrmEntity) longTimeCustomerPersistentType.getMapping()).getAttributeOverrideContainer(); - assertEquals(6, attributeOverrideContainer.virtualOverridesSize()); - ListIterator<OrmVirtualAttributeOverride> virtualAttributeOverrides = attributeOverrideContainer.virtualOverrides(); + assertEquals(6, attributeOverrideContainer.getVirtualOverridesSize()); + ListIterator<OrmVirtualAttributeOverride> virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); OrmVirtualAttributeOverride virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("id", virtualAttributeOverride.getName()); virtualAttributeOverride = virtualAttributeOverrides.next(); @@ -1666,8 +1666,8 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmAttributeOverrideContainer attributeOverrideContainer = ((OrmEntity) longTimeCustomerPersistentType.getMapping()).getAttributeOverrideContainer(); - assertEquals(6, attributeOverrideContainer.virtualOverridesSize()); - ListIterator<OrmVirtualAttributeOverride> virtualAttributeOverrides = attributeOverrideContainer.virtualOverrides(); + assertEquals(6, attributeOverrideContainer.getVirtualOverridesSize()); + ListIterator<OrmVirtualAttributeOverride> virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); OrmVirtualAttributeOverride virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("id", virtualAttributeOverride.getName()); virtualAttributeOverride = virtualAttributeOverrides.next(); @@ -1775,8 +1775,8 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmAssociationOverrideContainer attributeOverrideContainer = ((OrmEntity) longTimeCustomerPersistentType.getMapping()).getAssociationOverrideContainer(); - assertEquals(1, attributeOverrideContainer.virtualOverridesSize()); - ListIterator<OrmVirtualAssociationOverride> virtualAssociationOverrides = attributeOverrideContainer.virtualOverrides(); + assertEquals(1, attributeOverrideContainer.getVirtualOverridesSize()); + ListIterator<OrmVirtualAssociationOverride> virtualAssociationOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); OrmVirtualAssociationOverride virtualAssociationOverride = virtualAssociationOverrides.next(); assertEquals("address.state", virtualAssociationOverride.getName()); } @@ -1794,8 +1794,8 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmAssociationOverrideContainer overrideContainer = ((OrmEntity) longTimeCustomerPersistentType.getMapping()).getAssociationOverrideContainer(); - assertEquals(1, overrideContainer.virtualOverridesSize()); - ListIterator<OrmVirtualAssociationOverride> virtualAssociationOverrides = overrideContainer.virtualOverrides(); + assertEquals(1, overrideContainer.getVirtualOverridesSize()); + ListIterator<OrmVirtualAssociationOverride> virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); OrmVirtualAssociationOverride virtualAssociationOverride = virtualAssociationOverrides.next(); assertEquals("address.state", virtualAssociationOverride.getName()); } @@ -1953,7 +1953,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase resourceEntity.getAssociationOverrides().add((XmlAssociationOverride) resourceAssociationOverride); ((XmlAssociationOverride) resourceAssociationOverride).setName("a"); - OrmAssociationOverride associationOverride = entity.getAssociationOverrideContainer().specifiedOverrides().next(); + OrmAssociationOverride associationOverride = entity.getAssociationOverrideContainer().getSpecifiedOverrides().iterator().next(); assertEquals("a", associationOverride.getName()); XmlJoinTable resourceJoinTable = OrmFactory.eINSTANCE.createXmlJoinTable(); @@ -1963,10 +1963,10 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase resourceJoinTable.getInverseJoinColumns().add(resourceJoinColumn); resourceJoinColumn.setName("BAR"); - associationOverride = entity.getAssociationOverrideContainer().specifiedOverrides().next(); + associationOverride = entity.getAssociationOverrideContainer().getSpecifiedOverrides().iterator().next(); assertEquals("a", associationOverride.getName()); JoinTable joinTable = ((OrmOverrideRelationship2_0) associationOverride.getRelationship()).getJoinTableStrategy().getJoinTable(); assertEquals("FOO", joinTable.getSpecifiedName()); - assertEquals("BAR", joinTable.inverseJoinColumns().next().getName()); + assertEquals("BAR", joinTable.getInverseJoinColumns().iterator().next().getName()); } } |