Bug 564398 - Switch to RedDeer 3.0.0
Adapt version ranges.
Fix couple of warnings while at it.
Change-Id: I6b9cc52df72befbddad87350ffe230915dc0b406
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
(cherry picked from commit aa2989ef9070ece3bb9658fff18b9970f9341cf2)
diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.ui.tests.smartimport/META-INF/MANIFEST.MF
index 240d845..807d3fa 100644
--- a/ui/org.eclipse.pde.ui.tests.smartimport/META-INF/MANIFEST.MF
+++ b/ui/org.eclipse.pde.ui.tests.smartimport/META-INF/MANIFEST.MF
@@ -8,15 +8,15 @@
Require-Bundle: org.eclipse.core.resources,
org.eclipse.core.runtime,
org.eclipse.jface,
- org.eclipse.reddeer.core;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.reddeer.common;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.reddeer.eclipse;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.reddeer.jface;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.reddeer.junit;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.reddeer.junit.extension;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.reddeer.swt;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.reddeer.workbench;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.reddeer.workbench.core;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.reddeer.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.reddeer.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.reddeer.eclipse;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.reddeer.jface;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.reddeer.junit;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.reddeer.junit.extension;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.reddeer.swt;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.reddeer.workbench;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.reddeer.workbench.core;bundle-version="[3.0.0,4.0.0)",
org.eclipse.swt,
org.junit,
org.eclipse.jdt.ui,
@@ -24,3 +24,4 @@
Bundle-ActivationPolicy: lazy
Eclipse-BundleShape: dir
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.pde.ui.tests.smartimport
diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/build.properties b/ui/org.eclipse.pde.ui.tests.smartimport/build.properties
index 61c6aa5..d01fd19 100644
--- a/ui/org.eclipse.pde.ui.tests.smartimport/build.properties
+++ b/ui/org.eclipse.pde.ui.tests.smartimport/build.properties
@@ -15,4 +15,3 @@
src.includes = about.html
jars.compile.order = browser.jar
source.. = src/
-output.. = bin/
diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/src/org/eclipse/ui/tests/smartimport/ProjectTestTemplate.java b/ui/org.eclipse.pde.ui.tests.smartimport/src/org/eclipse/ui/tests/smartimport/ProjectTestTemplate.java
index 0992e41..29481cb 100644
--- a/ui/org.eclipse.pde.ui.tests.smartimport/src/org/eclipse/ui/tests/smartimport/ProjectTestTemplate.java
+++ b/ui/org.eclipse.pde.ui.tests.smartimport/src/org/eclipse/ui/tests/smartimport/ProjectTestTemplate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2018 Red Hat, Inc. and others.
+ * Copyright (c) 2018, 2020 Red Hat, Inc. and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -76,7 +76,9 @@
private List<DefaultProject> getProjects() {
try {
- return new ProjectExplorer().getProjects();
+ ProjectExplorer explorer = new ProjectExplorer();
+ explorer.open();
+ return explorer.getProjects();
} catch (NullPointerException e) {
// TODO: remove workaround when
// https://github.com/eclipse/reddeer/issues/2005 is fixed
