Bug 530217 - 29 API tools tests fail with java 9
Change-Id: I4e62645b028e459476fccaa87dc5dcdb105c460b
Signed-off-by: Vikas Chandra <Vikas.Chandra@in.ibm.com>
diff --git a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/ApiBaselineTests.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/ApiBaselineTests.java
index 7d912ee..ab69ab2 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/ApiBaselineTests.java
+++ b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/ApiBaselineTests.java
@@ -27,6 +27,7 @@
import org.eclipse.pde.api.tools.internal.provisional.model.IApiTypeContainer;
import org.eclipse.pde.api.tools.internal.provisional.model.IApiTypeRoot;
import org.eclipse.pde.api.tools.internal.util.Util;
+import org.eclipse.pde.api.tools.tests.util.ProjectUtils;
import junit.framework.TestCase;
@@ -143,7 +144,12 @@
assertEquals("Wrong provider for package", fBaseline.getApiComponent(fBaseline.getExecutionEnvironment()), components[0]); //$NON-NLS-1$
IApiTypeRoot classFile = components[0].findTypeRoot("java.lang.Object"); //$NON-NLS-1$
assertNotNull("Missing java.lang.Object", classFile); //$NON-NLS-1$
- assertEquals("Wrong type name", "java.lang.Object", classFile.getTypeName()); //$NON-NLS-1$ //$NON-NLS-2$
+ String objectTypeName = "java.lang.Object"; //$NON-NLS-1$
+ if (ProjectUtils.isJava9Compatible()) {
+ objectTypeName = "classes.java.lang.Object"; //$NON-NLS-1$
+
+ }
+ assertEquals("Wrong type name", objectTypeName, classFile.getTypeName()); //$NON-NLS-1$
}
/**
diff --git a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/tests/util/ProjectUtils.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/tests/util/ProjectUtils.java
index 36b44cb..4fc3d2c 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/tests/util/ProjectUtils.java
+++ b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/tests/util/ProjectUtils.java
@@ -104,10 +104,21 @@
}
/**
- * Returns if the current running system is compatible with the given Java
- * minor version
+ * Returns if the currently running VM is version compatible with Java 9
*
- * @param ver the version to test - either 4, 5, 6 , 7 or 8
+ * @return <code>true</code> if a Java 9 (or greater) VM is running
+ * <code>false</code> otherwise
+ */
+ public static boolean isJava9Compatible() {
+ return isCompatible(9);
+ }
+
+ /**
+ * Returns if the current running system is compatible with the given Java minor
+ * version
+ *
+ * @param ver
+ * the version to test - either 4, 5, 6 , 7 or 8
* @return <code>true</code> if compatible <code>false</code> otherwise
*/
static boolean isCompatible(int ver) {
