Added check for persistence.jar property before adding tests.
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/JptEclipseLinkCoreTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/JptEclipseLinkCoreTests.java
index b5a88df..6df4d8f 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/JptEclipseLinkCoreTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/JptEclipseLinkCoreTests.java
@@ -9,15 +9,19 @@
******************************************************************************/
package org.eclipse.jpt.eclipselink.core.tests.internal;
+import java.io.File;
+
import junit.framework.Test;
import junit.framework.TestSuite;
+
+import org.eclipse.jpt.core.tests.internal.projects.TestJpaProject;
import org.eclipse.jpt.eclipselink.core.tests.internal.caching.JptEclipseLinkCoreCachingTests;
import org.eclipse.jpt.eclipselink.core.tests.internal.connection.JptEclipseLinkCoreConnectionTests;
import org.eclipse.jpt.eclipselink.core.tests.internal.context.JptEclipseLinkCoreContextModelTests;
import org.eclipse.jpt.eclipselink.core.tests.internal.customization.JptEclipseLinkCoreCustomizationTests;
import org.eclipse.jpt.eclipselink.core.tests.internal.logging.JptEclipseLinkCoreLoggingTests;
import org.eclipse.jpt.eclipselink.core.tests.internal.options.JptEclipseLinkCoreOptionsTests;
-import org.eclipse.jpt.eclipselink.core.tests.internal.resource.JptEclipselinkCoreResourceModelTests;
+//import org.eclipse.jpt.eclipselink.core.tests.internal.resource.JptEclipselinkCoreResourceModelTests;
import org.eclipse.jpt.eclipselink.core.tests.internal.schema.generation.JptEclipseLinkCoreSchemaGenerationTests;
/**
@@ -25,20 +29,43 @@
*/
public class JptEclipseLinkCoreTests
{
+ private static final String JPA_JAR_PROPERTY = TestJpaProject.JAR_NAME_SYSTEM_PROPERTY;
+
public static Test suite() {
TestSuite suite = new TestSuite(JptEclipseLinkCoreTests.class.getPackage().getName());
- suite.addTest(JptEclipseLinkCoreConnectionTests.suite());
- suite.addTest(JptEclipseLinkCoreOptionsTests.suite());
- suite.addTest(JptEclipseLinkCoreLoggingTests.suite());
- suite.addTest(JptEclipseLinkCoreCustomizationTests.suite());
- suite.addTest(JptEclipseLinkCoreCachingTests.suite());
- suite.addTest(JptEclipseLinkCoreSchemaGenerationTests.suite());
- suite.addTest(JptEclipselinkCoreResourceModelTests.suite());
- suite.addTest(JptEclipseLinkCoreContextModelTests.suite());
-
+ if(jpaJarPropertyExist() && jpaJarFileExist()) {
+ suite.addTest(JptEclipseLinkCoreConnectionTests.suite());
+ suite.addTest(JptEclipseLinkCoreOptionsTests.suite());
+ suite.addTest(JptEclipseLinkCoreLoggingTests.suite());
+ suite.addTest(JptEclipseLinkCoreCustomizationTests.suite());
+ suite.addTest(JptEclipseLinkCoreCachingTests.suite());
+ suite.addTest(JptEclipseLinkCoreSchemaGenerationTests.suite());
+// suite.addTest(JptEclipselinkCoreResourceModelTests.suite());
+ suite.addTest(JptEclipseLinkCoreContextModelTests.suite());
+ }
+ else {
+ String message = ( ! jpaJarPropertyExist()) ?
+ "missing Java system property: \"" + JPA_JAR_PROPERTY + "\"" :
+ "missing JPA jar file: \"" + getJpaJarProperty() + "\"";
+ suite.addTest(TestSuite.warning(message));
+ }
return suite;
}
+
+ public static boolean jpaJarPropertyExist() {
+ String jpaJarName = getJpaJarProperty();
+ return jpaJarName != null;
+ }
+
+ public static boolean jpaJarFileExist() {
+ File file = new File(getJpaJarProperty());
+ return file.exists();
+ }
+
+ public static String getJpaJarProperty() {
+ return System.getProperty(JPA_JAR_PROPERTY);
+ }
private JptEclipseLinkCoreTests() {
super();
