Bug 570900 - Tests on ClasspathResolutionTest are not run in I build.
Switch to use org.w3c.dom.events instead of javax.xml bundle as the
former is part of the I-build p2 repo and the later is not.
Change-Id: I89bbfbcfd751c598e95b9ad48f7ed1342370aa5a
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/core/tests/internal/classpath/ClasspathResolutionTest.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/core/tests/internal/classpath/ClasspathResolutionTest.java
index e9dd4a0..8b39b4a 100644
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/core/tests/internal/classpath/ClasspathResolutionTest.java
+++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/core/tests/internal/classpath/ClasspathResolutionTest.java
@@ -54,19 +54,19 @@
@Test
public void testImportSystemPackageDoesntAddExtraBundleJava11() throws Exception {
- loadTargetPlatform("javax.xml");
+ loadTargetPlatform("org.w3c.dom.events");
project = ProjectUtils.importTestProject("tests/projects/demoMissedSystemModulePackage");
project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
IJavaProject javaProject = (IJavaProject) project.getNature(JavaCore.NATURE_ID);
RequiredPluginsClasspathContainer container = new RequiredPluginsClasspathContainer(
PDECore.getDefault().getModelManager().findModel(project));
for (IClasspathEntry entry : container.getClasspathEntries()) {
- if (entry.getPath().lastSegment().contains("javax.xml")) {
+ if (entry.getPath().lastSegment().contains("org.w3c.dom.events")) {
fail(entry.getPath() + " erronesously present in container");
}
}
for (IClasspathEntry entry : javaProject.getResolvedClasspath(false)) {
- if (entry.getPath().lastSegment().contains("javax.xml")) {
+ if (entry.getPath().lastSegment().contains("org.w3c.dom.events")) {
fail(entry.getPath() + " erronesously present in classpath");
}
}
diff --git a/ui/org.eclipse.pde.ui.tests/tests/projects/demoMissedSystemModulePackage/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.ui.tests/tests/projects/demoMissedSystemModulePackage/META-INF/MANIFEST.MF
index 9803bc0..b53d8db 100644
--- a/ui/org.eclipse.pde.ui.tests/tests/projects/demoMissedSystemModulePackage/META-INF/MANIFEST.MF
+++ b/ui/org.eclipse.pde.ui.tests/tests/projects/demoMissedSystemModulePackage/META-INF/MANIFEST.MF
@@ -5,4 +5,4 @@
Bundle-Version: 1.0.0.qualifier
Automatic-Module-Name: demoMissedSystemModulePackage
Bundle-RequiredExecutionEnvironment: JavaSE-11
-Import-Package: org.w3c.dom
+Import-Package: org.w3c.dom.events
diff --git a/ui/org.eclipse.pde.ui.tests/tests/projects/demoMissedSystemModulePackage/src/demoMissedSystemModulePackage/Dummy.java b/ui/org.eclipse.pde.ui.tests/tests/projects/demoMissedSystemModulePackage/src/demoMissedSystemModulePackage/Dummy.java
index 3c23707..323e05c 100644
--- a/ui/org.eclipse.pde.ui.tests/tests/projects/demoMissedSystemModulePackage/src/demoMissedSystemModulePackage/Dummy.java
+++ b/ui/org.eclipse.pde.ui.tests/tests/projects/demoMissedSystemModulePackage/src/demoMissedSystemModulePackage/Dummy.java
@@ -1,8 +1,8 @@
package demoMissedSystemModulePackage;
-import org.w3c.dom.Attr;
+import org.w3c.dom.events.Event;
public class Dummy {
- Attr decl = null;
+ Event decl = null;
}
