Skip to content

Commit 89a241d

Browse files
committed
TestPDETemplates.createProjectWithTemplate use only supported EE
- The tests fail when running on Java 25 because that's not currently a supported execution environment.
1 parent 09b7f61 commit 89a241d

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

ui/org.eclipse.pde.ui.templates.tests/META-INF/MANIFEST.MF

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ Require-Bundle: org.eclipse.pde.ui;bundle-version="3.10.0",
1616
org.eclipse.pde.ui.tests
1717
Automatic-Module-Name: org.eclipse.pde.ui.templates.tests
1818
Eclipse-BundleShape: dir
19-
Import-Package: org.hamcrest,
19+
Import-Package: org.eclipse.jdt.launching,
20+
org.eclipse.jdt.launching.environments,
21+
org.hamcrest,
2022
org.junit,
2123
org.junit.runner,
2224
org.junit.runners

ui/org.eclipse.pde.ui.templates.tests/src/org/eclipse/pde/ui/templates/tests/TestPDETemplates.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.Arrays;
2222
import java.util.Collection;
2323
import java.util.Set;
24+
import java.util.SortedSet;
2425
import java.util.concurrent.TimeUnit;
2526
import java.util.stream.Collectors;
2627

@@ -34,6 +35,9 @@
3435
import org.eclipse.core.runtime.IPath;
3536
import org.eclipse.core.runtime.IProgressMonitor;
3637
import org.eclipse.core.runtime.NullProgressMonitor;
38+
import org.eclipse.jdt.launching.JavaRuntime;
39+
import org.eclipse.jdt.launching.environments.IExecutionEnvironment;
40+
import org.eclipse.jdt.launching.environments.IExecutionEnvironmentsManager;
3741
import org.eclipse.pde.core.plugin.IPluginModelBase;
3842
import org.eclipse.pde.ds.internal.annotations.Messages;
3943
import org.eclipse.pde.internal.core.ICoreConstants;
@@ -117,7 +121,15 @@ private static void createProjectWithTemplate()
117121
data.setHasBundleStructure(true);
118122
data.setSourceFolderName("src");
119123
data.setOutputFolderName("bin");
120-
data.setExecutionEnvironment("JavaSE-" + Runtime.version().feature());
124+
IExecutionEnvironmentsManager executionEnvironmentsManager = JavaRuntime.getExecutionEnvironmentsManager();
125+
IExecutionEnvironment environment = executionEnvironmentsManager
126+
.getEnvironment("JavaSE-" + Runtime.version().feature());
127+
SortedSet<IExecutionEnvironment> supportedExecutionEnvironments = executionEnvironmentsManager
128+
.getSupportedExecutionEnvironments();
129+
if (!supportedExecutionEnvironments.contains(environment)) {
130+
environment = supportedExecutionEnvironments.last();
131+
}
132+
data.setExecutionEnvironment(environment.getId());
121133
data.setTargetVersion(ICoreConstants.TARGET_VERSION_LATEST);
122134
data.setDoGenerateClass(true);
123135
String pureOSGi = template.getConfigurationElement().getAttribute("pureOSGi");

0 commit comments

Comments
 (0)