diff options
author | kmoore | 2010-12-17 18:56:15 +0000 |
---|---|---|
committer | kmoore | 2010-12-17 18:56:15 +0000 |
commit | 509a5c41f5e71239e0ef823a104ef7d78e7557b7 (patch) | |
tree | 80acc2426f996e931be2966307348dfa5c0d327b /jaxb/tests/org.eclipse.jpt.jaxb.core.tests | |
parent | 3e675de3beabdd57832d249ff93cbbdc503a69f8 (diff) | |
download | webtools.dali-509a5c41f5e71239e0ef823a104ef7d78e7557b7.tar.gz webtools.dali-509a5c41f5e71239e0ef823a104ef7d78e7557b7.tar.xz webtools.dali-509a5c41f5e71239e0ef823a104ef7d78e7557b7.zip |
removed some of the getDefault*() methods from our jaxb interfaces. I don't think they are needed if the default never changes
Diffstat (limited to 'jaxb/tests/org.eclipse.jpt.jaxb.core.tests')
4 files changed, 46 insertions, 134 deletions
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 6d55900400..246c68a61d 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 @@ -601,30 +601,22 @@ public class GenericJavaPersistentEnumTests extends JaxbContextModelTestCase JaxbPersistentEnum contextEnum = CollectionTools.get(getContextRoot().getPersistentEnums(), 0); JavaResourceEnum resourceEnum = contextEnum.getJavaResourceType(); - assertNull(contextEnum.getSpecifiedEnumType()); - assertEquals(JaxbPersistentEnum.DEFAULT_ENUM_TYPE, contextEnum.getEnumType()); - assertEquals(JaxbPersistentEnum.DEFAULT_ENUM_TYPE, contextEnum.getDefaultEnumType()); + assertNull(contextEnum.getEnumType()); - contextEnum.setSpecifiedEnumType("Integer"); + contextEnum.setEnumType("Integer"); XmlEnumAnnotation xmlEnumAnnotation = (XmlEnumAnnotation) resourceEnum.getAnnotation(XmlEnumAnnotation.ANNOTATION_NAME); assertEquals("Integer", xmlEnumAnnotation.getValue()); - assertEquals("Integer", contextEnum.getSpecifiedEnumType()); assertEquals("Integer", contextEnum.getEnumType()); - assertEquals(JaxbPersistentEnum.DEFAULT_ENUM_TYPE, contextEnum.getDefaultEnumType()); - contextEnum.setSpecifiedEnumType(null); + contextEnum.setEnumType(null); xmlEnumAnnotation = (XmlEnumAnnotation) resourceEnum.getAnnotation(XmlEnumAnnotation.ANNOTATION_NAME); assertNull(xmlEnumAnnotation.getValue()); - assertNull(contextEnum.getSpecifiedEnumType()); - assertEquals(JaxbPersistentEnum.DEFAULT_ENUM_TYPE, contextEnum.getEnumType()); - assertEquals(JaxbPersistentEnum.DEFAULT_ENUM_TYPE, contextEnum.getDefaultEnumType()); + assertNull(contextEnum.getEnumType()); resourceEnum.addAnnotation(XmlTypeAnnotation.ANNOTATION_NAME); resourceEnum.removeAnnotation(XmlEnumAnnotation.ANNOTATION_NAME); contextEnum = CollectionTools.get(getContextRoot().getPersistentEnums(), 0); - assertNull(contextEnum.getSpecifiedEnumType()); - assertEquals(JaxbPersistentEnum.DEFAULT_ENUM_TYPE, contextEnum.getEnumType()); - assertEquals(JaxbPersistentEnum.DEFAULT_ENUM_TYPE, contextEnum.getDefaultEnumType()); + assertNull(contextEnum.getEnumType()); } public void testUpdateEnumType() throws Exception { @@ -633,7 +625,7 @@ public class GenericJavaPersistentEnumTests extends JaxbContextModelTestCase JaxbPersistentEnum contextEnum = CollectionTools.get(getContextRoot().getPersistentEnums(), 0); JavaResourceEnum resourceEnum = contextEnum.getJavaResourceType(); - assertNull(contextEnum.getSpecifiedEnumType()); + assertNull(contextEnum.getEnumType()); //add a factoryClass member value pair @@ -643,7 +635,7 @@ public class GenericJavaPersistentEnumTests extends JaxbContextModelTestCase GenericJavaPersistentEnumTests.this.addXmlEnumTypeMemberValuePair(declaration, JAXB.XML_ENUM__VALUE, "String"); } }); - assertEquals("String", contextEnum.getSpecifiedEnumType()); + assertEquals("String", contextEnum.getEnumType()); //remove the factoryClass member value pair annotatedElement.edit(new Member.Editor() { @@ -652,7 +644,7 @@ public class GenericJavaPersistentEnumTests extends JaxbContextModelTestCase GenericJavaPersistentEnumTests.this.values(xmlEnumAnnotation).remove(0); } }); - assertNull(contextEnum.getSpecifiedEnumType()); + assertNull(contextEnum.getEnumType()); } public void testUpdateEnumConstants() throws Exception { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlJavaTypeAdapterTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlJavaTypeAdapterTests.java index e067b9d0b3..9501b0796b 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlJavaTypeAdapterTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlJavaTypeAdapterTests.java @@ -92,24 +92,18 @@ public class GenericJavaXmlJavaTypeAdapterTests extends JaxbContextModelTestCase XmlJavaTypeAdapter contextXmlJavaTypeAdapter = contextPackageInfo.getXmlJavaTypeAdapters().iterator().next(); JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage(); - assertEquals(XmlJavaTypeAdapter.DEFAULT_TYPE, contextXmlJavaTypeAdapter.getDefaultType()); - assertEquals(XmlJavaTypeAdapter.DEFAULT_TYPE, contextXmlJavaTypeAdapter.getType()); - assertNull(contextXmlJavaTypeAdapter.getSpecifiedType()); + assertNull(contextXmlJavaTypeAdapter.getType()); - contextXmlJavaTypeAdapter.setSpecifiedType("foo"); + contextXmlJavaTypeAdapter.setType("foo"); XmlJavaTypeAdapterAnnotation javaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourcePackage.getAnnotation(0, XmlJavaTypeAdapterAnnotation.ANNOTATION_NAME); assertEquals("foo", javaTypeAdapterAnnotation.getType()); - assertEquals(XmlJavaTypeAdapter.DEFAULT_TYPE, contextXmlJavaTypeAdapter.getDefaultType()); assertEquals("foo", contextXmlJavaTypeAdapter.getType()); - assertEquals("foo", contextXmlJavaTypeAdapter.getSpecifiedType()); //verify the xml schema type annotation is not removed when the type is set to null - contextXmlJavaTypeAdapter.setSpecifiedType(null); + contextXmlJavaTypeAdapter.setType(null); javaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourcePackage.getAnnotation(0, XmlJavaTypeAdapterAnnotation.ANNOTATION_NAME); assertNull(javaTypeAdapterAnnotation.getType()); - assertEquals(XmlJavaTypeAdapter.DEFAULT_TYPE, contextXmlJavaTypeAdapter.getDefaultType()); - assertEquals(XmlJavaTypeAdapter.DEFAULT_TYPE, contextXmlJavaTypeAdapter.getType()); - assertNull(contextXmlJavaTypeAdapter.getSpecifiedType()); + assertNull(contextXmlJavaTypeAdapter.getType()); } public void testUpdateType() throws Exception { @@ -118,9 +112,7 @@ public class GenericJavaXmlJavaTypeAdapterTests extends JaxbContextModelTestCase XmlJavaTypeAdapter contextXmlJavaTypeAdapter = contextPackageInfo.getXmlJavaTypeAdapters().iterator().next(); JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage(); - assertEquals(XmlJavaTypeAdapter.DEFAULT_TYPE, contextXmlJavaTypeAdapter.getDefaultType()); - assertEquals(XmlJavaTypeAdapter.DEFAULT_TYPE, contextXmlJavaTypeAdapter.getType()); - assertNull(contextXmlJavaTypeAdapter.getSpecifiedType()); + assertNull(contextXmlJavaTypeAdapter.getType()); //add a type member value pair AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage); @@ -129,9 +121,7 @@ public class GenericJavaXmlJavaTypeAdapterTests extends JaxbContextModelTestCase GenericJavaXmlJavaTypeAdapterTests.this.addXmlJavaTypeAdapterTypeMemberValuePair(declaration, JAXB.XML_JAVA_TYPE_ADAPTER__TYPE, "String"); } }); - assertEquals(XmlJavaTypeAdapter.DEFAULT_TYPE, contextXmlJavaTypeAdapter.getDefaultType()); assertEquals("String", contextXmlJavaTypeAdapter.getType()); - assertEquals("String", contextXmlJavaTypeAdapter.getSpecifiedType()); annotatedElement.edit(new Member.Editor() { public void edit(ModifiedDeclaration declaration) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTests.java index e5b8924ddc..e559fa6699 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTests.java @@ -113,33 +113,25 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema(); JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage(); - assertEquals(XmlSchema.DEFAULT_LOCATION, contextXmlSchema.getDefaultLocation()); - assertEquals(XmlSchema.DEFAULT_LOCATION, contextXmlSchema.getLocation()); - assertNull(contextXmlSchema.getSpecifiedLocation()); + assertNull(contextXmlSchema.getLocation()); - contextXmlSchema.setSpecifiedLocation("foo"); + contextXmlSchema.setLocation("foo"); XmlSchemaAnnotation schemaAnnotation = (XmlSchemaAnnotation) resourcePackage.getAnnotation(XmlSchemaAnnotation.ANNOTATION_NAME); assertEquals("foo", schemaAnnotation.getLocation()); - assertEquals(XmlSchema.DEFAULT_LOCATION, contextXmlSchema.getDefaultLocation()); assertEquals("foo", contextXmlSchema.getLocation()); - assertEquals("foo", contextXmlSchema.getSpecifiedLocation()); //set another annotation so the context model is not blown away by removing the XmlSchema annotation contextPackageInfo.setSpecifiedAccessType(XmlAccessType.FIELD); - contextXmlSchema.setSpecifiedLocation(null); + contextXmlSchema.setLocation(null); schemaAnnotation = (XmlSchemaAnnotation) resourcePackage.getAnnotation(XmlSchemaAnnotation.ANNOTATION_NAME); assertNull(schemaAnnotation); - assertEquals(XmlSchema.DEFAULT_LOCATION, contextXmlSchema.getDefaultLocation()); - assertEquals(XmlSchema.DEFAULT_LOCATION, contextXmlSchema.getLocation()); - assertNull(contextXmlSchema.getSpecifiedLocation()); + assertNull(contextXmlSchema.getLocation()); //set location again, this time starting with no XmlSchema annotation - contextXmlSchema.setSpecifiedLocation("foo"); + contextXmlSchema.setLocation("foo"); schemaAnnotation = (XmlSchemaAnnotation) resourcePackage.getAnnotation(XmlSchemaAnnotation.ANNOTATION_NAME); assertEquals("foo", schemaAnnotation.getLocation()); - assertEquals(XmlSchema.DEFAULT_LOCATION, contextXmlSchema.getDefaultLocation()); assertEquals("foo", contextXmlSchema.getLocation()); - assertEquals("foo", contextXmlSchema.getSpecifiedLocation()); } public void testUpdateLocation() throws Exception { @@ -148,9 +140,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema(); JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage(); - assertEquals(XmlSchema.DEFAULT_LOCATION, contextXmlSchema.getDefaultLocation()); - assertEquals(XmlSchema.DEFAULT_LOCATION, contextXmlSchema.getLocation()); - assertNull(contextXmlSchema.getSpecifiedLocation()); + assertNull(contextXmlSchema.getLocation()); //add a location member value pair AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage); @@ -160,9 +150,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase } }); - assertEquals(XmlSchema.DEFAULT_LOCATION, contextXmlSchema.getDefaultLocation()); assertEquals("foo", contextXmlSchema.getLocation()); - assertEquals("foo", contextXmlSchema.getSpecifiedLocation()); annotatedElement.edit(new Member.Editor() { public void edit(ModifiedDeclaration declaration) { @@ -170,9 +158,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase } }); contextXmlSchema = contextPackageInfo.getXmlSchema(); - assertEquals(XmlSchema.DEFAULT_LOCATION, contextXmlSchema.getDefaultLocation()); - assertEquals(XmlSchema.DEFAULT_LOCATION, contextXmlSchema.getLocation()); - assertNull(contextXmlSchema.getSpecifiedLocation()); + assertNull(contextXmlSchema.getLocation()); } public void testModifyAttributeFormDefault() throws Exception { @@ -181,39 +167,29 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema(); JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage(); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getDefaultAttributeFormDefault()); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getAttributeFormDefault()); - assertNull(contextXmlSchema.getSpecifiedAttributeFormDefault()); + assertNull(contextXmlSchema.getAttributeFormDefault()); - contextXmlSchema.setSpecifiedAttributeFormDefault(XmlNsForm.QUALIFIED); + contextXmlSchema.setAttributeFormDefault(XmlNsForm.QUALIFIED); XmlSchemaAnnotation schemaAnnotation = (XmlSchemaAnnotation) resourcePackage.getAnnotation(XmlSchemaAnnotation.ANNOTATION_NAME); assertEquals(org.eclipse.jpt.jaxb.core.resource.java.XmlNsForm.QUALIFIED, schemaAnnotation.getAttributeFormDefault()); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getDefaultAttributeFormDefault()); assertEquals(XmlNsForm.QUALIFIED, contextXmlSchema.getAttributeFormDefault()); - assertEquals(XmlNsForm.QUALIFIED, contextXmlSchema.getSpecifiedAttributeFormDefault()); - contextXmlSchema.setSpecifiedAttributeFormDefault(XmlNsForm.UNQUALIFIED); + contextXmlSchema.setAttributeFormDefault(XmlNsForm.UNQUALIFIED); assertEquals(org.eclipse.jpt.jaxb.core.resource.java.XmlNsForm.UNQUALIFIED, schemaAnnotation.getAttributeFormDefault()); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getDefaultAttributeFormDefault()); assertEquals(XmlNsForm.UNQUALIFIED, contextXmlSchema.getAttributeFormDefault()); - assertEquals(XmlNsForm.UNQUALIFIED, contextXmlSchema.getSpecifiedAttributeFormDefault()); //set another annotation so the context model is not blown away by removing the XmlSchema annotation contextPackageInfo.setSpecifiedAccessType(XmlAccessType.FIELD); - contextXmlSchema.setSpecifiedAttributeFormDefault(null); + contextXmlSchema.setAttributeFormDefault(null); schemaAnnotation = (XmlSchemaAnnotation) resourcePackage.getAnnotation(XmlSchemaAnnotation.ANNOTATION_NAME); assertNull(schemaAnnotation); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getDefaultAttributeFormDefault()); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getAttributeFormDefault()); - assertNull(contextXmlSchema.getSpecifiedAttributeFormDefault()); + assertNull(contextXmlSchema.getAttributeFormDefault()); //set attribute form default again, this time starting with no XmlSchema annotation - contextXmlSchema.setSpecifiedAttributeFormDefault(XmlNsForm.QUALIFIED); + contextXmlSchema.setAttributeFormDefault(XmlNsForm.QUALIFIED); schemaAnnotation = (XmlSchemaAnnotation) resourcePackage.getAnnotation(XmlSchemaAnnotation.ANNOTATION_NAME); assertEquals(org.eclipse.jpt.jaxb.core.resource.java.XmlNsForm.QUALIFIED, schemaAnnotation.getAttributeFormDefault()); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getDefaultAttributeFormDefault()); assertEquals(XmlNsForm.QUALIFIED, contextXmlSchema.getAttributeFormDefault()); - assertEquals(XmlNsForm.QUALIFIED, contextXmlSchema.getSpecifiedAttributeFormDefault()); } public void testUpdateAttributeFormDefault() throws Exception { @@ -222,9 +198,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema(); JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage(); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getDefaultAttributeFormDefault()); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getAttributeFormDefault()); - assertNull(contextXmlSchema.getSpecifiedAttributeFormDefault()); + assertNull(contextXmlSchema.getAttributeFormDefault()); //set the attribute form default value to QUALIFIED AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage); @@ -237,9 +211,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase } }); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getDefaultAttributeFormDefault()); assertEquals(XmlNsForm.QUALIFIED, contextXmlSchema.getAttributeFormDefault()); - assertEquals(XmlNsForm.QUALIFIED, contextXmlSchema.getSpecifiedAttributeFormDefault()); //set the attribute form default value to UNQUALIFIED @@ -252,9 +224,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase } }); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getDefaultAttributeFormDefault()); assertEquals(XmlNsForm.UNQUALIFIED, contextXmlSchema.getAttributeFormDefault()); - assertEquals(XmlNsForm.UNQUALIFIED, contextXmlSchema.getSpecifiedAttributeFormDefault()); annotatedElement.edit(new Member.Editor() { public void edit(ModifiedDeclaration declaration) { @@ -263,9 +233,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase }); contextXmlSchema = contextPackageInfo.getXmlSchema(); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getDefaultAttributeFormDefault()); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getAttributeFormDefault()); - assertNull(contextXmlSchema.getSpecifiedAttributeFormDefault()); + assertNull(contextXmlSchema.getAttributeFormDefault()); } public void testModifyElementFormDefault() throws Exception { @@ -274,39 +242,29 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema(); JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage(); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getDefaultElementFormDefault()); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getElementFormDefault()); - assertNull(contextXmlSchema.getSpecifiedElementFormDefault()); + assertNull(contextXmlSchema.getElementFormDefault()); - contextXmlSchema.setSpecifiedElementFormDefault(XmlNsForm.QUALIFIED); + contextXmlSchema.setElementFormDefault(XmlNsForm.QUALIFIED); XmlSchemaAnnotation schemaAnnotation = (XmlSchemaAnnotation) resourcePackage.getAnnotation(XmlSchemaAnnotation.ANNOTATION_NAME); assertEquals(org.eclipse.jpt.jaxb.core.resource.java.XmlNsForm.QUALIFIED, schemaAnnotation.getElementFormDefault()); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getDefaultElementFormDefault()); assertEquals(XmlNsForm.QUALIFIED, contextXmlSchema.getElementFormDefault()); - assertEquals(XmlNsForm.QUALIFIED, contextXmlSchema.getSpecifiedElementFormDefault()); - contextXmlSchema.setSpecifiedElementFormDefault(XmlNsForm.UNQUALIFIED); + contextXmlSchema.setElementFormDefault(XmlNsForm.UNQUALIFIED); assertEquals(org.eclipse.jpt.jaxb.core.resource.java.XmlNsForm.UNQUALIFIED, schemaAnnotation.getElementFormDefault()); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getDefaultElementFormDefault()); assertEquals(XmlNsForm.UNQUALIFIED, contextXmlSchema.getElementFormDefault()); - assertEquals(XmlNsForm.UNQUALIFIED, contextXmlSchema.getSpecifiedElementFormDefault()); //set another annotation so the context model is not blown away by removing the XmlSchema annotation contextPackageInfo.setSpecifiedAccessType(XmlAccessType.FIELD); - contextXmlSchema.setSpecifiedElementFormDefault(null); + contextXmlSchema.setElementFormDefault(null); schemaAnnotation = (XmlSchemaAnnotation) resourcePackage.getAnnotation(XmlSchemaAnnotation.ANNOTATION_NAME); assertNull(schemaAnnotation); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getDefaultElementFormDefault()); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getElementFormDefault()); - assertNull(contextXmlSchema.getSpecifiedElementFormDefault()); + assertNull(contextXmlSchema.getElementFormDefault()); //set element form default again, this time starting with no XmlSchema annotation - contextXmlSchema.setSpecifiedElementFormDefault(XmlNsForm.QUALIFIED); + contextXmlSchema.setElementFormDefault(XmlNsForm.QUALIFIED); schemaAnnotation = (XmlSchemaAnnotation) resourcePackage.getAnnotation(XmlSchemaAnnotation.ANNOTATION_NAME); assertEquals(org.eclipse.jpt.jaxb.core.resource.java.XmlNsForm.QUALIFIED, schemaAnnotation.getElementFormDefault()); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getDefaultElementFormDefault()); assertEquals(XmlNsForm.QUALIFIED, contextXmlSchema.getElementFormDefault()); - assertEquals(XmlNsForm.QUALIFIED, contextXmlSchema.getSpecifiedElementFormDefault()); } public void testUpdateElementFormDefault() throws Exception { @@ -315,9 +273,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema(); JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage(); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getDefaultElementFormDefault()); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getElementFormDefault()); - assertNull(contextXmlSchema.getSpecifiedElementFormDefault()); + assertNull(contextXmlSchema.getElementFormDefault()); //set the element form default value to QUALIFIED AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage); @@ -330,9 +286,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase } }); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getDefaultElementFormDefault()); assertEquals(XmlNsForm.QUALIFIED, contextXmlSchema.getElementFormDefault()); - assertEquals(XmlNsForm.QUALIFIED, contextXmlSchema.getSpecifiedElementFormDefault()); //set the element form default value to UNQUALIFIED @@ -345,9 +299,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase } }); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getDefaultElementFormDefault()); assertEquals(XmlNsForm.UNQUALIFIED, contextXmlSchema.getElementFormDefault()); - assertEquals(XmlNsForm.UNQUALIFIED, contextXmlSchema.getSpecifiedElementFormDefault()); annotatedElement.edit(new Member.Editor() { public void edit(ModifiedDeclaration declaration) { @@ -356,9 +308,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase }); contextXmlSchema = contextPackageInfo.getXmlSchema(); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getDefaultElementFormDefault()); - assertEquals(XmlNsForm.UNSET, contextXmlSchema.getElementFormDefault()); - assertNull(contextXmlSchema.getSpecifiedElementFormDefault()); + assertNull(contextXmlSchema.getElementFormDefault()); } public void testGetXmlNsPrefixes() throws Exception { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTypeTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTypeTests.java index 99af6faf4a..c5e96bfb83 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTypeTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTypeTests.java @@ -91,24 +91,18 @@ public class GenericJavaXmlSchemaTypeTests extends JaxbContextModelTestCase XmlSchemaType contextXmlSchemaType = contextPackageInfo.getXmlSchemaTypes().iterator().next(); JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage(); - assertEquals(XmlSchemaType.DEFAULT_NAMESPACE, contextXmlSchemaType.getDefaultNamespace()); - assertEquals(XmlSchemaType.DEFAULT_NAMESPACE, contextXmlSchemaType.getNamespace()); - assertNull(contextXmlSchemaType.getSpecifiedNamespace()); + assertNull(contextXmlSchemaType.getNamespace()); - contextXmlSchemaType.setSpecifiedNamespace("foo"); + contextXmlSchemaType.setNamespace("foo"); XmlSchemaTypeAnnotation schemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourcePackage.getAnnotation(0, XmlSchemaTypeAnnotation.ANNOTATION_NAME); assertEquals("foo", schemaTypeAnnotation.getNamespace()); - assertEquals(XmlSchemaType.DEFAULT_NAMESPACE, contextXmlSchemaType.getDefaultNamespace()); assertEquals("foo", contextXmlSchemaType.getNamespace()); - assertEquals("foo", contextXmlSchemaType.getSpecifiedNamespace()); //verify the xml schema type annotation is not removed when the namespace is set to null - contextXmlSchemaType.setSpecifiedNamespace(null); + contextXmlSchemaType.setNamespace(null); schemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourcePackage.getAnnotation(0, XmlSchemaTypeAnnotation.ANNOTATION_NAME); assertNull(schemaTypeAnnotation.getNamespace()); - assertEquals(XmlSchemaType.DEFAULT_NAMESPACE, contextXmlSchemaType.getDefaultNamespace()); - assertEquals(XmlSchemaType.DEFAULT_NAMESPACE, contextXmlSchemaType.getNamespace()); - assertNull(contextXmlSchemaType.getSpecifiedNamespace()); + assertNull(contextXmlSchemaType.getNamespace()); } public void testUpdateNamespace() throws Exception { @@ -117,9 +111,7 @@ public class GenericJavaXmlSchemaTypeTests extends JaxbContextModelTestCase XmlSchemaType contextXmlSchemaType = contextPackageInfo.getXmlSchemaTypes().iterator().next(); JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage(); - assertEquals(XmlSchemaType.DEFAULT_NAMESPACE, contextXmlSchemaType.getDefaultNamespace()); - assertEquals(XmlSchemaType.DEFAULT_NAMESPACE, contextXmlSchemaType.getNamespace()); - assertNull(contextXmlSchemaType.getSpecifiedNamespace()); + assertNull(contextXmlSchemaType.getNamespace()); //add a namespace member value pair AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage); @@ -128,9 +120,7 @@ public class GenericJavaXmlSchemaTypeTests extends JaxbContextModelTestCase GenericJavaXmlSchemaTypeTests.this.addXmlSchemaTypeMemberValuePair(declaration, JAXB.XML_SCHEMA_TYPE__NAMESPACE, "foo"); } }); - assertEquals(XmlSchemaType.DEFAULT_NAMESPACE, contextXmlSchemaType.getDefaultNamespace()); assertEquals("foo", contextXmlSchemaType.getNamespace()); - assertEquals("foo", contextXmlSchemaType.getSpecifiedNamespace()); annotatedElement.edit(new Member.Editor() { public void edit(ModifiedDeclaration declaration) { @@ -146,24 +136,18 @@ public class GenericJavaXmlSchemaTypeTests extends JaxbContextModelTestCase XmlSchemaType contextXmlSchemaType = contextPackageInfo.getXmlSchemaTypes().iterator().next(); JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage(); - assertEquals(XmlSchemaType.DEFAULT_TYPE, contextXmlSchemaType.getDefaultType()); - assertEquals(XmlSchemaType.DEFAULT_TYPE, contextXmlSchemaType.getType()); - assertNull(contextXmlSchemaType.getSpecifiedType()); + assertNull(contextXmlSchemaType.getType()); - contextXmlSchemaType.setSpecifiedType("foo"); + contextXmlSchemaType.setType("foo"); XmlSchemaTypeAnnotation schemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourcePackage.getAnnotation(0, XmlSchemaTypeAnnotation.ANNOTATION_NAME); assertEquals("foo", schemaTypeAnnotation.getType()); - assertEquals(XmlSchemaType.DEFAULT_TYPE, contextXmlSchemaType.getDefaultType()); assertEquals("foo", contextXmlSchemaType.getType()); - assertEquals("foo", contextXmlSchemaType.getSpecifiedType()); //verify the xml schema type annotation is not removed when the type is set to null - contextXmlSchemaType.setSpecifiedType(null); + contextXmlSchemaType.setType(null); schemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourcePackage.getAnnotation(0, XmlSchemaTypeAnnotation.ANNOTATION_NAME); assertNull(schemaTypeAnnotation.getType()); - assertEquals(XmlSchemaType.DEFAULT_TYPE, contextXmlSchemaType.getDefaultType()); - assertEquals(XmlSchemaType.DEFAULT_TYPE, contextXmlSchemaType.getType()); - assertNull(contextXmlSchemaType.getSpecifiedType()); + assertNull(contextXmlSchemaType.getType()); } public void testUpdateType() throws Exception { @@ -172,9 +156,7 @@ public class GenericJavaXmlSchemaTypeTests extends JaxbContextModelTestCase XmlSchemaType contextXmlSchemaType = contextPackageInfo.getXmlSchemaTypes().iterator().next(); JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage(); - assertEquals(XmlSchemaType.DEFAULT_TYPE, contextXmlSchemaType.getDefaultType()); - assertEquals(XmlSchemaType.DEFAULT_TYPE, contextXmlSchemaType.getType()); - assertNull(contextXmlSchemaType.getSpecifiedType()); + assertNull(contextXmlSchemaType.getType()); //add a type member value pair AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage); @@ -183,9 +165,7 @@ public class GenericJavaXmlSchemaTypeTests extends JaxbContextModelTestCase GenericJavaXmlSchemaTypeTests.this.addXmlSchemaTypeTypeMemberValuePair(declaration, JAXB.XML_SCHEMA_TYPE__TYPE, "String"); } }); - assertEquals(XmlSchemaType.DEFAULT_TYPE, contextXmlSchemaType.getDefaultType()); assertEquals("String", contextXmlSchemaType.getType()); - assertEquals("String", contextXmlSchemaType.getSpecifiedType()); annotatedElement.edit(new Member.Editor() { public void edit(ModifiedDeclaration declaration) { |