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.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 180e8b3fc3..b0be836e71 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
@@ -329,7 +329,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex
 		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();
@@ -859,14 +859,14 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex
 
 		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());
 	}
 	
@@ -896,7 +896,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex
 		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());
 		
@@ -919,7 +919,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex
 		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());
 		
@@ -932,7 +932,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex
 		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.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 1e2dd42ea3..a4c658c9ed 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
@@ -489,13 +489,13 @@ public class GenericOrmManyToManyMapping2_0Tests
 		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.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 d83bd64d4f..9e442c436a 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
@@ -540,13 +540,13 @@ public class GenericOrmOneToManyMapping2_0Tests
 		OrmOneToManyMapping2_0 ormOneToManyMapping = (OrmOneToManyMapping2_0) ormPersistentType.getAttributeNamed("addresses").getMapping();
 		JavaOneToManyMapping2_0 javaOneToManyMapping = (JavaOneToManyMapping2_0) ormPersistentType.getJavaPersistentType().getAttributeNamed("addresses").getMapping();
 		assertEquals("java.lang.String", ormOneToManyMapping.getMapKeyClass());
-		assertEquals(null, ormOneToManyMapping.getSpecifiedMapKeyClass());
+		assertEquals("java.lang.String", ormOneToManyMapping.getSpecifiedMapKeyClass());
 		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());
 	}