changed tests to address default/specified name

2 files changed, 50 insertions, 28 deletions

diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentClassTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentClassTests.java
index 2d59b52e59..ea7d6252c6 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentClassTests.java
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentClassTests.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
 
+import java.beans.Introspector;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
@@ -390,28 +391,34 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
 		
 		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
-	
-		assertNull(persistentClass.getSchemaTypeName());
+		String defaultXmlTypeName = Introspector.decapitalize(TYPE_NAME);
+		
+		assertNull(persistentClass.getSpecifiedXmlTypeName());
+		assertEquals(defaultXmlTypeName, persistentClass.getDefaultXmlTypeName());
+		assertEquals(defaultXmlTypeName, persistentClass.getXmlTypeName());
 		
-		persistentClass.setSchemaTypeName("foo");
+		persistentClass.setSpecifiedXmlTypeName("foo");
 		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(XmlTypeAnnotation.ANNOTATION_NAME);
 		assertEquals("foo", xmlTypeAnnotation.getName());
-		assertEquals("foo", persistentClass.getSchemaTypeName());
+		assertEquals("foo", persistentClass.getSpecifiedXmlTypeName());
+		assertEquals("foo", persistentClass.getXmlTypeName());
 		
-		persistentClass.setSchemaTypeName(null);
+		persistentClass.setSpecifiedXmlTypeName(null);
 		xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(XmlTypeAnnotation.ANNOTATION_NAME);
 		assertNull(xmlTypeAnnotation.getName());
-		assertNull(persistentClass.getSchemaTypeName());
-	
+		assertNull(persistentClass.getSpecifiedXmlTypeName());
+		assertEquals(defaultXmlTypeName, persistentClass.getXmlTypeName());	
+		
 		//add another annotation so that the context model does not get blown away
 		persistentClass.setSpecifiedAccessType(XmlAccessType.FIELD);
 		resourceType.removeAnnotation(XmlTypeAnnotation.ANNOTATION_NAME);
 		
 		//set name again, this time starting with no XmlType annotation
-		persistentClass.setSchemaTypeName("foo");
+		persistentClass.setSpecifiedXmlTypeName("foo");
 		xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(XmlTypeAnnotation.ANNOTATION_NAME);
 		assertEquals("foo", xmlTypeAnnotation.getName());
-		assertEquals("foo", persistentClass.getSchemaTypeName());
+		assertEquals("foo", persistentClass.getSpecifiedXmlTypeName());
+		assertEquals("foo", persistentClass.getXmlTypeName());
 	}
 	
 	public void testUpdateSchemaTypeName() throws Exception {
@@ -419,9 +426,11 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
 		
 		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
-	
-		assertNull(persistentClass.getSchemaTypeName());
+		String defaultXmlTypeName = Introspector.decapitalize(TYPE_NAME);
 		
+		assertNull(persistentClass.getSpecifiedXmlTypeName());
+		assertEquals(defaultXmlTypeName, persistentClass.getDefaultXmlTypeName());
+		assertEquals(defaultXmlTypeName, persistentClass.getXmlTypeName());
 		
 		//add a namespace member value pair
 		AnnotatedElement annotatedElement = this.annotatedElement(resourceType);
@@ -430,8 +439,9 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
 				GenericJavaPersistentClassTests.this.addXmlTypeMemberValuePair(declaration, JAXB.XML_TYPE__NAME, "foo");
 			}
 		});
-		assertEquals("foo", persistentClass.getSchemaTypeName());
-
+		assertEquals("foo", persistentClass.getSpecifiedXmlTypeName());
+		assertEquals("foo", persistentClass.getXmlTypeName());
+		
 		//remove the namespace member value pair
 		annotatedElement.edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
@@ -439,7 +449,8 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
 				GenericJavaPersistentClassTests.this.values(xmlTypeAnnotation).remove(0);
 			}
 		});
-		assertNull(persistentClass.getSchemaTypeName());
+		assertNull(persistentClass.getSpecifiedXmlTypeName());
+		assertEquals(defaultXmlTypeName, persistentClass.getXmlTypeName());
 	}
 
 	public void testModifyNamespace() throws Exception {
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentEnumTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentEnumTests.java
index 246c68a61d..32f1b6ce4e 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentEnumTests.java
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentEnumTests.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
 
+import java.beans.Introspector;
 import java.util.Iterator;
 import java.util.ListIterator;
 import org.eclipse.jdt.core.ICompilationUnit;
@@ -164,26 +165,32 @@ public class GenericJavaPersistentEnumTests extends JaxbContextModelTestCase
 		
 		JaxbPersistentEnum contextEnum = CollectionTools.get(getContextRoot().getPersistentEnums(), 0);
 		JavaResourceEnum resourceEnum = contextEnum.getJavaResourceType();
-	
-		assertNull(contextEnum.getSchemaTypeName());
+		String defaultXmlTypeName = Introspector.decapitalize(TYPE_NAME);
+		
+		assertNull(contextEnum.getSpecifiedXmlTypeName());
+		assertEquals(defaultXmlTypeName, contextEnum.getDefaultXmlTypeName());
+		assertEquals(defaultXmlTypeName, contextEnum.getXmlTypeName());
 		
-		contextEnum.setSchemaTypeName("foo");
+		contextEnum.setSpecifiedXmlTypeName("foo");
 		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceEnum.getAnnotation(XmlTypeAnnotation.ANNOTATION_NAME);
 		assertEquals("foo", xmlTypeAnnotation.getName());
-		assertEquals("foo", contextEnum.getSchemaTypeName());
+		assertEquals("foo", contextEnum.getSpecifiedXmlTypeName());
+		assertEquals("foo", contextEnum.getXmlTypeName());
 		
-		contextEnum.setSchemaTypeName(null);
+		contextEnum.setSpecifiedXmlTypeName(null);
 		xmlTypeAnnotation = (XmlTypeAnnotation) resourceEnum.getAnnotation(XmlTypeAnnotation.ANNOTATION_NAME);
 		assertNull(xmlTypeAnnotation.getName());
-		assertNull(contextEnum.getSchemaTypeName());
-	
+		assertNull(contextEnum.getSpecifiedXmlTypeName());
+		assertEquals(defaultXmlTypeName, contextEnum.getXmlTypeName());
+		
 		resourceEnum.removeAnnotation(XmlTypeAnnotation.ANNOTATION_NAME);
 		
 		//set name again, this time starting with no XmlType annotation
-		contextEnum.setSchemaTypeName("foo");
+		contextEnum.setSpecifiedXmlTypeName("foo");
 		xmlTypeAnnotation = (XmlTypeAnnotation) resourceEnum.getAnnotation(XmlTypeAnnotation.ANNOTATION_NAME);
 		assertEquals("foo", xmlTypeAnnotation.getName());
-		assertEquals("foo", contextEnum.getSchemaTypeName());
+		assertEquals("foo", contextEnum.getSpecifiedXmlTypeName());
+		assertEquals("foo", contextEnum.getXmlTypeName());
 	}
 	
 	public void testUpdateSchemaTypeName() throws Exception {
@@ -191,9 +198,11 @@ public class GenericJavaPersistentEnumTests extends JaxbContextModelTestCase
 		
 		JaxbPersistentEnum contextEnum = CollectionTools.get(getContextRoot().getPersistentEnums(), 0);
 		JavaResourceEnum resourceEnum = contextEnum.getJavaResourceType();
-	
-		assertNull(contextEnum.getSchemaTypeName());
+		String defaultXmlTypeName = Introspector.decapitalize(TYPE_NAME);
 		
+		assertNull(contextEnum.getSpecifiedXmlTypeName());
+		assertEquals(defaultXmlTypeName, contextEnum.getDefaultXmlTypeName());
+		assertEquals(defaultXmlTypeName, contextEnum.getXmlTypeName());
 		
 		//add a namespace member value pair
 		AnnotatedElement annotatedElement = this.annotatedElement(resourceEnum);
@@ -203,8 +212,9 @@ public class GenericJavaPersistentEnumTests extends JaxbContextModelTestCase
 				GenericJavaPersistentEnumTests.this.addXmlTypeMemberValuePair(declaration, JAXB.XML_TYPE__NAME, "foo");
 			}
 		});
-		assertEquals("foo", contextEnum.getSchemaTypeName());
-
+		assertEquals("foo", contextEnum.getSpecifiedXmlTypeName());
+		assertEquals("foo", contextEnum.getXmlTypeName());
+		
 		//remove the namespace member value pair
 		annotatedElement.edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
@@ -212,7 +222,8 @@ public class GenericJavaPersistentEnumTests extends JaxbContextModelTestCase
 				GenericJavaPersistentEnumTests.this.values(xmlTypeAnnotation).remove(0);
 			}
 		});
-		assertNull(contextEnum.getSchemaTypeName());
+		assertNull(contextEnum.getSpecifiedXmlTypeName());
+		assertEquals(defaultXmlTypeName, contextEnum.getXmlTypeName());
 	}
 
 	public void testModifyNamespace() throws Exception {