Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Fullbright2013-01-31 18:14:40 +0000
committerPaul Fullbright2013-02-08 16:28:25 +0000
commit3b554017bd0ba2f6a8d71814c98c5d09d857026b (patch)
treee922ba3a1eb3501879ebe4e5ccfc9ae666d4207b /jaxb/tests
parent4c50aaf692593fc1642fa8d6d175ae3f775003c7 (diff)
downloadwebtools.dali-3b554017bd0ba2f6a8d71814c98c5d09d857026b.tar.gz
webtools.dali-3b554017bd0ba2f6a8d71814c98c5d09d857026b.tar.xz
webtools.dali-3b554017bd0ba2f6a8d71814c98c5d09d857026b.zip
added default xml see also behavior to OXM type mappings
Diffstat (limited to 'jaxb/tests')
-rw-r--r--jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmJavaTypeTests.java92
-rw-r--r--jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmXmlSeeAlsoTests.java4
2 files changed, 94 insertions, 2 deletions
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmJavaTypeTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmJavaTypeTests.java
index 7bda4591fb..9b675a4db9 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmJavaTypeTests.java
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmJavaTypeTests.java
@@ -589,6 +589,98 @@ public class OxmJavaTypeTests
assertFalse(oxmMapping.isXmlTransient());
}
+ public void testUpdateXmlSeeAlso() throws Exception {
+ createClassWithXmlType();
+ addOxmFile("oxm.xml", PACKAGE_NAME, TYPE_NAME);
+ ELJaxbContextRoot root = (ELJaxbContextRoot) getJaxbProject().getContextRoot();
+ OxmFile oxmFile = root.getOxmFile(PACKAGE_NAME);
+ OxmXmlBindings xmlBindings = oxmFile.getXmlBindings();
+ OxmJavaType oxmMapping = xmlBindings.getJavaType(0);
+ JptXmlResource oxmResource = oxmFile.getOxmResource();
+ EXmlBindings eXmlBindings = (EXmlBindings) oxmResource.getRootObject();
+ EJavaType eJavaType = eXmlBindings.getJavaTypes().get(0);
+ JavaTypeMapping javaMapping = oxmMapping.getJavaType().getMapping();
+
+ assertNull(javaMapping.getXmlSeeAlso());
+ assertNull(oxmMapping.getDefaultXmlSeeAlso());
+ assertNull(oxmMapping.getSpecifiedXmlSeeAlso());
+ assertNull(oxmMapping.getXmlSeeAlso());
+
+ javaMapping.addXmlSeeAlso();
+
+ assertNotNull(javaMapping.getXmlSeeAlso());
+ assertNotNull(oxmMapping.getDefaultXmlSeeAlso());
+ assertNull(oxmMapping.getSpecifiedXmlSeeAlso());
+ assertNotNull(oxmMapping.getXmlSeeAlso());
+
+ xmlBindings.setXmlMappingMetadataComplete(true);
+ oxmResource.save();
+
+ assertNotNull(javaMapping.getXmlSeeAlso());
+ assertNull(oxmMapping.getDefaultXmlSeeAlso());
+ assertNull(oxmMapping.getSpecifiedXmlSeeAlso());
+ assertNull(oxmMapping.getXmlSeeAlso());
+
+ xmlBindings.setXmlMappingMetadataComplete(false);
+ oxmResource.save();
+
+ eJavaType.setXmlSeeAlso(OxmFactory.eINSTANCE.createEXmlSeeAlso());
+ oxmResource.save();
+
+ assertNotNull(javaMapping.getXmlSeeAlso());
+ assertNotNull(oxmMapping.getDefaultXmlSeeAlso());
+ assertNotNull(oxmMapping.getSpecifiedXmlSeeAlso());
+ assertNotNull(oxmMapping.getXmlSeeAlso());
+ assertEquals(oxmMapping.getSpecifiedXmlSeeAlso(), oxmMapping.getXmlSeeAlso());
+
+ eJavaType.setXmlSeeAlso(null);
+ oxmResource.save();
+
+ assertNotNull(javaMapping.getXmlSeeAlso());
+ assertNotNull(oxmMapping.getDefaultXmlSeeAlso());
+ assertNull(oxmMapping.getSpecifiedXmlSeeAlso());
+ assertNotNull(oxmMapping.getXmlSeeAlso());
+
+ javaMapping.removeXmlSeeAlso();
+
+ assertNull(javaMapping.getXmlSeeAlso());
+ assertNull(oxmMapping.getDefaultXmlSeeAlso());
+ assertNull(oxmMapping.getSpecifiedXmlSeeAlso());
+ assertNull(oxmMapping.getXmlSeeAlso());
+ }
+
+ public void testModifyXmlSeeAlso() throws Exception {
+ createClassWithXmlType();
+ addOxmFile("oxm.xml", PACKAGE_NAME, TYPE_NAME);
+ ELJaxbContextRoot root = (ELJaxbContextRoot) getJaxbProject().getContextRoot();
+ OxmFile oxmFile = root.getOxmFile(PACKAGE_NAME);
+ OxmXmlBindings xmlBindings = oxmFile.getXmlBindings();
+ OxmJavaType oxmMapping = xmlBindings.getJavaType(0);
+ JptXmlResource oxmResource = oxmFile.getOxmResource();
+ EXmlBindings eXmlBindings = (EXmlBindings) oxmResource.getRootObject();
+ EJavaType eJavaType = eXmlBindings.getJavaTypes().get(0);
+
+ assertNull(eJavaType.getXmlSeeAlso());
+ assertNull(oxmMapping.getSpecifiedXmlSeeAlso());
+ assertNull(oxmMapping.getXmlSeeAlso());
+
+ oxmMapping.addSpecifiedXmlSeeAlso();
+ oxmResource.save();
+
+ assertFileContentsContains("oxm.xml", "xml-see-also", true);
+ assertNotNull(eJavaType.getXmlSeeAlso());
+ assertNotNull(oxmMapping.getSpecifiedXmlSeeAlso());
+ assertNotNull(oxmMapping.getXmlSeeAlso());
+
+ oxmMapping.removeSpecifiedXmlSeeAlso();
+ oxmResource.save();
+
+ assertFileContentsContains("oxm.xml", "xml-see-also", false);
+ assertNull(eJavaType.getXmlSeeAlso());
+ assertNull(oxmMapping.getSpecifiedXmlSeeAlso());
+ assertNull(oxmMapping.getXmlSeeAlso());
+ }
+
public void testUpdateQNameName() throws Exception {
createClassWithXmlType();
addOxmFile("oxm.xml", PACKAGE_NAME, TYPE_NAME);
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmXmlSeeAlsoTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmXmlSeeAlsoTests.java
index e5a2a93a3c..cc65739a80 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmXmlSeeAlsoTests.java
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmXmlSeeAlsoTests.java
@@ -48,7 +48,7 @@ public class OxmXmlSeeAlsoTests
addOxmFile();
ELJaxbContextRoot root = (ELJaxbContextRoot) getJaxbProject().getContextRoot();
OxmFile oxmFile = root.getOxmFile(PACKAGE_NAME);
- OxmXmlSeeAlso xmlSeeAlso = oxmFile.getXmlBindings().getJavaType(0).getXmlSeeAlso();
+ OxmXmlSeeAlso xmlSeeAlso = oxmFile.getXmlBindings().getJavaType(0).getSpecifiedXmlSeeAlso();
JptXmlResource oxmResource = oxmFile.getOxmResource();
EXmlBindings eXmlBindings = (EXmlBindings) oxmResource.getRootObject();
EXmlSeeAlso eXmlSeeAlso = eXmlBindings.getJavaTypes().get(0).getXmlSeeAlso();
@@ -90,7 +90,7 @@ public class OxmXmlSeeAlsoTests
addOxmFile();
ELJaxbContextRoot root = (ELJaxbContextRoot) getJaxbProject().getContextRoot();
OxmFile oxmFile = root.getOxmFile(PACKAGE_NAME);
- OxmXmlSeeAlso xmlSeeAlso = oxmFile.getXmlBindings().getJavaType(0).getXmlSeeAlso();
+ OxmXmlSeeAlso xmlSeeAlso = oxmFile.getXmlBindings().getJavaType(0).getSpecifiedXmlSeeAlso();
JptXmlResource oxmResource = oxmFile.getOxmResource();
EXmlBindings eXmlBindings = (EXmlBindings) oxmResource.getRootObject();
EXmlSeeAlso eXmlSeeAlso = eXmlBindings.getJavaTypes().get(0).getXmlSeeAlso();

Back to the top