rename TestJpaProject to JpaProjectTestHarness

11 files changed, 41 insertions, 41 deletions

diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/JptJpaCoreTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/JptJpaCoreTests.java
index 66fc134f96..ec71478a1e 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/JptJpaCoreTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/JptJpaCoreTests.java
@@ -14,7 +14,7 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.eclipse.jpt.jpa.core.tests.internal.context.JptJpaCoreContextModelTests;
 import org.eclipse.jpt.jpa.core.tests.internal.model.JptJpaCoreModelTests;
-import org.eclipse.jpt.jpa.core.tests.internal.projects.TestJpaProject;
+import org.eclipse.jpt.jpa.core.tests.internal.projects.JpaProjectTestHarness;
 import org.eclipse.jpt.jpa.core.tests.internal.resource.JptJpaCoreResourceModelTests;
 
 /**
@@ -26,7 +26,7 @@ import org.eclipse.jpt.jpa.core.tests.internal.resource.JptJpaCoreResourceModelT
  */
 @SuppressWarnings("nls")
 public class JptJpaCoreTests {
-	private static final String JPA_JAR_PROPERTY = TestJpaProject.JPA_JAR_NAME_SYSTEM_PROPERTY;
+	private static final String JPA_JAR_PROPERTY = JpaProjectTestHarness.JPA_JAR_NAME_SYSTEM_PROPERTY;
 
 	public static Test suite() {
 		// ***** keep test.xml in sync with this list *****
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/ContextModelTestCase.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/ContextModelTestCase.java
index 0737f60af3..0dd576f0b0 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/ContextModelTestCase.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/ContextModelTestCase.java
@@ -43,7 +43,7 @@ import org.eclipse.jpt.jpa.core.resource.persistence.XmlJavaClassRef;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlMappingFileRef;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistence;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistenceUnit;
-import org.eclipse.jpt.jpa.core.tests.internal.projects.TestJpaProject;
+import org.eclipse.jpt.jpa.core.tests.internal.projects.JpaProjectTestHarness;
 import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
 import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
@@ -85,9 +85,9 @@ public abstract class ContextModelTestCase extends AnnotationTestCase
 		return buildJpaProject(BASE_PROJECT_NAME, autoBuild, this.buildJpaConfigDataModel());
 	}
 	
-	protected TestJpaProject buildJpaProject(String projectName, boolean autoBuild, IDataModel jpaConfig) 
+	protected JpaProjectTestHarness buildJpaProject(String projectName, boolean autoBuild, IDataModel jpaConfig) 
 			throws Exception {
-		TestJpaProject testJpaProject =TestJpaProject.buildJpaProject(projectName, autoBuild, jpaConfig);
+		JpaProjectTestHarness testJpaProject =JpaProjectTestHarness.buildJpaProject(projectName, autoBuild, jpaConfig);
 
 		if (createOrmXml()) {
 			OrmFileCreationOperation operation = 
@@ -105,7 +105,7 @@ public abstract class ContextModelTestCase extends AnnotationTestCase
 		return dataModel;
 	}
 	
-	protected IDataModel buildGenericOrmConfig(TestJpaProject testJpaProject) {
+	protected IDataModel buildGenericOrmConfig(JpaProjectTestHarness testJpaProject) {
 		IDataModel config =
 				DataModelFactory.createDataModel(new OrmFileCreationDataModelProvider());
 			config.setProperty(JptFileCreationDataModelProperties.CONTAINER_PATH, 
@@ -254,8 +254,8 @@ public abstract class ContextModelTestCase extends AnnotationTestCase
 	}
 	
 	@Override
-	protected TestJpaProject getJavaProjectTestHarness() {
-		return (TestJpaProject) super.getJavaProjectTestHarness();
+	protected JpaProjectTestHarness getJavaProjectTestHarness() {
+		return (JpaProjectTestHarness) super.getJavaProjectTestHarness();
 	}
 	
 	protected void deleteResource(Resource resource) throws CoreException {
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/platform/BaseJpaPlatformTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/platform/BaseJpaPlatformTests.java
index a22c358b8a..4e47c15487 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/platform/BaseJpaPlatformTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/platform/BaseJpaPlatformTests.java
@@ -11,12 +11,12 @@
 package org.eclipse.jpt.jpa.core.tests.internal.platform;
 
 import junit.framework.TestCase;
-import org.eclipse.jpt.jpa.core.tests.internal.projects.TestJpaProject;
+import org.eclipse.jpt.jpa.core.tests.internal.projects.JpaProjectTestHarness;
 
 @SuppressWarnings("nls")
 public class BaseJpaPlatformTests extends TestCase
 {
-	protected TestJpaProject jpaProject;
+	protected JpaProjectTestHarness jpaProject;
 
 	protected static final String PROJECT_NAME = "PlatformTestProject";
 	protected static final String PACKAGE_NAME = "platform.test";
@@ -34,8 +34,8 @@ public class BaseJpaPlatformTests extends TestCase
 		this.jpaProject = this.buildJpaProject(PROJECT_NAME, false);  // false = no auto-build
 	}
 
-	protected TestJpaProject buildJpaProject(String projectName, boolean autoBuild) throws Exception {
-		return new TestJpaProject(projectName, autoBuild);  // false = no auto-build
+	protected JpaProjectTestHarness buildJpaProject(String projectName, boolean autoBuild) throws Exception {
+		return new JpaProjectTestHarness(projectName, autoBuild);  // false = no auto-build
 	}
 
 	@Override
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/platform/JpaPlatformExtensionTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/platform/JpaPlatformExtensionTests.java
index 6886727c8a..5b13ad91ff 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/platform/JpaPlatformExtensionTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/platform/JpaPlatformExtensionTests.java
@@ -24,7 +24,7 @@ import org.eclipse.jpt.jpa.core.internal.plugin.JptJpaCorePlugin;
 import org.eclipse.jpt.jpa.core.tests.extension.resource.TestExtensionPlugin;

 import org.eclipse.jpt.jpa.core.tests.extension.resource.TestJpaPlatformProvider;

 import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase;

-import org.eclipse.jpt.jpa.core.tests.internal.projects.TestJpaProject;

+import org.eclipse.jpt.jpa.core.tests.internal.projects.JpaProjectTestHarness;

 import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;

 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;

 import org.eclipse.wst.common.project.facet.core.IActionConfigFactory;

@@ -36,7 +36,7 @@ public class JpaPlatformExtensionTests
 	public static final String TEST_PLATFORM_ID = TestJpaPlatformProvider.ID;

 	public static final String TEST_PLATFORM_LABEL = "Test Jpa Platform";

 	

-	protected TestJpaProject testProject;

+	protected JpaProjectTestHarness testProject;

 

 	public JpaPlatformExtensionTests(String name) {

 		super(name);

diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/platform/JpaPlatformTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/platform/JpaPlatformTests.java
index 795ebc43d2..251e75b621 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/platform/JpaPlatformTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/platform/JpaPlatformTests.java
@@ -32,7 +32,7 @@ import org.eclipse.jpt.jpa.core.tests.extension.resource.TestJavaEntity;
 import org.eclipse.jpt.jpa.core.tests.extension.resource.TestJpaFactory;

 import org.eclipse.jpt.jpa.core.tests.extension.resource.TestJpaPlatformProvider;

 import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase;

-import org.eclipse.jpt.jpa.core.tests.internal.projects.TestJpaProject;

+import org.eclipse.jpt.jpa.core.tests.internal.projects.JpaProjectTestHarness;

 import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;

 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;

 import org.eclipse.wst.common.project.facet.core.IActionConfigFactory;

@@ -41,7 +41,7 @@ import org.eclipse.wst.common.project.facet.core.IActionConfigFactory;
 public class JpaPlatformTests

 	extends ContextModelTestCase

 {

-	protected TestJpaProject testProject;

+	protected JpaProjectTestHarness testProject;

 	

 	public static final String TEST_PLUGIN_CLASS = TestExtensionPlugin.class.getName();

 	public static final String TEST_PLUGIN_ID = "org.eclipse.jpt.jpa.core.tests.extension.resource";

diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/projects/TestJpaProject.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/projects/JpaProjectTestHarness.java
index bd4e4f3221..cc8e3b8152 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/projects/TestJpaProject.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/projects/JpaProjectTestHarness.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2005, 2013 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -23,7 +23,7 @@ import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
  * controlled by building a data model and passing it into the constructor.
  */
 @SuppressWarnings("nls")
-public class TestJpaProject
+public class JpaProjectTestHarness
 	extends JavaProjectTestHarness
 {
 	public static final String JPA_JAR_NAME_SYSTEM_PROPERTY = "org.eclipse.jpt.jpa.jar";
@@ -32,27 +32,27 @@ public class TestJpaProject
 
 	// ********** builders **********
 
-	public static TestJpaProject buildJpaProject(String baseProjectName, boolean autoBuild, IDataModel jpaConfig)
+	public static JpaProjectTestHarness buildJpaProject(String baseProjectName, boolean autoBuild, IDataModel jpaConfig)
 			throws CoreException {
-		return new TestJpaProject(baseProjectName, autoBuild, jpaConfig);
+		return new JpaProjectTestHarness(baseProjectName, autoBuild, jpaConfig);
 	}
 
-	public static TestJpaProject buildJpaProject(String baseProjectName, boolean autoBuild)
+	public static JpaProjectTestHarness buildJpaProject(String baseProjectName, boolean autoBuild)
 			throws CoreException {
 		return buildJpaProject(baseProjectName, autoBuild, null);
 	}
 
 	// ********** constructors/initialization **********
 
-	public TestJpaProject(String projectName) throws CoreException {
+	public JpaProjectTestHarness(String projectName) throws CoreException {
 		this(projectName, false);
 	}
 
-	public TestJpaProject(String projectName, boolean autoBuild) throws CoreException {
+	public JpaProjectTestHarness(String projectName, boolean autoBuild) throws CoreException {
 		this(projectName, autoBuild, null);
 	}
 
-	public TestJpaProject(String projectName, boolean autoBuild, IDataModel jpaConfig) throws CoreException {
+	public JpaProjectTestHarness(String projectName, boolean autoBuild, IDataModel jpaConfig) throws CoreException {
 		super(projectName, autoBuild);
 		String jpaFacetVersion = JpaProject.FACET_VERSION_STRING;
 		if (jpaConfig != null) {
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JpaJavaResourceModelTestCase.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JpaJavaResourceModelTestCase.java
index 0b616b7667..c5e5b2adbd 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JpaJavaResourceModelTestCase.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JpaJavaResourceModelTestCase.java
@@ -17,7 +17,7 @@ import org.eclipse.jpt.common.core.tests.internal.resource.java.JavaResourceMode
 import org.eclipse.jpt.jpa.core.JpaAnnotationDefinitionProvider;
 import org.eclipse.jpt.jpa.core.internal.GenericJpaAnnotationDefinitionProvider;
 import org.eclipse.jpt.jpa.core.internal.JpaAnnotationProvider;
-import org.eclipse.jpt.jpa.core.tests.internal.projects.TestJpaProject;
+import org.eclipse.jpt.jpa.core.tests.internal.projects.JpaProjectTestHarness;
 
 @SuppressWarnings("nls")
 public class JpaJavaResourceModelTestCase
@@ -34,9 +34,9 @@ public class JpaJavaResourceModelTestCase
 	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
-		this.javaProjectTestHarness.addJar(TestJpaProject.jpaJarName());
-		if (TestJpaProject.eclipseLinkJarName() != null) {
-			this.javaProjectTestHarness.addJar(TestJpaProject.eclipseLinkJarName());
+		this.javaProjectTestHarness.addJar(JpaProjectTestHarness.jpaJarName());
+		if (JpaProjectTestHarness.eclipseLinkJarName() != null) {
+			this.javaProjectTestHarness.addJar(JpaProjectTestHarness.eclipseLinkJarName());
 		}
 	}
 	
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/JptJpaEclipseLinkCoreTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/JptJpaEclipseLinkCoreTests.java
index 99e0200385..426a157976 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/JptJpaEclipseLinkCoreTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/JptJpaEclipseLinkCoreTests.java
@@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.tests.internal;
 import java.io.File;
 import junit.framework.Test;
 import junit.framework.TestSuite;
-import org.eclipse.jpt.jpa.core.tests.internal.projects.TestJpaProject;
+import org.eclipse.jpt.jpa.core.tests.internal.projects.JpaProjectTestHarness;
 import org.eclipse.jpt.jpa.eclipselink.core.tests.internal.context.JptJpaEclipseLinkCoreContextModelTests;
 import org.eclipse.jpt.jpa.eclipselink.core.tests.internal.resource.JptJpaEclipseLinkCoreResourceModelTests;
 
@@ -27,8 +27,8 @@ import org.eclipse.jpt.jpa.eclipselink.core.tests.internal.resource.JptJpaEclips
 @SuppressWarnings("nls")
 public class JptJpaEclipseLinkCoreTests {
 
-	private static final String JPA_JAR_PROPERTY = TestJpaProject.JPA_JAR_NAME_SYSTEM_PROPERTY;
-	private static final String ECLIPSELINK_JAR_PROPERTY = TestJpaProject.ECLIPSELINK_JAR_NAME_SYSTEM_PROPERTY;
+	private static final String JPA_JAR_PROPERTY = JpaProjectTestHarness.JPA_JAR_NAME_SYSTEM_PROPERTY;
+	private static final String ECLIPSELINK_JAR_PROPERTY = JpaProjectTestHarness.ECLIPSELINK_JAR_NAME_SYSTEM_PROPERTY;
 
 	public static Test suite() {
 		// ***** keep test.xml in sync with this list *****
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/EclipseLinkContextModelTestCase.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/EclipseLinkContextModelTestCase.java
index 5dfd264792..d6f32f7473 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/EclipseLinkContextModelTestCase.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/EclipseLinkContextModelTestCase.java
@@ -14,7 +14,7 @@ import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.jpa.core.internal.operations.JpaFileCreationDataModelProperties;
 import org.eclipse.jpt.jpa.core.internal.operations.OrmFileCreationDataModelProperties;
 import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase;
-import org.eclipse.jpt.jpa.core.tests.internal.projects.TestJpaProject;
+import org.eclipse.jpt.jpa.core.tests.internal.projects.JpaProjectTestHarness;
 import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkJpaProject;
 import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaEmbeddable;
 import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaEntity;
@@ -51,8 +51,8 @@ public abstract class EclipseLinkContextModelTestCase
 	}
 
 	@Override
-	protected TestJpaProject buildJpaProject(String projectName, boolean autoBuild, IDataModel jpaConfig) throws Exception {
-		TestJpaProject testJpaProject = super.buildJpaProject(projectName, autoBuild, jpaConfig);
+	protected JpaProjectTestHarness buildJpaProject(String projectName, boolean autoBuild, IDataModel jpaConfig) throws Exception {
+		JpaProjectTestHarness testJpaProject = super.buildJpaProject(projectName, autoBuild, jpaConfig);
 
 		if (createEclipseLinkOrmXml()) {
 			EclipseLinkOrmFileCreationOperation operation = 
@@ -72,7 +72,7 @@ public abstract class EclipseLinkContextModelTestCase
 		return true;
 	}
 
-	protected IDataModel buildEclipseLinkOrmConfig(TestJpaProject testJpaProject) {
+	protected IDataModel buildEclipseLinkOrmConfig(JpaProjectTestHarness testJpaProject) {
 		IDataModel dataModel = 
 			DataModelFactory.createDataModel(new EclipseLinkOrmFileCreationDataModelProvider());		
 		dataModel.setProperty(JptFileCreationDataModelProperties.CONTAINER_PATH, 
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/EclipseLinkPersistenceUnitTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/EclipseLinkPersistenceUnitTests.java
index 963edf1a4c..07d67c5349 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/EclipseLinkPersistenceUnitTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/EclipseLinkPersistenceUnitTests.java
@@ -28,7 +28,7 @@ import org.eclipse.jpt.jpa.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlJavaClassRef;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlMappingFileRef;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistenceUnit;
-import org.eclipse.jpt.jpa.core.tests.internal.projects.TestJpaProject;
+import org.eclipse.jpt.jpa.core.tests.internal.projects.JpaProjectTestHarness;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
 import org.eclipse.jpt.jpa.eclipselink.core.internal.operations.EclipseLinkOrmFileCreationDataModelProvider;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings;
@@ -65,7 +65,7 @@ public class EclipseLinkPersistenceUnitTests
 	}
 
 	@Override
-	protected IDataModel buildEclipseLinkOrmConfig(TestJpaProject testJpaProject) {
+	protected IDataModel buildEclipseLinkOrmConfig(JpaProjectTestHarness testJpaProject) {
 		IDataModel dataModel = 
 			DataModelFactory.createDataModel(new EclipseLinkOrmFileCreationDataModelProvider());		
 		dataModel.setProperty(JptFileCreationDataModelProperties.CONTAINER_PATH, 
diff --git a/jpa/tests/org.eclipse.jpt.jpa.ui.tests/src/org/eclipse/jpt/jpa/ui/tests/internal/platform/JpaPlatformUiExtensionTests.java b/jpa/tests/org.eclipse.jpt.jpa.ui.tests/src/org/eclipse/jpt/jpa/ui/tests/internal/platform/JpaPlatformUiExtensionTests.java
index 27572a98ef..4517aaf039 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.ui.tests/src/org/eclipse/jpt/jpa/ui/tests/internal/platform/JpaPlatformUiExtensionTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.ui.tests/src/org/eclipse/jpt/jpa/ui/tests/internal/platform/JpaPlatformUiExtensionTests.java
@@ -18,12 +18,12 @@ import org.eclipse.jpt.jpa.core.JpaWorkspace;
 import org.eclipse.jpt.jpa.core.platform.JpaPlatformManager;
 import org.eclipse.jpt.jpa.core.tests.extension.resource.TestExtensionPlugin;
 import org.eclipse.jpt.jpa.core.tests.extension.resource.TestJpaPlatformProvider;
-import org.eclipse.jpt.jpa.core.tests.internal.projects.TestJpaProject;
+import org.eclipse.jpt.jpa.core.tests.internal.projects.JpaProjectTestHarness;
 
 @SuppressWarnings("nls")
 public class JpaPlatformUiExtensionTests extends TestCase
 {
-	protected TestJpaProject testProject;
+	protected JpaProjectTestHarness testProject;
 
 	protected static final String PROJECT_NAME = "ExtensionTestProject";
 	protected static final String PACKAGE_NAME = "extension.test";
@@ -47,8 +47,8 @@ public class JpaPlatformUiExtensionTests extends TestCase
 		this.testProject = this.buildJpaProject(PROJECT_NAME, false);  // false = no auto-build
 	}
 
-	protected TestJpaProject buildJpaProject(String projectName, boolean autoBuild) throws Exception {
-		return new TestJpaProject(projectName, autoBuild);  // false = no auto-build
+	protected JpaProjectTestHarness buildJpaProject(String projectName, boolean autoBuild) throws Exception {
+		return new JpaProjectTestHarness(projectName, autoBuild);  // false = no auto-build
 	}
 
 	@Override