250321- eclipselink jpa jar needed for eclipselink tests

4 files changed, 46 insertions, 15 deletions

diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/JptCoreTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/JptCoreTests.java
index 6d43a10920..85929bb7a3 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/JptCoreTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/JptCoreTests.java
@@ -27,6 +27,7 @@ import org.eclipse.jpt.core.tests.internal.utility.jdt.JptCoreUtilityJdtTests;
 @SuppressWarnings("nls")
 public class JptCoreTests {
 	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;
 
 	public static Test suite() {
 		return suite(false);
@@ -44,26 +45,43 @@ public class JptCoreTests {
 			suite.addTest(JptCoreContextModelTests.suite(all));
 		}
 		else {
-			String message = ( ! jpaJarPropertyExists()) ?
-				"missing Java system property: \"" + JPA_JAR_PROPERTY + "\"" :
-				"missing JPA jar file: \"" + getJpaJarProperty() + "\"";
+			String message = errorMessageMissingJar(JPA_JAR_PROPERTY);
+			suite.addTest(TestSuite.warning(message));
+		}
+		
+		// Temporary jar testing code
+		if( ! (eclipselinkJarPropertyExists() && eclipselinkJarFileExists())) {
+			String message = errorMessageMissingJar(ECLIPSELINK_JAR_PROPERTY);
 			suite.addTest(TestSuite.warning(message));
 		}
 		return suite;
 	}
 	
 	public static boolean jpaJarPropertyExists() {
-		String jpaJarName = getJpaJarProperty();
-		return jpaJarName != null;
+		return getSystemProperty(JPA_JAR_PROPERTY) != null;
 	}
 	
 	public static boolean jpaJarFileExists() {
-		File file = new File(getJpaJarProperty());
-		return file.exists();
+		return (new File(getSystemProperty(JPA_JAR_PROPERTY))).exists();
+	}
+	
+	public static boolean eclipselinkJarPropertyExists() {
+		return getSystemProperty(ECLIPSELINK_JAR_PROPERTY) != null;
+	}
+	
+	public static boolean eclipselinkJarFileExists() {
+		return (new File(getSystemProperty(ECLIPSELINK_JAR_PROPERTY))).exists();
+	}
+	
+	private static String errorMessageMissingJar(String propertyName) {
+
+		return (getSystemProperty(propertyName) == null) ?
+		"missing Java system property: \"" + propertyName + "\"" :
+		"missing JAR file: \"" + getSystemProperty(propertyName) + "\"";
 	}
 	
-	public static String getJpaJarProperty() {
-		return System.getProperty(JPA_JAR_PROPERTY);
+	private static String getSystemProperty(String propertyName) {
+		return System.getProperty(propertyName);
 	}
 	
 	private JptCoreTests() {
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/projects/TestJpaProject.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/projects/TestJpaProject.java
index e232328971..5a22f55232 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/projects/TestJpaProject.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/projects/TestJpaProject.java
@@ -26,6 +26,7 @@ public class TestJpaProject extends TestJavaProject {
 	private final JpaProject jpaProject;
 
 	public static final String JPA_JAR_NAME_SYSTEM_PROPERTY = "org.eclipse.jpt.jpa.jar";
+	public static final String ECLIPSELINK_JAR_NAME_SYSTEM_PROPERTY = "org.eclipse.jpt.eclipselink.jar";
 
 
 	// ********** builders **********
@@ -61,11 +62,19 @@ public class TestJpaProject extends TestJavaProject {
 	}
 
 	public static String jpaJarName() {
-		String jarName = System.getProperty(JPA_JAR_NAME_SYSTEM_PROPERTY);
-		if (jarName == null) {
-			throw new RuntimeException("missing Java system property: \"" + JPA_JAR_NAME_SYSTEM_PROPERTY + "\"");
+		return getSystemProperty(JPA_JAR_NAME_SYSTEM_PROPERTY);
+	}
+
+	public static String eclipseLinkJarName() {
+		return getSystemProperty(ECLIPSELINK_JAR_NAME_SYSTEM_PROPERTY);
+	}
+
+	private static String getSystemProperty(String propertyName) {
+		String propertyValue = System.getProperty(propertyName);
+		if(propertyValue == null) {
+			throw new RuntimeException("missing Java system property: \"" + propertyName + "\"");
 		}
-		return jarName;
+		return propertyValue;
 	}
 
 
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/test.xml b/jpa/tests/org.eclipse.jpt.core.tests/test.xml
index a670c0f697..1c946771d3 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/test.xml
+++ b/jpa/tests/org.eclipse.jpt.core.tests/test.xml
@@ -30,7 +30,9 @@
 			<property name="plugin-name" value="${plugin-name}"/>
 			<property name="classname" value="org.eclipse.jpt.core.tests.internal.JptCoreTests" />
 			<property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-			<property name="extraVMargs" value="-Dorg.eclipse.jpt.jpa.jar=${testDir}/${jpt-persistence-jar}"/>
+			<property name="extraVMargs" value="\
+				-Dorg.eclipse.jpt.jpa.jar=${testDir}/${jpt-persistence-jar}\
+				-Dorg.eclipse.jpt.eclipselink.jar=${testDir}/${jpt-eclipselink-jar}"/>
 		</ant>
 	</target>
 
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/test.xml b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/test.xml
index 4630bf527f..4b9c0ff9cf 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/test.xml
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/test.xml
@@ -30,7 +30,9 @@
 			<property name="plugin-name" value="${plugin-name}"/>
 			<property name="classname" value="org.eclipse.jpt.eclipselink.core.tests.internal.JptEclipseLinkCoreTests" />
 			<property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-			<property name="extraVMargs" value="-Dorg.eclipse.jpt.jpa.jar=${testDir}/${jpt-persistence-jar}"/>
+			<property name="extraVMargs" value="\
+				-Dorg.eclipse.jpt.jpa.jar=${testDir}/${jpt-persistence-jar}\
+				-Dorg.eclipse.jpt.eclipselink.jar=${testDir}/${jpt-eclipselink-jar}"/>
 		</ant>
 	</target>