Skip to content

Commit 66d71d1

Browse files
committed
Fix cleanup for launchview tests
PDE cleanup removed dependency on org.eclipse.debug.ui.launchview as it is needed for showView(viewId) to work. Adding @referenced to LaunchConfigurationViewPlugin in the test to hint the tool. An x-friend in org.eclipse.debug.ui.launchview is needed as all exported packages are internal. Should fix eclipse-platform#2692 .
1 parent aeb7954 commit 66d71d1

3 files changed

Lines changed: 7 additions & 10 deletions

File tree

debug/org.eclipse.debug.ui.launchview.tests/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ Bundle-Version: 1.2.0.qualifier
66
Bundle-Localization: plugin
77
Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
88
org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
9-
org.eclipse.debug.ui;bundle-version="[3.10.0,4.0.0)",
109
org.eclipse.debug.ui.launchview;bundle-version="[1.0.2,2.0.0)"
1110
Import-Package: org.junit.jupiter.api;version="[5.14.0,6.0.0)",
1211
org.junit.platform.suite.api;version="[1.14.0,2.0.0)"

debug/org.eclipse.debug.ui.launchview.tests/src/org/eclipse/debug/ui/launchview/tests/launchview/LaunchViewSmokeTest.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2021 SSI Schaefer IT Solutions GmbH and others.
2+
* Copyright (c) 2021, 2026 SSI Schaefer IT Solutions GmbH and others.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
@@ -14,25 +14,23 @@
1414
package org.eclipse.debug.ui.launchview.tests.launchview;
1515

1616
import static org.junit.jupiter.api.Assertions.assertNotNull;
17-
import static org.junit.jupiter.api.Assertions.fail;
1817

18+
import org.eclipse.debug.ui.launchview.LaunchConfigurationViewPlugin;
1919
import org.eclipse.debug.ui.launchview.tests.AbstractLaunchViewTest;
2020
import org.eclipse.ui.IWorkbenchPage;
2121
import org.eclipse.ui.PartInitException;
2222
import org.eclipse.ui.PlatformUI;
2323
import org.junit.jupiter.api.Test;
24+
import org.osgi.annotation.bundle.Referenced;
2425

26+
@Referenced(LaunchConfigurationViewPlugin.class)
2527
public class LaunchViewSmokeTest extends AbstractLaunchViewTest {
2628

2729
@Test
28-
public void testOpenView() {
30+
public void testOpenView() throws PartInitException {
2931
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
3032
assertNotNull(page, "The active workbench page should not be null");
31-
try {
32-
page.showView("org.eclipse.debug.ui.launchView"); //$NON-NLS-1$
33-
} catch (PartInitException exception) {
34-
fail("Failed to open launch configuration view");
35-
}
33+
page.showView("org.eclipse.debug.ui.launchView"); //$NON-NLS-1$
3634

3735
}
3836

debug/org.eclipse.debug.ui.launchview/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21
1616
Import-Package: jakarta.annotation;version="[2.0.0,4.0.0)",
1717
jakarta.inject;version="[2.0.0,3.0.0)"
1818
Bundle-ActivationPolicy: lazy
19-
Export-Package: org.eclipse.debug.ui.launchview;x-internal:=true,
19+
Export-Package: org.eclipse.debug.ui.launchview;x-friends:="org.eclipse.debug.ui.launchview.tests",
2020
org.eclipse.debug.ui.launchview.services;x-internal:=true
2121
Automatic-Module-Name: org.eclipse.debug.ui.launchview
2222
Service-Component: OSGI-INF/org.eclipse.debug.ui.launchview.internal.impl.DebugCoreProvider.xml,

0 commit comments

Comments
 (0)