diff options
Diffstat (limited to 'jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse')
13 files changed, 42 insertions, 34 deletions
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/GenericOrmPersistentAttributeTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/GenericOrmPersistentAttributeTests.java index 7767b3b873..26c540b144 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/GenericOrmPersistentAttributeTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/GenericOrmPersistentAttributeTests.java @@ -232,7 +232,7 @@ public class GenericOrmPersistentAttributeTests extends ContextModelTestCase ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); assertEquals("id", ormPersistentAttribute.getName()); assertEquals(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMappingKey()); assertEquals("id", ((BasicMapping) ormPersistentAttribute.getMapping()).getColumn().getName()); @@ -249,7 +249,7 @@ public class GenericOrmPersistentAttributeTests extends ContextModelTestCase ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + ormPersistentAttribute = ormPersistentType.getAttributeNamed("address"); assertEquals("address", ormPersistentAttribute.getName()); assertEquals(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMappingKey()); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEmbeddedIdMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEmbeddedIdMappingTests.java index 88524737ab..e2ce25fbb1 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEmbeddedIdMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEmbeddedIdMappingTests.java @@ -815,10 +815,11 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); assertEquals(3, ormPersistentType.virtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); - + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("address"); + assertTrue(ormPersistentAttribute.isVirtual()); + //will be an OrmEmbeddedMapping instead of OrmEmbeddedIdMapping since that is the default - OrmEmbeddedMapping ormEmbeddedMapping = (OrmEmbeddedMapping) ormPersistentAttribute.getMapping(); + OrmEmbeddedMapping ormEmbeddedMapping = (OrmEmbeddedMapping) ormPersistentAttribute.getMapping(); assertEquals("address", ormEmbeddedMapping.getName()); //TODO diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmGeneratedValueTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmGeneratedValueTests.java index 7d0fd95fc2..bd3ccc87ed 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmGeneratedValueTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmGeneratedValueTests.java @@ -125,7 +125,7 @@ import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; assertEquals(GenerationType.SEQUENCE, javaGeneratedValue.getSpecifiedStrategy()); ormIdAttribute.makeVirtual(); - ormIdAttribute = ormPersistentType.virtualAttributes().next(); + ormIdAttribute = ormPersistentType.getAttributeNamed("id"); ormIdMapping = (IdMapping) ormIdAttribute.getMapping(); assertEquals("Foo", ormIdMapping.getGeneratedValue().getSpecifiedGenerator()); assertEquals(GenerationType.SEQUENCE, ormIdMapping.getGeneratedValue().getSpecifiedStrategy()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmIdMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmIdMappingTests.java index 5598c830ed..15a791252d 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmIdMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmIdMappingTests.java @@ -501,14 +501,15 @@ public class OrmIdMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); assertEquals(2, ormPersistentType.virtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); assertEquals(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMappingKey()); ormPersistentAttribute.makeSpecified(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); - ormPersistentAttribute= ormPersistentType.specifiedAttributes().next(); + ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); + assertFalse(ormPersistentAttribute.isVirtual()); assertEquals("id", ormIdMapping.getName()); assertEquals(Converter.NO_CONVERTER, ormIdMapping.getConverter().getType()); assertNull(ormIdMapping.getGeneratedValue()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmManyToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmManyToOneMappingTests.java index 09fa209f52..06f0599619 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmManyToOneMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmManyToOneMappingTests.java @@ -521,9 +521,10 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); assertEquals(3, ormPersistentType.virtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("address"); assertEquals(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMappingKey()); + assertTrue(ormPersistentAttribute.isVirtual()); ormPersistentAttribute.makeSpecified(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); ormPersistentAttribute= ormPersistentType.specifiedAttributes().next(); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmOneToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmOneToOneMappingTests.java index 066c1eeb4e..1e31c7b0f5 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmOneToOneMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmOneToOneMappingTests.java @@ -698,10 +698,11 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); assertEquals(3, ormPersistentType.virtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("address"); assertEquals(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMappingKey()); - + assertTrue(ormPersistentAttribute.isVirtual()); + ormPersistentAttribute.makeSpecified(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); ormPersistentAttribute= ormPersistentType.specifiedAttributes().next(); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmTransientMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmTransientMappingTests.java index e41cd6d9ea..0b49ee047c 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmTransientMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmTransientMappingTests.java @@ -141,15 +141,17 @@ public class OrmTransientMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); assertEquals(2, ormPersistentType.virtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); assertEquals(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMappingKey()); + assertTrue(ormPersistentAttribute.isVirtual()); ormPersistentAttribute.makeSpecified(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); - ormPersistentAttribute= ormPersistentType.specifiedAttributes().next(); + ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); OrmTransientMapping ormTransientMapping = (OrmTransientMapping) ormPersistentAttribute.getMapping(); assertEquals("id", ormTransientMapping.getName()); + assertFalse(ormPersistentAttribute.isVirtual()); } public void testSpecifiedMapping() throws Exception { diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmVersionMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmVersionMappingTests.java index 5ec3e74192..bab7a548df 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmVersionMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmVersionMappingTests.java @@ -249,15 +249,17 @@ public class OrmVersionMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); assertEquals(2, ormPersistentType.virtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); assertEquals(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMappingKey()); + assertTrue(ormPersistentAttribute.isVirtual()); ormPersistentAttribute.makeSpecified(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); - ormPersistentAttribute= ormPersistentType.specifiedAttributes().next(); + ormPersistentAttribute= ormPersistentType.getAttributeNamed("id"); OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping(); assertEquals("id", ormVersionMapping.getName()); + assertFalse(ormPersistentAttribute.isVirtual()); assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getConverter().getType()); OrmColumn ormColumn = ormVersionMapping.getColumn(); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java index 384958d9cb..676d05545e 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java @@ -349,12 +349,12 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); assertEquals(3, ormPersistentType.virtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("address"); assertEquals(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMappingKey()); ormPersistentAttribute.makeSpecified(MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); - ormPersistentAttribute= ormPersistentType.specifiedAttributes().next(); + ormPersistentAttribute = ormPersistentType.specifiedAttributes().next(); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertEquals("address", ormElementCollectionMapping.getName()); @@ -949,7 +949,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); //virtual attrubte in orm.xml, java attribute has no value Column annotation - OrmPersistentAttribute addressesPersistentAttribute = ormPersistentType.virtualAttributes().next(); + OrmPersistentAttribute addressesPersistentAttribute = ormPersistentType.getAttributeNamed("addresses"); OrmElementCollectionMapping2_0 addressesVirtualMapping = (OrmElementCollectionMapping2_0) addressesPersistentAttribute.getMapping(); OrmColumn ormColumn = addressesVirtualMapping.getValueColumn(); assertEquals("addresses", ormColumn.getSpecifiedName()); @@ -990,7 +990,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex //set metadata-complete, orm.xml virtual column ignores java column annotation ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - addressesPersistentAttribute = ormPersistentType.virtualAttributes().next(); + addressesPersistentAttribute = ormPersistentType.getAttributeNamed("addresses"); //no longer an element collection mapping assertEquals(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY, addressesPersistentAttribute.getMappingKey()); } @@ -1298,7 +1298,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); //virtual attribute in orm.xml, java attribute has no value Column annotation - OrmPersistentAttribute addressesPersistentAttribute = ormPersistentType.virtualAttributes().next(); + OrmPersistentAttribute addressesPersistentAttribute = ormPersistentType.getAttributeNamed("addresses"); OrmElementCollectionMapping2_0 addressesVirtualMapping = (OrmElementCollectionMapping2_0) addressesPersistentAttribute.getMapping(); Column ormColumn = addressesVirtualMapping.getMapKeyColumn(); assertEquals("addresses_KEY", ormColumn.getSpecifiedName()); @@ -1339,7 +1339,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex //set metadata-complete, orm.xml virtual column ignores java column annotation ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - addressesPersistentAttribute = ormPersistentType.virtualAttributes().next(); + addressesPersistentAttribute = ormPersistentType.getAttributeNamed("addresses"); //no longer an element collection mapping assertEquals(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY, addressesPersistentAttribute.getMappingKey()); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java index a4c658c9ed..ae4d96a26e 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java @@ -722,7 +722,7 @@ public class GenericOrmManyToManyMapping2_0Tests getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); //virtual attribute in orm.xml, java attribute has no value Column annotation - OrmPersistentAttribute addressesPersistentAttribute = ormPersistentType.virtualAttributes().next(); + OrmPersistentAttribute addressesPersistentAttribute = ormPersistentType.getAttributeNamed("addresses"); OrmManyToManyMapping2_0 addressesVirtualMapping = (OrmManyToManyMapping2_0) addressesPersistentAttribute.getMapping(); Column ormColumn = addressesVirtualMapping.getMapKeyColumn(); assertEquals("addresses_KEY", ormColumn.getSpecifiedName()); @@ -763,7 +763,7 @@ public class GenericOrmManyToManyMapping2_0Tests //set metadata-complete, orm.xml virtual column ignores java column annotation ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - addressesPersistentAttribute = ormPersistentType.virtualAttributes().next(); + addressesPersistentAttribute = ormPersistentType.getAttributeNamed("addresses"); //no longer an element collection mapping assertEquals(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY, addressesPersistentAttribute.getMappingKey()); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java index 029b631e48..9e1e1edd01 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java @@ -744,7 +744,7 @@ public class GenericOrmOneToManyMapping2_0Tests getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); //virtual attribute in orm.xml, java attribute has no value Column annotation - OrmPersistentAttribute addressesPersistentAttribute = ormPersistentType.virtualAttributes().next(); + OrmPersistentAttribute addressesPersistentAttribute = ormPersistentType.getAttributeNamed("addresses"); OrmOneToManyMapping2_0 addressesVirtualMapping = (OrmOneToManyMapping2_0) addressesPersistentAttribute.getMapping(); Column ormColumn = addressesVirtualMapping.getMapKeyColumn(); assertEquals("addresses_KEY", ormColumn.getSpecifiedName()); @@ -785,7 +785,7 @@ public class GenericOrmOneToManyMapping2_0Tests //set metadata-complete, orm.xml virtual column ignores java column annotation ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - addressesPersistentAttribute = ormPersistentType.virtualAttributes().next(); + addressesPersistentAttribute = ormPersistentType.getAttributeNamed("addresses"); //no longer an element collection mapping assertEquals(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY, addressesPersistentAttribute.getMappingKey()); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmPersistentAttribute2_0Tests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmPersistentAttribute2_0Tests.java index ccad588b76..c2323b202e 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmPersistentAttribute2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmPersistentAttribute2_0Tests.java @@ -302,7 +302,7 @@ public class GenericOrmPersistentAttribute2_0Tests createTestEntityIdMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); assertEquals("id", ormPersistentAttribute.getName()); assertEquals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMappingKey()); assertEquals("FOO", ((IdMapping) ormPersistentAttribute.getMapping()).getColumn().getName()); @@ -310,7 +310,7 @@ public class GenericOrmPersistentAttribute2_0Tests ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); assertEquals("id", ormPersistentAttribute.getName()); assertEquals(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMappingKey()); assertEquals("id", ((BasicMapping) ormPersistentAttribute.getMapping()).getColumn().getName()); @@ -320,14 +320,14 @@ public class GenericOrmPersistentAttribute2_0Tests createTestEntityOneToOneMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("address"); assertEquals("address", ormPersistentAttribute.getName()); assertEquals(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMappingKey()); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + ormPersistentAttribute = ormPersistentType.getAttributeNamed("address"); assertEquals("address", ormPersistentAttribute.getName()); assertEquals(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMappingKey()); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmPersistentType2_0Tests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmPersistentType2_0Tests.java index a59f91d50a..4167fa07b9 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmPersistentType2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmPersistentType2_0Tests.java @@ -170,12 +170,12 @@ public class GenericOrmPersistentType2_0Tests ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); virtualAttributes = ormPersistentType.virtualAttributes(); ormPersistentAttribute = virtualAttributes.next(); - assertEquals("id", ormPersistentAttribute.getName()); + assertEquals("name", ormPersistentAttribute.getName()); assertEquals(AccessType.FIELD, ormPersistentAttribute.getAccess()); ormPersistentAttribute = virtualAttributes.next(); - assertEquals("name", ormPersistentAttribute.getName()); + assertEquals("id", ormPersistentAttribute.getName()); assertEquals(AccessType.FIELD, ormPersistentAttribute.getAccess()); assertFalse(virtualAttributes.hasNext()); @@ -238,11 +238,11 @@ public class GenericOrmPersistentType2_0Tests virtualAttributes = ormPersistentType.virtualAttributes(); ormPersistentAttribute = virtualAttributes.next(); - assertEquals("id", ormPersistentAttribute.getName()); + assertEquals("name", ormPersistentAttribute.getName()); assertEquals(AccessType.FIELD, ormPersistentAttribute.getAccess()); ormPersistentAttribute = virtualAttributes.next(); - assertEquals("name", ormPersistentAttribute.getName()); + assertEquals("id", ormPersistentAttribute.getName()); assertEquals(AccessType.FIELD, ormPersistentAttribute.getAccess()); assertFalse(virtualAttributes.hasNext()); @@ -256,7 +256,7 @@ public class GenericOrmPersistentType2_0Tests ormPersistentType.virtualAttributes().next().makeSpecified(); virtualAttributes = ormPersistentType.virtualAttributes(); ormPersistentAttribute = virtualAttributes.next(); - assertEquals("name", ormPersistentAttribute.getName()); + assertEquals("id", ormPersistentAttribute.getName()); assertEquals(AccessType.FIELD, ormPersistentAttribute.getAccess()); assertFalse(virtualAttributes.hasNext()); |