clean up JpaProjectTestHarness

8 files changed, 34 insertions, 47 deletions

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 0dd576f0b0..c4ce0c9430 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
@@ -50,7 +50,8 @@ import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
 
 @SuppressWarnings("nls")
-public abstract class ContextModelTestCase extends AnnotationTestCase
+public abstract class ContextModelTestCase
+	extends AnnotationTestCase
 {
 	protected static final String BASE_PROJECT_NAME = "ContextModelTestProject";
 	
@@ -82,20 +83,20 @@ public abstract class ContextModelTestCase extends AnnotationTestCase
 	
 	@Override
 	protected JavaProjectTestHarness buildJavaProjectTestHarness(boolean autoBuild) throws Exception {
-		return buildJpaProject(BASE_PROJECT_NAME, autoBuild, this.buildJpaConfigDataModel());
+		return buildJpaProjectTestHarness(BASE_PROJECT_NAME, autoBuild, this.buildJpaConfigDataModel());
 	}
 	
-	protected JpaProjectTestHarness buildJpaProject(String projectName, boolean autoBuild, IDataModel jpaConfig) 
+	protected JpaProjectTestHarness buildJpaProjectTestHarness(String projectName, boolean autoBuild, IDataModel jpaConfig) 
 			throws Exception {
-		JpaProjectTestHarness testJpaProject =JpaProjectTestHarness.buildJpaProject(projectName, autoBuild, jpaConfig);
+		JpaProjectTestHarness harness = new JpaProjectTestHarness(projectName, autoBuild, jpaConfig);
 
 		if (createOrmXml()) {
 			OrmFileCreationOperation operation = 
-					new OrmFileCreationOperation(buildGenericOrmConfig(testJpaProject));
+					new OrmFileCreationOperation(buildGenericOrmConfig(harness));
 			operation.execute(null, null);
 		}
 
-		return testJpaProject;
+		return harness;
 	}
 	
 	protected IDataModel buildJpaConfigDataModel() {
@@ -105,11 +106,11 @@ public abstract class ContextModelTestCase extends AnnotationTestCase
 		return dataModel;
 	}
 	
-	protected IDataModel buildGenericOrmConfig(JpaProjectTestHarness testJpaProject) {
+	protected IDataModel buildGenericOrmConfig(JpaProjectTestHarness harness) {
 		IDataModel config =
 				DataModelFactory.createDataModel(new OrmFileCreationDataModelProvider());
 			config.setProperty(JptFileCreationDataModelProperties.CONTAINER_PATH, 
-					testJpaProject.getProject().getFolder("src/META-INF").getFullPath());
+					harness.getProject().getFolder("src/META-INF").getFullPath());
 			return config;
 	}
 
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 4e47c15487..9158bc9e33 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
@@ -16,7 +16,7 @@ import org.eclipse.jpt.jpa.core.tests.internal.projects.JpaProjectTestHarness;
 @SuppressWarnings("nls")
 public class BaseJpaPlatformTests extends TestCase
 {
-	protected JpaProjectTestHarness jpaProject;
+	protected JpaProjectTestHarness jpaProjectTestHarness;
 
 	protected static final String PROJECT_NAME = "PlatformTestProject";
 	protected static final String PACKAGE_NAME = "platform.test";
@@ -31,17 +31,17 @@ public class BaseJpaPlatformTests extends TestCase
 	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
-		this.jpaProject = this.buildJpaProject(PROJECT_NAME, false);  // false = no auto-build
+		this.jpaProjectTestHarness = this.buildJpaProjectTestHarness(PROJECT_NAME, false);  // false = no auto-build
 	}
 
-	protected JpaProjectTestHarness buildJpaProject(String projectName, boolean autoBuild) throws Exception {
+	protected JpaProjectTestHarness buildJpaProjectTestHarness(String projectName, boolean autoBuild) throws Exception {
 		return new JpaProjectTestHarness(projectName, autoBuild);  // false = no auto-build
 	}
 
 	@Override
 	protected void tearDown() throws Exception {
-		this.jpaProject.getProject().delete(true, true, null);
-		this.jpaProject = null;
+		this.jpaProjectTestHarness.getProject().delete(true, true, null);
+		this.jpaProjectTestHarness = null;
 		super.tearDown();
 	}
 	
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 5b13ad91ff..aa79f545eb 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
@@ -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 JpaProjectTestHarness testProject;

+	protected JpaProjectTestHarness jpaProjectTestHarness;

 

 	public JpaPlatformExtensionTests(String name) {

 		super(name);

@@ -50,7 +50,7 @@ public class JpaPlatformExtensionTests
 	

 	@Override

 	protected JavaProjectTestHarness buildJavaProjectTestHarness(boolean autoBuild) throws Exception {

-		return super.buildJpaProject(PROJECT_NAME, autoBuild, this.buildConfig());

+		return super.buildJpaProjectTestHarness(PROJECT_NAME, autoBuild, this.buildConfig());

 	}

 

 	protected IDataModel buildConfig() throws Exception {

@@ -95,6 +95,6 @@ public class JpaPlatformExtensionTests
 	}

 

 	protected JpaPlatform getJpaPlatform() {

-		return this.getJpaPlatformManager().getJpaPlatform(JpaPreferences.getJpaPlatformID(this.testProject.getProject()));

+		return this.getJpaPlatformManager().getJpaPlatform(JpaPreferences.getJpaPlatformID(this.jpaProjectTestHarness.getProject()));

 	}

 }

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 251e75b621..b921742f54 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
@@ -41,7 +41,7 @@ import org.eclipse.wst.common.project.facet.core.IActionConfigFactory;
 public class JpaPlatformTests

 	extends ContextModelTestCase

 {

-	protected JpaProjectTestHarness testProject;

+	protected JpaProjectTestHarness jpaProjectTestHarness;

 	

 	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";

@@ -64,7 +64,7 @@ public class JpaPlatformTests
 

 	@Override

 	protected JavaProjectTestHarness buildJavaProjectTestHarness(boolean autoBuild) throws Exception {

-		return super.buildJpaProject(PROJECT_NAME, autoBuild, this.buildConfig());

+		return super.buildJpaProjectTestHarness(PROJECT_NAME, autoBuild, this.buildConfig());

 	}

 

 	protected IDataModel buildConfig() throws Exception {

diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/projects/JpaProjectTestHarness.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/projects/JpaProjectTestHarness.java
index cc8e3b8152..511ed0a71f 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/projects/JpaProjectTestHarness.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/projects/JpaProjectTestHarness.java
@@ -30,20 +30,6 @@ public class JpaProjectTestHarness
 	public static final String ECLIPSELINK_JAR_NAME_SYSTEM_PROPERTY = "org.eclipse.jpt.eclipselink.jar";
 
 
-	// ********** builders **********
-
-	public static JpaProjectTestHarness buildJpaProject(String baseProjectName, boolean autoBuild, IDataModel jpaConfig)
-			throws CoreException {
-		return new JpaProjectTestHarness(baseProjectName, autoBuild, jpaConfig);
-	}
-
-	public static JpaProjectTestHarness buildJpaProject(String baseProjectName, boolean autoBuild)
-			throws CoreException {
-		return buildJpaProject(baseProjectName, autoBuild, null);
-	}
-
-	// ********** constructors/initialization **********
-
 	public JpaProjectTestHarness(String projectName) throws CoreException {
 		this(projectName, false);
 	}
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 d6f32f7473..db56d0b176 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
@@ -51,16 +51,16 @@ public abstract class EclipseLinkContextModelTestCase
 	}
 
 	@Override
-	protected JpaProjectTestHarness buildJpaProject(String projectName, boolean autoBuild, IDataModel jpaConfig) throws Exception {
-		JpaProjectTestHarness testJpaProject = super.buildJpaProject(projectName, autoBuild, jpaConfig);
+	protected JpaProjectTestHarness buildJpaProjectTestHarness(String projectName, boolean autoBuild, IDataModel jpaConfig) throws Exception {
+		JpaProjectTestHarness harness = super.buildJpaProjectTestHarness(projectName, autoBuild, jpaConfig);
 
 		if (createEclipseLinkOrmXml()) {
 			EclipseLinkOrmFileCreationOperation operation = 
-				new EclipseLinkOrmFileCreationOperation(buildEclipseLinkOrmConfig(testJpaProject));
+				new EclipseLinkOrmFileCreationOperation(buildEclipseLinkOrmConfig(harness));
 			operation.execute(null, null);
 		}
 
-		return testJpaProject;
+		return harness;
 	}
 
 	@Override
@@ -72,11 +72,11 @@ public abstract class EclipseLinkContextModelTestCase
 		return true;
 	}
 
-	protected IDataModel buildEclipseLinkOrmConfig(JpaProjectTestHarness testJpaProject) {
+	protected IDataModel buildEclipseLinkOrmConfig(JpaProjectTestHarness harness) {
 		IDataModel dataModel = 
 			DataModelFactory.createDataModel(new EclipseLinkOrmFileCreationDataModelProvider());		
 		dataModel.setProperty(JptFileCreationDataModelProperties.CONTAINER_PATH, 
-				testJpaProject.getProject().getFolder("src/META-INF").getFullPath()); //$NON-NLS-1$
+				harness.getProject().getFolder("src/META-INF").getFullPath()); //$NON-NLS-1$
 		dataModel.setProperty(JpaFileCreationDataModelProperties.VERSION, this.getEclipseLinkSchemaVersion());
 		dataModel.setProperty(OrmFileCreationDataModelProperties.ADD_TO_PERSISTENCE_UNIT, Boolean.TRUE);
 		return dataModel;
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 07d67c5349..5ff1bea72f 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
@@ -65,11 +65,11 @@ public class EclipseLinkPersistenceUnitTests
 	}
 
 	@Override
-	protected IDataModel buildEclipseLinkOrmConfig(JpaProjectTestHarness testJpaProject) {
+	protected IDataModel buildEclipseLinkOrmConfig(JpaProjectTestHarness harness) {
 		IDataModel dataModel = 
 			DataModelFactory.createDataModel(new EclipseLinkOrmFileCreationDataModelProvider());		
 		dataModel.setProperty(JptFileCreationDataModelProperties.CONTAINER_PATH, 
-				testJpaProject.getProject().getFolder("src/META-INF").getFullPath());
+				harness.getProject().getFolder("src/META-INF").getFullPath());
 		dataModel.setProperty(OrmFileCreationDataModelProperties.ADD_TO_PERSISTENCE_UNIT, Boolean.FALSE);
 		return dataModel;
 	}
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 4517aaf039..588f766d40 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
@@ -23,7 +23,7 @@ import org.eclipse.jpt.jpa.core.tests.internal.projects.JpaProjectTestHarness;
 @SuppressWarnings("nls")
 public class JpaPlatformUiExtensionTests extends TestCase
 {
-	protected JpaProjectTestHarness testProject;
+	protected JpaProjectTestHarness jpaProjectTestHarness;
 
 	protected static final String PROJECT_NAME = "ExtensionTestProject";
 	protected static final String PACKAGE_NAME = "extension.test";
@@ -44,22 +44,22 @@ public class JpaPlatformUiExtensionTests extends TestCase
 	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
-		this.testProject = this.buildJpaProject(PROJECT_NAME, false);  // false = no auto-build
+		this.jpaProjectTestHarness = this.buildJpaProjectTestHarness(PROJECT_NAME, false);  // false = no auto-build
 	}
 
-	protected JpaProjectTestHarness buildJpaProject(String projectName, boolean autoBuild) throws Exception {
+	protected JpaProjectTestHarness buildJpaProjectTestHarness(String projectName, boolean autoBuild) throws Exception {
 		return new JpaProjectTestHarness(projectName, autoBuild);  // false = no auto-build
 	}
 
 	@Override
 	protected void tearDown() throws Exception {
-		this.testProject.getProject().delete(true, true, null);
-		this.testProject = null;
+		this.jpaProjectTestHarness.getProject().delete(true, true, null);
+		this.jpaProjectTestHarness = null;
 		super.tearDown();
 	}
 
 	protected JpaProject jpaProject() {
-		return this.testProject.getJpaProject();
+		return this.jpaProjectTestHarness.getJpaProject();
 	}
 
 	public void testJpaPlatform() {
@@ -71,7 +71,7 @@ public class JpaPlatformUiExtensionTests extends TestCase
 	}
 
 	protected String getJpaPlatformID() {
-		return JpaPreferences.getJpaPlatformID(this.testProject.getProject());
+		return JpaPreferences.getJpaPlatformID(this.jpaProjectTestHarness.getProject());
 	}
 
 	protected JpaPlatformManager getJpaPlatformManager() {