From 07b94f4445db79f1255e628f6b15bb89a48521ff Mon Sep 17 00:00:00 2001 From: Brian Vosburgh Date: Mon, 12 Aug 2013 12:09:54 -0400 Subject: clean up JavaProjectTestHarness --- .../eclipse/jpt/jaxb/core/tests/internal/JaxbTestCase.java | 8 ++++---- .../tests/internal/context/GenericContextRootTests.java | 2 +- .../tests/internal/context/JaxbContextModelTestCase.java | 2 +- .../context/java/GenericJavaClassMappingTests.java | 14 +++++++------- .../context/java/GenericJavaPersistentAttributeTests.java | 2 +- .../internal/context/java/GenericJavaXmlAdapterTests.java | 4 ++-- .../context/java/GenericJavaXmlAttributeMappingTests.java | 2 +- .../context/java/GenericJavaXmlElementMappingTests.java | 4 ++-- .../context/java/GenericJavaXmlValueMappingTests.java | 2 +- .../tests/internal/resource/JaxbIndexResourceTests.java | 4 ++-- .../internal/resource/JaxbPropertiesResourceTests.java | 4 ++-- .../resource/java/JaxbJavaResourceModelTestCase.java | 2 +- .../java/XmlJavaTypeAdapterPackageAnnotationTests.java | 4 ++-- .../java/XmlJavaTypeAdapterTypeAnnotationTests.java | 2 +- .../internal/resource/java/XmlTypeAnnotationTests.java | 2 +- .../tests/internal/context/ELJaxbContextRootTests.java | 8 ++++---- .../internal/context/oxm/OxmContextModelTestCase.java | 4 ++-- .../resource/java/ELJaxbJavaResourceModelTestCase.java | 2 +- .../core/tests/internal/resource/oxm/OxmResourceTests.java | 2 +- 19 files changed, 37 insertions(+), 37 deletions(-) (limited to 'jaxb') diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/JaxbTestCase.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/JaxbTestCase.java index 74826ae41e..b6f2c82c44 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/JaxbTestCase.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/JaxbTestCase.java @@ -40,7 +40,7 @@ public class JaxbTestCase @Override - protected JavaProjectTestHarness buildJavaProject(boolean autoBuild) throws Exception { + protected JavaProjectTestHarness buildJavaProjectTestHarness(boolean autoBuild) throws Exception { return buildJaxbProject(BASE_PROJECT_NAME, autoBuild, buildJaxbFacetInstallConfig()); } @@ -78,12 +78,12 @@ public class JaxbTestCase } @Override - protected TestJaxbProject getJavaProject() { - return (TestJaxbProject) super.getJavaProject(); + protected TestJaxbProject getJavaProjectTestHarness() { + return (TestJaxbProject) super.getJavaProjectTestHarness(); } protected JaxbProject getJaxbProject() { - return this.getJavaProject().getJaxbProject(); + return this.getJavaProjectTestHarness().getJaxbProject(); } protected JavaResourceAttribute getFieldNamed(JavaResourceType resourceType, String attributeName) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/GenericContextRootTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/GenericContextRootTests.java index 93932a2733..1b8879533a 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/GenericContextRootTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/GenericContextRootTests.java @@ -478,7 +478,7 @@ public class GenericContextRootTests assertNotNull(getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME)); // add a jaxb.index with one class - IFile jaxbIndex = getJavaProject().getProject().getFile(new Path("src/test/jaxb.index")); + IFile jaxbIndex = getJavaProjectTestHarness().getProject().getFile(new Path("src/test/jaxb.index")); InputStream stream = new ByteArrayInputStream(otherClassName.getBytes()); jaxbIndex.create(stream, true, null); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/JaxbContextModelTestCase.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/JaxbContextModelTestCase.java index 87c78398bd..9f14f595cf 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/JaxbContextModelTestCase.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/JaxbContextModelTestCase.java @@ -33,7 +33,7 @@ public abstract class JaxbContextModelTestCase } @Override - protected JavaProjectTestHarness buildJavaProject(boolean autoBuild) throws Exception { + protected JavaProjectTestHarness buildJavaProjectTestHarness(boolean autoBuild) throws Exception { return buildJaxbProject(BASE_PROJECT_NAME, autoBuild, buildJaxbFacetInstallConfig()); } diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaClassMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaClassMappingTests.java index 6bc1a2852f..ad4b8069cc 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaClassMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaClassMappingTests.java @@ -76,7 +76,7 @@ public class GenericJavaClassMappingTests sb.append("{}").append(CR); } }; - this.javaProject.createCompilationUnit(PACKAGE_NAME, "AnnotationTestTypeChild.java", sourceWriter); + this.javaProjectTestHarness.createCompilationUnit(PACKAGE_NAME, "AnnotationTestTypeChild.java", sourceWriter); } private ICompilationUnit createXmlTypeWithAccessorType() throws CoreException { @@ -139,7 +139,7 @@ public class GenericJavaClassMappingTests sb.append(CR).append("}").append(CR); } }; - this.javaProject.createCompilationUnit(PACKAGE_NAME, "AnnotationTestType.java", sourceWriter); + this.javaProjectTestHarness.createCompilationUnit(PACKAGE_NAME, "AnnotationTestType.java", sourceWriter); } private void createTestXmlTypeWithPropertyAndPublicMemberAccess() throws Exception { @@ -170,7 +170,7 @@ public class GenericJavaClassMappingTests sb.append(CR).append("}").append(CR); } }; - this.javaProject.createCompilationUnit(PACKAGE_NAME, "AnnotationTestType.java", sourceWriter); + this.javaProjectTestHarness.createCompilationUnit(PACKAGE_NAME, "AnnotationTestType.java", sourceWriter); } private void createTestXmlTypeWithPropertyGetterAndPublicMemberAccess() throws Exception { @@ -200,7 +200,7 @@ public class GenericJavaClassMappingTests sb.append(CR).append("}").append(CR); } }; - this.javaProject.createCompilationUnit(PACKAGE_NAME, "AnnotationTestType.java", sourceWriter); + this.javaProjectTestHarness.createCompilationUnit(PACKAGE_NAME, "AnnotationTestType.java", sourceWriter); } private void createTestXmlTypeWithPropertyGetterListAndPublicMemberAccess() throws Exception { @@ -230,7 +230,7 @@ public class GenericJavaClassMappingTests sb.append(CR).append("}").append(CR); } }; - this.javaProject.createCompilationUnit(PACKAGE_NAME, "AnnotationTestType.java", sourceWriter); + this.javaProjectTestHarness.createCompilationUnit(PACKAGE_NAME, "AnnotationTestType.java", sourceWriter); } private void createTestXmlTypeWithPropertySetterAndPublicMemberAccess() throws Exception { @@ -259,7 +259,7 @@ public class GenericJavaClassMappingTests sb.append(CR).append("}").append(CR); } }; - this.javaProject.createCompilationUnit(PACKAGE_NAME, "AnnotationTestType.java", sourceWriter); + this.javaProjectTestHarness.createCompilationUnit(PACKAGE_NAME, "AnnotationTestType.java", sourceWriter); } private void createXmlTypeWithVariousFieldsAndProperties() throws Exception { @@ -278,7 +278,7 @@ public class GenericJavaClassMappingTests sb.append("}").append(CR); } }; - this.javaProject.createCompilationUnit(PACKAGE_NAME, "AnnotationTestType.java", sourceWriter); + this.javaProjectTestHarness.createCompilationUnit(PACKAGE_NAME, "AnnotationTestType.java", sourceWriter); } protected void addXmlTypeMemberValuePair(ModifiedDeclaration declaration, String name, String value) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java index 2bcfbeb223..31ae416cef 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java @@ -52,7 +52,7 @@ public class GenericJavaPersistentAttributeTests sb.append("}").append(CR); } }; - this.javaProject.createCompilationUnit(PACKAGE_NAME, TEST_CLASS_NAME + ".java", sourceWriter); + this.javaProjectTestHarness.createCompilationUnit(PACKAGE_NAME, TEST_CLASS_NAME + ".java", sourceWriter); } diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAdapterTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAdapterTests.java index 871701e271..fb7cdf45b9 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAdapterTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAdapterTests.java @@ -60,7 +60,7 @@ public class GenericJavaXmlAdapterTests sb.append("}").append(CR); } }; - this.javaProject.createCompilationUnit(PACKAGE_NAME, "ObjObjAdapter.java", sourceWriter); + this.javaProjectTestHarness.createCompilationUnit(PACKAGE_NAME, "ObjObjAdapter.java", sourceWriter); } private void createMapCalendarXmlAdapter() throws CoreException { @@ -78,7 +78,7 @@ public class GenericJavaXmlAdapterTests sb.append("}").append(CR); } }; - this.javaProject.createCompilationUnit(PACKAGE_NAME, "MapCalendarAdapter.java", sourceWriter); + this.javaProjectTestHarness.createCompilationUnit(PACKAGE_NAME, "MapCalendarAdapter.java", sourceWriter); } diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAttributeMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAttributeMappingTests.java index 2241b5d8a9..895bcc30c4 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAttributeMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAttributeMappingTests.java @@ -75,7 +75,7 @@ public class GenericJavaXmlAttributeMappingTests extends JaxbContextModelTestCas sb.append("}").append(CR); } }; - return this.javaProject.createCompilationUnit(PACKAGE_NAME, TYPE_NAME + ".java", sourceWriter); + return this.javaProjectTestHarness.createCompilationUnit(PACKAGE_NAME, TYPE_NAME + ".java", sourceWriter); } diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementMappingTests.java index 98b598c39d..fc10a3f649 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementMappingTests.java @@ -79,7 +79,7 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase sb.append("}").append(CR); } }; - return this.javaProject.createCompilationUnit(PACKAGE_NAME, TYPE_NAME + ".java", sourceWriter); + return this.javaProjectTestHarness.createCompilationUnit(PACKAGE_NAME, TYPE_NAME + ".java", sourceWriter); } private void createXmlTypeWithVariousAttributes() throws CoreException { @@ -97,7 +97,7 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase sb.append("}").append(CR); } }; - this.javaProject.createCompilationUnit(PACKAGE_NAME, TYPE_NAME + ".java", sourceWriter); + this.javaProjectTestHarness.createCompilationUnit(PACKAGE_NAME, TYPE_NAME + ".java", sourceWriter); } public void testModifyName() throws Exception { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlValueMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlValueMappingTests.java index 1995883fbc..4c96047b20 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlValueMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlValueMappingTests.java @@ -69,7 +69,7 @@ public class GenericJavaXmlValueMappingTests extends JaxbContextModelTestCase sb.append("}").append(CR); } }; - return this.javaProject.createCompilationUnit(PACKAGE_NAME, TYPE_NAME + ".java", sourceWriter); + return this.javaProjectTestHarness.createCompilationUnit(PACKAGE_NAME, TYPE_NAME + ".java", sourceWriter); } public void testChangeMappingType() throws Exception { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbIndexResourceTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbIndexResourceTests.java index f5964c42ac..a997c0d149 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbIndexResourceTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbIndexResourceTests.java @@ -35,11 +35,11 @@ public class JaxbIndexResourceTests @SuppressWarnings("resource") private IFile createJaxbIndex(IPath projectRelativePath, String... classNames) throws Exception { - IFolder folder = getJavaProject().getProject().getFolder(projectRelativePath); + IFolder folder = getProject().getFolder(projectRelativePath); if (! folder.exists()) { folder.create(true, false, null); } - IFile jaxbIndex = getJavaProject().getProject().getFile(projectRelativePath.append(new Path(JAXB_INDEX))); + IFile jaxbIndex = getProject().getFile(projectRelativePath.append(new Path(JAXB_INDEX))); // stream is closed by IFile.create(...) InputStream stream = inputStream(classNames); jaxbIndex.create(stream, true, null); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbPropertiesResourceTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbPropertiesResourceTests.java index 62d3422847..151357c781 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbPropertiesResourceTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbPropertiesResourceTests.java @@ -33,11 +33,11 @@ public class JaxbPropertiesResourceTests private IFile createJaxbProperties(IPath projectRelativePath, String[] ... propertyValuePairs) throws Exception { - IFolder folder = getJavaProject().getProject().getFolder(projectRelativePath); + IFolder folder = this.getProject().getFolder(projectRelativePath); if (! folder.exists()) { folder.create(true, false, null); } - IFile jaxbProperties = getJavaProject().getProject().getFile(projectRelativePath.append(new Path(JAXB_PROPERTIES))); + IFile jaxbProperties = this.getProject().getFile(projectRelativePath.append(new Path(JAXB_PROPERTIES))); InputStream stream = inputStream(propertyValuePairs); jaxbProperties.create(stream, true, null); return jaxbProperties; diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/JaxbJavaResourceModelTestCase.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/JaxbJavaResourceModelTestCase.java index 21427213ba..14e0efaf74 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/JaxbJavaResourceModelTestCase.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/JaxbJavaResourceModelTestCase.java @@ -26,7 +26,7 @@ public class JaxbJavaResourceModelTestCase @Override protected void setUp() throws Exception { super.setUp(); - this.javaProject.addJar(TestJaxbProject.jaxbJarName()); + this.javaProjectTestHarness.addJar(TestJaxbProject.jaxbJarName()); } @Override 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 62ca324495..67701613e6 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 @@ -39,7 +39,7 @@ public class XmlJavaTypeAdapterPackageAnnotationTests sb.append("{}").append(CR); } }; - this.javaProject.createCompilationUnit(PACKAGE_NAME, TEST_CLASS + ".java", sourceWriter); + this.javaProjectTestHarness.createCompilationUnit(PACKAGE_NAME, TEST_CLASS + ".java", sourceWriter); } private void createTestClass2() throws CoreException { @@ -50,7 +50,7 @@ public class XmlJavaTypeAdapterPackageAnnotationTests sb.append("{}").append(CR); } }; - this.javaProject.createCompilationUnit(PACKAGE_NAME, TEST_CLASS_2 + ".java", sourceWriter); + this.javaProjectTestHarness.createCompilationUnit(PACKAGE_NAME, TEST_CLASS_2 + ".java", sourceWriter); } private ICompilationUnit createPackageInfoWithJavaTypeAdapter() throws CoreException { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlJavaTypeAdapterTypeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlJavaTypeAdapterTypeAnnotationTests.java index 961408faa8..c5e8c2dd5d 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlJavaTypeAdapterTypeAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlJavaTypeAdapterTypeAnnotationTests.java @@ -61,7 +61,7 @@ public class XmlJavaTypeAdapterTypeAnnotationTests extends JaxbJavaResourceModel sb.append("{}").append(CR); } }; - this.javaProject.createCompilationUnit(PACKAGE_NAME, "MyAdapterClass.java", sourceWriter); + this.javaProjectTestHarness.createCompilationUnit(PACKAGE_NAME, "MyAdapterClass.java", sourceWriter); } public void testGetNull() throws Exception { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlTypeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlTypeAnnotationTests.java index 0336024333..f5a9ce668a 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlTypeAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlTypeAnnotationTests.java @@ -104,7 +104,7 @@ public class XmlTypeAnnotationTests extends JaxbJavaResourceModelTestCase { sb.append("{}").append(CR); } }; - this.javaProject.createCompilationUnit(PACKAGE_NAME, "MyFactoryClass.java", sourceWriter); + this.javaProjectTestHarness.createCompilationUnit(PACKAGE_NAME, "MyFactoryClass.java", sourceWriter); } private ICompilationUnit createTestXmlTypeWithPropOrder() throws Exception { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/ELJaxbContextRootTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/ELJaxbContextRootTests.java index 554d5eca1c..d3fa085970 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/ELJaxbContextRootTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/ELJaxbContextRootTests.java @@ -23,7 +23,7 @@ public class ELJaxbContextRootTests protected void addOxmFile(String fileName, String packageName) throws Exception { - IFile oxmFile = getJavaProject().getProject().getFolder("src").getFile(fileName); + IFile oxmFile = getJavaProjectTestHarness().getProject().getFolder("src").getFile(fileName); StringBuffer sb = new StringBuffer(); sb.append("").append(CR); sb.append("").append(CR); sb.append("