307113 - incorrect default class names in virtual orm.xml attribute mappings

3 files changed, 13 insertions, 13 deletions

diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink2_0/core/tests/internal/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink2_0/core/tests/internal/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java
index 45b4b57fb9..b7028756ef 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink2_0/core/tests/internal/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink2_0/core/tests/internal/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java
@@ -316,7 +316,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests extends EclipseLink2
 		OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping();	
 		assertEquals("address", ormElementCollectionMapping.getName());
 		assertEquals(FetchType.EAGER, ormElementCollectionMapping.getSpecifiedFetch());
-		assertEquals("String", ormElementCollectionMapping.getSpecifiedTargetClass());
+		assertEquals("java.lang.String", ormElementCollectionMapping.getSpecifiedTargetClass());
 		
 		ormPersistentAttribute.makeSpecified();
 		ormPersistentAttribute = ormPersistentType.specifiedAttributes().next();
@@ -846,14 +846,14 @@ public class EclipseLink2_0OrmElementCollectionMappingTests extends EclipseLink2
 
 		OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentType.getAttributeNamed("addresses").getMapping();
 		JavaElementCollectionMapping2_0 javaElementCollectionMapping = (JavaElementCollectionMapping2_0) ormPersistentType.getJavaPersistentType().getAttributeNamed("addresses").getMapping();
-		assertEquals(null, ormElementCollectionMapping.getSpecifiedMapKeyClass());
+		assertEquals("java.lang.String", ormElementCollectionMapping.getSpecifiedMapKeyClass());
 		assertEquals("java.lang.String", ormElementCollectionMapping.getMapKeyClass());
 		assertEquals("java.lang.String", ormElementCollectionMapping.getDefaultMapKeyClass());
 		
 		//set pk mapKey in the java, verify virtual orm mapping updates
 		javaElementCollectionMapping.setSpecifiedMapKeyClass("Integer");
-		assertEquals("Integer", ormElementCollectionMapping.getMapKeyClass());
-		assertEquals("Integer", ormElementCollectionMapping.getSpecifiedMapKeyClass());
+		assertEquals("java.lang.Integer", ormElementCollectionMapping.getMapKeyClass());
+		assertEquals("java.lang.Integer", ormElementCollectionMapping.getSpecifiedMapKeyClass());
 		assertEquals("java.lang.String", ormElementCollectionMapping.getDefaultMapKeyClass());
 	}
 	
@@ -882,7 +882,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests extends EclipseLink2
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY, "addresses");
 		OrmElementCollectionMapping2_0 elementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping();
 
-		Orderable2_0 orderable = ((Orderable2_0) elementCollectionMapping.getOrderable());
+		Orderable2_0 orderable = elementCollectionMapping.getOrderable();
 		assertEquals(false, orderable.isOrderColumnOrdering());
 		assertEquals(true, orderable.isNoOrdering());
 		
@@ -905,7 +905,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests extends EclipseLink2
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY, "addresses");
 		OrmElementCollectionMapping2_0 elementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping();
 
-		Orderable2_0 orderable = ((Orderable2_0) elementCollectionMapping.getOrderable());
+		Orderable2_0 orderable = elementCollectionMapping.getOrderable();
 		assertEquals(false, orderable.isOrderColumnOrdering());
 		assertEquals(true, orderable.isNoOrdering());
 		
@@ -918,7 +918,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests extends EclipseLink2
 		ormPersistentAttribute.makeVirtual();		
 		ormPersistentAttribute = ormPersistentType.getAttributeNamed("addresses");
 		elementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping();
-		orderable = ((Orderable2_0) elementCollectionMapping.getOrderable());
+		orderable = elementCollectionMapping.getOrderable();
 		assertEquals(true, orderable.isOrderColumnOrdering());
 		assertEquals(false, orderable.isNoOrdering());
 		assertEquals(TYPE_NAME + "_addresses", orderable.getOrderColumn().getTable());
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink2_0/core/tests/internal/context/orm/EclipseLink2_0OrmManyToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink2_0/core/tests/internal/context/orm/EclipseLink2_0OrmManyToManyMappingTests.java
index d2fa78ac5d..53c5b4fa6d 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink2_0/core/tests/internal/context/orm/EclipseLink2_0OrmManyToManyMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink2_0/core/tests/internal/context/orm/EclipseLink2_0OrmManyToManyMappingTests.java
@@ -489,13 +489,13 @@ public class EclipseLink2_0OrmManyToManyMappingTests
 		OrmManyToManyMapping2_0 ormManyToManyMapping = (OrmManyToManyMapping2_0) ormPersistentType.getAttributeNamed("addresses").getMapping();
 		JavaManyToManyMapping2_0 javaManyToManyMapping = (JavaManyToManyMapping2_0) ormPersistentType.getJavaPersistentType().getAttributeNamed("addresses").getMapping();
 		assertEquals("java.lang.String", ormManyToManyMapping.getMapKeyClass());
-		assertEquals(null, ormManyToManyMapping.getSpecifiedMapKeyClass());
+		assertEquals("java.lang.String", ormManyToManyMapping.getSpecifiedMapKeyClass());
 		assertEquals("java.lang.String", ormManyToManyMapping.getDefaultMapKeyClass());
 		
 		//set pk mapKey in the java, verify virtual orm mapping updates
 		javaManyToManyMapping.setSpecifiedMapKeyClass("Integer");
-		assertEquals("Integer", ormManyToManyMapping.getMapKeyClass());
-		assertEquals("Integer", ormManyToManyMapping.getSpecifiedMapKeyClass());
+		assertEquals("java.lang.Integer", ormManyToManyMapping.getMapKeyClass());
+		assertEquals("java.lang.Integer", ormManyToManyMapping.getSpecifiedMapKeyClass());
 		assertEquals("java.lang.String", ormManyToManyMapping.getDefaultMapKeyClass());
 	}
 	
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink2_0/core/tests/internal/context/orm/EclipseLink2_0OrmOneToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink2_0/core/tests/internal/context/orm/EclipseLink2_0OrmOneToManyMappingTests.java
index 2069d82e57..a16bcf1b7c 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink2_0/core/tests/internal/context/orm/EclipseLink2_0OrmOneToManyMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink2_0/core/tests/internal/context/orm/EclipseLink2_0OrmOneToManyMappingTests.java
@@ -367,14 +367,14 @@ public class EclipseLink2_0OrmOneToManyMappingTests
 
 		OrmOneToManyMapping2_0 ormOneToManyMapping = (OrmOneToManyMapping2_0) ormPersistentType.getAttributeNamed("addresses").getMapping();
 		JavaOneToManyMapping2_0 javaOneToManyMapping = (JavaOneToManyMapping2_0) ormPersistentType.getJavaPersistentType().getAttributeNamed("addresses").getMapping();
-		assertEquals(null, ormOneToManyMapping.getSpecifiedMapKeyClass());
+		assertEquals("java.lang.String", ormOneToManyMapping.getSpecifiedMapKeyClass());
 		assertEquals("java.lang.String", ormOneToManyMapping.getMapKeyClass());
 		assertEquals("java.lang.String", ormOneToManyMapping.getDefaultMapKeyClass());
 		
 		//set pk mapKey in the java, verify virtual orm mapping updates
 		javaOneToManyMapping.setSpecifiedMapKeyClass("Integer");
-		assertEquals("Integer", ormOneToManyMapping.getMapKeyClass());
-		assertEquals("Integer", ormOneToManyMapping.getSpecifiedMapKeyClass());
+		assertEquals("java.lang.Integer", ormOneToManyMapping.getMapKeyClass());
+		assertEquals("java.lang.Integer", ormOneToManyMapping.getSpecifiedMapKeyClass());
 		assertEquals("java.lang.String", ormOneToManyMapping.getDefaultMapKeyClass());