Bug 539637 - fix incorrect location URI during I-build tests
Change-Id: I8354aa102d64541e67974d0fab1e6b85aad14a94
Signed-off-by: Hannes Wellmann <wellmann.hannes1@gmx.net>
Reviewed-on: https://git.eclipse.org/r/c/pde/eclipse.pde.ui/+/185885
Tested-by: PDE Bot <pde-bot@eclipse.org>
Reviewed-by: Andrey Loskutov <loskutov@gmx.de>
diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/core/tests/internal/DependencyManagerTest.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/core/tests/internal/DependencyManagerTest.java
index d9a665f..c93eaae 100644
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/core/tests/internal/DependencyManagerTest.java
+++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/core/tests/internal/DependencyManagerTest.java
@@ -4,7 +4,6 @@
import java.io.IOException;
import java.net.URI;
-import java.nio.file.Path;
import java.util.*;
import java.util.Map.Entry;
import java.util.stream.Collectors;
@@ -19,6 +18,7 @@
import org.eclipse.pde.internal.core.*;
import org.eclipse.pde.internal.core.target.IUBundleContainer;
import org.eclipse.pde.internal.core.target.TargetPlatformService;
+import org.eclipse.pde.ui.tests.target.IUBundleContainerTests;
import org.eclipse.pde.ui.tests.util.ProjectUtils;
import org.junit.*;
import org.osgi.framework.Version;
@@ -52,9 +52,9 @@
}
@Test
- public void testFindRequirementsClosure_RequireBundle2() {
- Map<URI, List<Entry<String, Version>>> locationIUs = Map.of(
- Path.of("tests", "sites", "site.a.b").toAbsolutePath().toUri(),
+ public void testFindRequirementsClosure_RequireBundle2() throws Exception {
+ URI locationURI = IUBundleContainerTests.getURI("tests/sites/site.a.b");
+ Map<URI, List<Entry<String, Version>>> locationIUs = Map.of(locationURI,
List.of(Map.entry("feature.a.feature.group", Version.emptyVersion)));
PDEState pdeState = createTPState(locationIUs);
diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/IUBundleContainerTests.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/IUBundleContainerTests.java
index f19db6a..168f78d 100644
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/IUBundleContainerTests.java
+++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/IUBundleContainerTests.java
@@ -70,7 +70,7 @@
* @return URI
* @throws Exception
*/
- protected URI getURI(String relativePath) throws Exception {
+ public static URI getURI(String relativePath) throws Exception {
URL url = PDETestsPlugin.getBundleContext().getBundle().getEntry(relativePath);
Path path = new Path(new File(FileLocator.toFileURL(url).getFile()).getAbsolutePath());
return URIUtil.toURI(path);
