Skip to main content
summaryrefslogtreecommitdiffstats
path: root/jaxb/tests/org.eclipse.jpt.jaxb.core.tests
diff options
context:
space:
mode:
authorpfullbright2011-03-01 02:19:20 +0000
committerpfullbright2011-03-01 02:19:20 +0000
commit47c64fd0641ebc52572f07f80e0554c3df707f03 (patch)
tree22fc6b61e165f5be1ceda8a60db181250e73d445 /jaxb/tests/org.eclipse.jpt.jaxb.core.tests
parent03ef937d20a5ba905fd794ad7edd7e00758292b6 (diff)
downloadwebtools.dali-47c64fd0641ebc52572f07f80e0554c3df707f03.tar.gz
webtools.dali-47c64fd0641ebc52572f07f80e0554c3df707f03.tar.xz
webtools.dali-47c64fd0641ebc52572f07f80e0554c3df707f03.zip
renamed AbstractJavaResourceType -> JavaResourceAbstractType (don't ask)
Diffstat (limited to 'jaxb/tests/org.eclipse.jpt.jaxb.core.tests')
-rw-r--r--jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentClassTests.java48
-rw-r--r--jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlRootElementTests.java10
-rw-r--r--jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/JavaResourceModelTestCase.java8
3 files changed, 33 insertions, 33 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 d8dc76af3e..7fa8fecfca 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
@@ -35,7 +35,7 @@ import org.eclipse.jpt.jaxb.core.context.JaxbPersistentField;
import org.eclipse.jpt.jaxb.core.context.JaxbPersistentProperty;
import org.eclipse.jpt.jaxb.core.context.XmlAccessOrder;
import org.eclipse.jpt.jaxb.core.context.XmlAccessType;
-import org.eclipse.jpt.jaxb.core.resource.java.AbstractJavaResourceType;
+import org.eclipse.jpt.jaxb.core.resource.java.JavaResourceAbstractType;
import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
import org.eclipse.jpt.jaxb.core.resource.java.JavaResourceField;
import org.eclipse.jpt.jaxb.core.resource.java.JavaResourceMember;
@@ -277,7 +277,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
createTypeWithXmlType();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
assertNull(persistentClass.getFactoryClass());
@@ -306,7 +306,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
createTypeWithXmlType();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
assertNull(persistentClass.getFactoryClass());
@@ -334,7 +334,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
createTypeWithXmlType();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
assertNull(persistentClass.getFactoryMethod());
@@ -363,7 +363,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
createTypeWithXmlType();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
assertNull(persistentClass.getFactoryMethod());
@@ -391,7 +391,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
createTypeWithXmlType();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
String defaultXmlTypeName = Introspector.decapitalize(TYPE_NAME);
assertNull(persistentClass.getSpecifiedXmlTypeName());
@@ -426,7 +426,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
createTypeWithXmlType();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
String defaultXmlTypeName = Introspector.decapitalize(TYPE_NAME);
assertNull(persistentClass.getSpecifiedXmlTypeName());
@@ -458,7 +458,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
createTypeWithXmlType();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
assertNull(persistentClass.getSpecifiedNamespace());
assertEquals("", persistentClass.getDefaultNamespace());
@@ -492,7 +492,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
createTypeWithXmlType();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
assertNull(persistentClass.getSpecifiedNamespace());
assertEquals("", persistentClass.getDefaultNamespace());
@@ -523,7 +523,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
createXmlTypeWithAccessorType();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
assertEquals(XmlAccessType.PROPERTY, persistentClass.getSpecifiedAccessType());
assertEquals(XmlAccessType.PROPERTY, persistentClass.getAccessType());
@@ -554,7 +554,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
createXmlTypeWithAccessorType();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
assertEquals(XmlAccessType.PROPERTY, persistentClass.getSpecifiedAccessType());
assertEquals(XmlAccessType.PROPERTY, persistentClass.getAccessType());
@@ -648,7 +648,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
public void testModifyAccessOrder() throws Exception {
createXmlTypeWithAccessorOrder();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
assertEquals(XmlAccessOrder.ALPHABETICAL, persistentClass.getSpecifiedAccessOrder());
assertEquals(XmlAccessOrder.ALPHABETICAL, persistentClass.getAccessOrder());
@@ -670,7 +670,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
public void testUpdateAccessOrder() throws Exception {
createXmlTypeWithAccessorOrder();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
assertEquals(XmlAccessOrder.ALPHABETICAL, persistentClass.getSpecifiedAccessOrder());
assertEquals(XmlAccessOrder.ALPHABETICAL, persistentClass.getAccessOrder());
@@ -698,7 +698,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
public void testGetPropOrder() throws Exception {
this.createTypeWithXmlType();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
ListIterator<String> props = persistentClass.getPropOrder().iterator();
assertFalse(props.hasNext());
@@ -725,7 +725,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
public void testGetPropOrderSize() throws Exception {
this.createTypeWithXmlType();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
assertEquals(0, persistentClass.getPropOrderSize());
@@ -743,7 +743,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
public void testAddProp() throws Exception {
this.createTypeWithXmlType();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
persistentClass.addProp(0, "bar");
persistentClass.addProp(0, "foo");
@@ -761,7 +761,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
public void testAddProp2() throws Exception {
this.createTypeWithXmlType();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
persistentClass.addProp(0, "bar");
persistentClass.addProp(1, "foo");
@@ -779,7 +779,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
public void testRemoveProp() throws Exception {
this.createTypeWithXmlType();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
persistentClass.addProp(0, "bar");
persistentClass.addProp(1, "foo");
@@ -807,7 +807,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
public void testMoveProp() throws Exception {
this.createTypeWithXmlType();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
persistentClass.addProp(0, "bar");
persistentClass.addProp(1, "foo");
@@ -846,7 +846,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
public void testSyncXmlNsPrefixes() throws Exception {
this.createTypeWithXmlType();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
ListIterator<String> props = persistentClass.getPropOrder().iterator();
assertFalse(props.hasNext());
@@ -959,7 +959,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
createTypeWithXmlType();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
assertNull(persistentClass.getRootElement());
assertFalse(persistentClass.isRootElement());
@@ -981,7 +981,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
createTypeWithXmlType();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
assertNull(persistentClass.getRootElement());
assertFalse(persistentClass.isRootElement());
@@ -2017,7 +2017,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
createTypeWithXmlType();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
XmlJavaTypeAdapterAnnotation xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceType.getAnnotation(0, XmlJavaTypeAdapterAnnotation.ANNOTATION_NAME);
assertNull(persistentClass.getXmlJavaTypeAdapter());
@@ -2036,7 +2036,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
createTypeWithXmlType();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
XmlJavaTypeAdapterAnnotation xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceType.getAnnotation(0, XmlJavaTypeAdapterAnnotation.ANNOTATION_NAME);
assertNull(persistentClass.getXmlJavaTypeAdapter());
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlRootElementTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlRootElementTests.java
index 5f3e31f88d..c77821d6dd 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlRootElementTests.java
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlRootElementTests.java
@@ -21,7 +21,7 @@ import org.eclipse.jpt.common.utility.internal.CollectionTools;
import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
import org.eclipse.jpt.jaxb.core.context.JaxbPersistentClass;
import org.eclipse.jpt.jaxb.core.context.XmlRootElement;
-import org.eclipse.jpt.jaxb.core.resource.java.AbstractJavaResourceType;
+import org.eclipse.jpt.jaxb.core.resource.java.JavaResourceAbstractType;
import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
import org.eclipse.jpt.jaxb.core.resource.java.XmlRootElementAnnotation;
import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase;
@@ -54,7 +54,7 @@ public class GenericJavaXmlRootElementTests extends JaxbContextModelTestCase
createTypeWithXmlTypeWithXmlRootElement();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
XmlRootElement contextRootElement = persistentClass.getRootElement();
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
assertNull(contextRootElement.getSpecifiedNamespace());
assertEquals("", contextRootElement.getDefaultNamespace());
@@ -77,7 +77,7 @@ public class GenericJavaXmlRootElementTests extends JaxbContextModelTestCase
createTypeWithXmlTypeWithXmlRootElement();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
XmlRootElement contextRootElement = persistentClass.getRootElement();
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
assertNull(contextRootElement.getSpecifiedNamespace());
assertEquals("", contextRootElement.getDefaultNamespace());
@@ -106,7 +106,7 @@ public class GenericJavaXmlRootElementTests extends JaxbContextModelTestCase
createTypeWithXmlTypeWithXmlRootElement();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
XmlRootElement contextRootElement = persistentClass.getRootElement();
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
String defaultName = Introspector.decapitalize(TYPE_NAME);
assertNull(contextRootElement.getSpecifiedName());
@@ -130,7 +130,7 @@ public class GenericJavaXmlRootElementTests extends JaxbContextModelTestCase
createTypeWithXmlTypeWithXmlRootElement();
JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
XmlRootElement contextRootElement = persistentClass.getRootElement();
- AbstractJavaResourceType resourceType = persistentClass.getJavaResourceType();
+ JavaResourceAbstractType resourceType = persistentClass.getJavaResourceType();
String defaultName = Introspector.decapitalize(TYPE_NAME);
assertNull(contextRootElement.getSpecifiedName());
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/JavaResourceModelTestCase.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/JavaResourceModelTestCase.java
index e606226c7a..3982b3330d 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/JavaResourceModelTestCase.java
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/JavaResourceModelTestCase.java
@@ -26,7 +26,7 @@ import org.eclipse.jpt.jaxb.core.AnnotationProvider;
import org.eclipse.jpt.jaxb.core.internal.GenericAnnotationProvider;
import org.eclipse.jpt.jaxb.core.internal.resource.java.source.SourcePackageInfoCompilationUnit;
import org.eclipse.jpt.jaxb.core.internal.resource.java.source.SourceTypeCompilationUnit;
-import org.eclipse.jpt.jaxb.core.resource.java.AbstractJavaResourceType;
+import org.eclipse.jpt.jaxb.core.resource.java.JavaResourceAbstractType;
import org.eclipse.jpt.jaxb.core.resource.java.AnnotationDefinition;
import org.eclipse.jpt.jaxb.core.resource.java.JavaResourceCompilationUnit;
import org.eclipse.jpt.jaxb.core.resource.java.JavaResourceEnum;
@@ -154,7 +154,7 @@ public abstract class JavaResourceModelTestCase
return (JavaResourceEnum) this.buildJavaResourceType_(cu);
}
- private AbstractJavaResourceType buildJavaResourceType_(ICompilationUnit cu) {
+ private JavaResourceAbstractType buildJavaResourceType_(ICompilationUnit cu) {
this.javaResourceCompilationUnit = this.buildJavaResourceCompilationUnit(cu);
this.javaResourceCompilationUnit.resolveTypes();
return this.hackJavaResourceType();
@@ -172,8 +172,8 @@ public abstract class JavaResourceModelTestCase
return CollectionTools.get(resourceEnum.getEnumConstants(), index);
}
- protected AbstractJavaResourceType hackJavaResourceType() {
- return (AbstractJavaResourceType) ReflectionTools.getFieldValue(this.javaResourceCompilationUnit, "type");
+ protected JavaResourceAbstractType hackJavaResourceType() {
+ return (JavaResourceAbstractType) ReflectionTools.getFieldValue(this.javaResourceCompilationUnit, "type");
}
protected JavaResourceCompilationUnit buildJavaResourceCompilationUnit(ICompilationUnit cu) {

Back to the top