Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpfullbright2010-10-29 14:57:58 -0400
committerpfullbright2010-10-29 14:57:58 -0400
commit6579da79885a67e16b69d94651c9b3cbc1c39420 (patch)
treef6621d549b9ced8de1e59f02a89e25faf6d5798a
parent3bafaf141669fb0676d4b5ee090c36effee516a6 (diff)
downloadwebtools.dali-6579da79885a67e16b69d94651c9b3cbc1c39420.tar.gz
webtools.dali-6579da79885a67e16b69d94651c9b3cbc1c39420.tar.xz
webtools.dali-6579da79885a67e16b69d94651c9b3cbc1c39420.zip
(REQUIRES 10/29 I-BUILD) - package annotation tests enabled by fix to bug 328400
-rw-r--r--jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlJavaTypeAdapterPackageAnnotationTests.java13
-rw-r--r--jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlSchemaTypeAnnotationTests.java13
2 files changed, 12 insertions, 14 deletions
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlJavaTypeAdapterPackageAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlJavaTypeAdapterPackageAnnotationTests.java
index 883f584b43..0787a570e6 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlJavaTypeAdapterPackageAnnotationTests.java
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlJavaTypeAdapterPackageAnnotationTests.java
@@ -258,12 +258,11 @@ public class XmlJavaTypeAdapterPackageAnnotationTests
+ ".class),@XmlJavaTypeAdapter(" + TEST_CLASS
+ ".class)})", cu);
-// TODO uncomment when bug 328400 is addressed
-// resourcePackage.removeAnnotation(1, JAXB.XML_JAVA_TYPE_ADAPTER, JAXB.XML_JAVA_TYPE_ADAPTERS);
-// adaptersAnnotation =
-// (XmlJavaTypeAdaptersAnnotation) resourcePackage.getAnnotation(JAXB.XML_JAVA_TYPE_ADAPTERS);
-// assertNull(adaptersAnnotation);
-// assertSourceContains(
-// "@XmlJavaTypeAdapter(" + TEST_CLASS_2 + ")", cu);
+ resourcePackage.removeAnnotation(1, JAXB.XML_JAVA_TYPE_ADAPTER, JAXB.XML_JAVA_TYPE_ADAPTERS);
+ adaptersAnnotation =
+ (XmlJavaTypeAdaptersAnnotation) resourcePackage.getAnnotation(JAXB.XML_JAVA_TYPE_ADAPTERS);
+ assertNull(adaptersAnnotation);
+ assertSourceContains(
+ "@XmlJavaTypeAdapter(" + TEST_CLASS_2 + ".class)", cu);
}
}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlSchemaTypeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlSchemaTypeAnnotationTests.java
index 03099f4306..0c7bb8995e 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlSchemaTypeAnnotationTests.java
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlSchemaTypeAnnotationTests.java
@@ -248,12 +248,11 @@ public class XmlSchemaTypeAnnotationTests
+ "\"),@XmlSchemaType(name = \"" + TEST_NAME
+ "\")})", cu);
-// TODO uncomment when bug 328400 is addressed
-// packageResource.removeAnnotation(1, JAXB.XML_SCHEMA_TYPE, JAXB.XML_SCHEMA_TYPES);
-// containerAnnotation =
-// (XmlSchemaTypesAnnotation) packageResource.getAnnotation(JAXB.XML_SCHEMA_TYPES);
-// assertNull(containerAnnotation);
-// assertSourceContains(
-// "@XmlSchemaType(name = \"" + TEST_NAME + "\")", cu);
+ packageResource.removeAnnotation(1, JAXB.XML_SCHEMA_TYPE, JAXB.XML_SCHEMA_TYPES);
+ containerAnnotation =
+ (XmlSchemaTypesAnnotation) packageResource.getAnnotation(JAXB.XML_SCHEMA_TYPES);
+ assertNull(containerAnnotation);
+ assertSourceContains(
+ "@XmlSchemaType(name = \"" + TEST_NAME_2 + "\")", cu);
}
}

Back to the top