Skip to content

Commit 0509c0e

Browse files
HannesWellHannesWell
committed
Reference junit and hamcrest only via Import-Package
This requires to import the hamcrest packages, if they are used and those test-plugins don't rely on the re-export of hamcrest by org.junit anymore. + Only use junit-4 assertion methods and replace use of junit-3 assertions. + Remove unnecessary hard-coded references to the hamcrest bundle name
1 parent 7dd52e7 commit 0509c0e

File tree

12 files changed

+56
-37
lines changed

12 files changed

+56
-37
lines changed

‎apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF

+7-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ Bundle-SymbolicName: org.eclipse.pde.api.tools.tests
55
Bundle-Version: 1.3.200.qualifier
66
Bundle-Vendor: %Bundle-Vendor
77
Require-Bundle: org.eclipse.core.runtime,
8-
org.junit,
98
org.eclipse.pde.api.tools;bundle-version="1.0.600",
109
org.eclipse.jdt.launching;bundle-version="[3.6.100,4.0.0)",
1110
org.eclipse.debug.core,
@@ -33,15 +32,19 @@ Export-Package: org.eclipse.pde.api.tools.anttasks.tests,
3332
org.eclipse.pde.api.tools.builder.tests.tags,
3433
org.eclipse.pde.api.tools.builder.tests.usage,
3534
org.eclipse.pde.api.tools.comparator.tests,
36-
org.eclipse.pde.api.tools.model.tests;uses:="junit.framework,org.eclipse.pde.api.tools.model.component",
35+
org.eclipse.pde.api.tools.model.tests,
3736
org.eclipse.pde.api.tools.problems.tests,
3837
org.eclipse.pde.api.tools.reference.tests,
3938
org.eclipse.pde.api.tools.search.tests,
4039
org.eclipse.pde.api.tools.tests,
4140
org.eclipse.pde.api.tools.tests.util,
42-
org.eclipse.pde.api.tools.util.tests;uses:="junit.framework"
41+
org.eclipse.pde.api.tools.util.tests
4342
Bundle-Activator: org.eclipse.pde.api.tools.tests.ApiTestsPlugin
4443
Bundle-ActivationPolicy: lazy
4544
Eclipse-BundleShape: dir
46-
Import-Package: org.eclipse.equinox.frameworkadmin
45+
Import-Package: junit.framework,
46+
org.eclipse.equinox.frameworkadmin,
47+
org.junit,
48+
org.junit.runner,
49+
org.junit.runners
4750
Automatic-Module-Name: org.eclipse.pde.api.tools.tests

‎apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/util/tests/UtilTests.java

+4-12
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
import java.io.IOException;
2626
import java.io.InputStream;
2727
import java.nio.charset.StandardCharsets;
28-
import java.util.ArrayList;
29-
import java.util.List;
28+
import java.util.stream.Stream;
3029
import java.util.zip.ZipEntry;
3130
import java.util.zip.ZipInputStream;
3231

@@ -458,8 +457,7 @@ public boolean isDisposed() {
458457
return false;
459458
}
460459
}
461-
List<IApiComponent> allComponents = new ArrayList<>();
462-
String[] componentNames = new String[] {
460+
IApiComponent[] components = Stream.of( //
463461
"org.eclipse.swt", //$NON-NLS-1$
464462
"org.eclipse.equinox.simpleconfigurator.manipulator", //$NON-NLS-1$
465463
"org.eclipse.team.ui", //$NON-NLS-1$
@@ -503,7 +501,6 @@ public boolean isDisposed() {
503501
"org.eclipse.jdt", //$NON-NLS-1$
504502
"org.eclipse.osgi.util", //$NON-NLS-1$
505503
"org.sat4j.pb", //$NON-NLS-1$
506-
"org.hamcrest.core", //$NON-NLS-1$
507504
"org.eclipse.jdt.junit4.runtime", //$NON-NLS-1$
508505
"org.eclipse.equinox.p2.artifact.repository", //$NON-NLS-1$
509506
"org.eclipse.core.databinding.property", //$NON-NLS-1$
@@ -644,13 +641,8 @@ public boolean isDisposed() {
644641
"org.eclipse.equinox.app", //$NON-NLS-1$
645642
"org.eclipse.ui.net", //$NON-NLS-1$
646643
"org.eclipse.equinox.p2.publisher", //$NON-NLS-1$
647-
"org.eclipse.ecf.provider.filetransfer.httpclient", //$NON-NLS-1$
648-
};
649-
for (String componentName : componentNames) {
650-
allComponents.add(new LocalApiComponent(componentName));
651-
}
652-
IApiComponent[] components = new IApiComponent[allComponents.size()];
653-
allComponents.toArray(components);
644+
"org.eclipse.ecf.provider.filetransfer.httpclient" //$NON-NLS-1$
645+
).map(LocalApiComponent::new).toArray(IApiComponent[]::new);
654646
FilteredElements excludedElements = new FilteredElements();
655647
try {
656648
Util.collectRegexIds(line, excludedElements, components, false);

‎build/org.eclipse.pde.build.tests/META-INF/MANIFEST.MF

+4-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ Export-Package: org.eclipse.pde.build.internal.tests;x-internal:=true,
99
org.eclipse.pde.build.internal.tests.p2;x-internal:=true,
1010
org.eclipse.pde.build.tests
1111
Require-Bundle: org.eclipse.core.runtime,
12-
org.junit,
1312
org.eclipse.pde.build,
1413
org.eclipse.ant.core,
1514
org.apache.ant,
@@ -29,7 +28,10 @@ Import-Package: org.eclipse.equinox.frameworkadmin;version="2.0.0",
2928
org.eclipse.equinox.p2.repository;version="[2.0.0,3.0.0)",
3029
org.eclipse.equinox.p2.repository.artifact;version="[2.0.0,3.0.0)",
3130
org.eclipse.equinox.p2.repository.metadata;version="[2.0.0,3.0.0)",
32-
org.eclipse.equinox.simpleconfigurator.manipulator;version="2.0.0"
31+
org.eclipse.equinox.simpleconfigurator.manipulator;version="2.0.0",
32+
org.junit,
33+
org.junit.runner,
34+
org.junit.runners
3335
Bundle-ActivationPolicy: lazy
3436
Eclipse-BundleShape: dir
3537
Automatic-Module-Name: org.eclipse.pde.build.tests

‎ds/org.eclipse.pde.ds.annotations.tests/META-INF/MANIFEST.MF

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@ Bundle-ActivationPolicy: lazy
1010
Require-Bundle: org.eclipse.pde.ds.annotations;bundle-version="[1.1.0,1.4.0)",
1111
org.eclipse.pde.ds.core;bundle-version="[1.1.0,2.0.0)",
1212
org.eclipse.pde.ui;bundle-version="[3.9.0,4.0.0)",
13-
org.junit;bundle-version="[4.12.0,5.0.0)",
1413
org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)",
1514
org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
1615
org.eclipse.text;bundle-version="[3.6.0,4.0.0)"
1716
Export-Package: org.eclipse.pde.ds.internal.annotations.tests;x-internal:=true
17+
Import-Package: org.junit,
18+
org.junit.runner,
19+
org.junit.runners
1820
Eclipse-BundleShape: dir
1921
Bundle-ClassPath: tests.jar
2022
Automatic-Module-Name: org.eclipse.pde.ds.annotations.tests

‎ds/org.eclipse.pde.ds.tests/META-INF/MANIFEST.MF

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ Bundle-SymbolicName: org.eclipse.pde.ds.tests
55
Bundle-Version: 1.3.100.qualifier
66
Bundle-Activator: org.eclipse.pde.internal.ds.tests.Activator
77
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
8-
org.junit;bundle-version="3.8.2",
98
org.eclipse.pde.core;bundle-version="[3.3.0,4.0.0)",
109
org.eclipse.pde.ds.core;bundle-version="[1.0.0,2.0.0)",
1110
org.eclipse.text;bundle-version="[3.3.0,4.0.0)"
@@ -14,5 +13,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
1413
Bundle-Localization: plugin
1514
Bundle-Vendor: %providerName
1615
Export-Package: org.eclipse.pde.internal.ds.tests;x-internal:=true
16+
Import-Package: org.junit,
17+
org.junit.runner,
18+
org.junit.runners
1719
Eclipse-BundleShape: dir
1820
Automatic-Module-Name: org.eclipse.pde.ds.tests

‎ua/org.eclipse.pde.ua.tests/META-INF/MANIFEST.MF

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ Bundle-Version: 1.3.100.qualifier
66
Bundle-ClassPath: tests.jar
77
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
88
org.eclipse.pde.ua.core;bundle-version="[1.0.0,2.0.0)",
9-
org.junit;bundle-version="3.8.2",
109
org.eclipse.text;bundle-version="[3.3.0,4.0.0)",
1110
org.eclipse.pde.ui;bundle-version="[3.5.0,4.0.0)",
1211
org.eclipse.ui.workbench;bundle-version="[3.5.0,4.0.0)",
@@ -27,3 +26,6 @@ Export-Package: org.eclipse.pde.internal.ua.tests;x-internal:="true",
2726
Bundle-Localization: plugin
2827
Eclipse-BundleShape: dir
2928
Automatic-Module-Name: org.eclipse.pde.ua.tests
29+
Import-Package: org.junit,
30+
org.junit.runner,
31+
org.junit.runners

‎ui/org.eclipse.pde.genericeditor.extension.tests/META-INF/MANIFEST.MF

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ Bundle-SymbolicName: org.eclipse.pde.genericeditor.extension.tests
55
Bundle-Version: 1.2.100.qualifier
66
Bundle-Vendor: Eclipse.org
77
Bundle-RequiredExecutionEnvironment: JavaSE-17
8-
Require-Bundle: org.junit;bundle-version="4.12.0",
9-
org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
8+
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
109
org.eclipse.core.resources;bundle-version="3.12.0",
1110
org.eclipse.jface.text;bundle-version="3.13.0",
1211
org.eclipse.ui;bundle-version="3.109.100",
@@ -16,3 +15,6 @@ Require-Bundle: org.junit;bundle-version="4.12.0",
1615
org.eclipse.equinox.p2.metadata,
1716
org.eclipse.core.filebuffers
1817
Automatic-Module-Name: org.eclipse.pde.genericeditor.extension.tests
18+
Import-Package: org.junit,
19+
org.junit.runner,
20+
org.junit.runners

‎ui/org.eclipse.pde.junit.runtime.tests/META-INF/MANIFEST.MF

+5-3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
88
Bundle-Vendor: Eclipse.org
99
Bundle-ActivationPolicy: lazy
1010
Eclipse-BundleShape: dir
11-
Require-Bundle: org.junit,
12-
org.eclipse.core.runtime;bundle-version="3.29.0",
11+
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.29.0",
1312
org.eclipse.pde.launching;bundle-version="3.7.700",
1413
org.eclipse.core.resources;bundle-version="3.13.500",
1514
org.eclipse.pde.ui;bundle-version="3.11.100",
@@ -18,4 +17,7 @@ Require-Bundle: org.junit,
1817
org.eclipse.debug.ui;bundle-version="3.14.200",
1918
org.eclipse.ui;bundle-version="3.114.0",
2019
org.eclipse.pde.ui.tests;bundle-version="3.11.500"
21-
Import-Package: org.assertj.core.api;version="3.14.0"
20+
Import-Package: org.assertj.core.api;version="3.14.0",
21+
org.junit,
22+
org.junit.runner,
23+
org.junit.runners

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Bundle-ClassPath: tests.jar
88
Bundle-RequiredExecutionEnvironment: JavaSE-17
99
Require-Bundle: org.eclipse.pde.ui;bundle-version="3.10.0",
1010
org.eclipse.pde.ui.templates;bundle-version="3.6.0",
11-
org.junit;bundle-version="4.13.0",
1211
org.eclipse.core.runtime;bundle-version="3.29.0",
1312
org.eclipse.core.resources;bundle-version="3.12.0",
1413
org.eclipse.ui.ide;bundle-version="3.13.0",
@@ -17,3 +16,7 @@ Require-Bundle: org.eclipse.pde.ui;bundle-version="3.10.0",
1716
org.eclipse.pde.ui.tests
1817
Automatic-Module-Name: org.eclipse.pde.ui.templates.tests
1918
Eclipse-BundleShape: dir
19+
Import-Package: org.hamcrest,
20+
org.junit,
21+
org.junit.runner,
22+
org.junit.runners

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,13 @@ Require-Bundle: org.eclipse.core.resources,
1818
org.eclipse.reddeer.workbench;bundle-version="[3.0.0,5.0.0)",
1919
org.eclipse.reddeer.workbench.core;bundle-version="[3.0.0,5.0.0)",
2020
org.eclipse.swt,
21-
org.junit,
2221
org.eclipse.jdt.ui,
2322
org.eclipse.pde.ui
2423
Bundle-ActivationPolicy: lazy
2524
Eclipse-BundleShape: dir
2625
Bundle-RequiredExecutionEnvironment: JavaSE-17
2726
Automatic-Module-Name: org.eclipse.pde.ui.tests.smartimport
27+
Import-Package: org.hamcrest,
28+
org.junit,
29+
org.junit.runner,
30+
org.junit.runners

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

+7-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ Bundle-Version: 3.12.200.qualifier
66
Bundle-ClassPath: tests.jar
77
Bundle-Activator: org.eclipse.pde.ui.tests.PDETestsPlugin
88
Bundle-Vendor: Eclipse.org
9-
Require-Bundle: org.junit,
10-
org.eclipse.pde.ui,
9+
Require-Bundle: org.eclipse.pde.ui,
1110
org.eclipse.ui,
1211
org.eclipse.core.resources,
1312
org.eclipse.core.runtime,
@@ -47,7 +46,13 @@ Import-Package: javax.annotation;version="[1.3.0,2.0.0)",
4746
org.assertj.core.api;version="3.14.0",
4847
org.assertj.core.presentation;version="3.21.0",
4948
org.eclipse.pde.internal.build,
49+
org.hamcrest,
50+
org.junit,
5051
org.junit.jupiter.api.function;version="5.8.1",
52+
org.junit.rules,
53+
org.junit.runner,
54+
org.junit.runners,
55+
org.junit.runners.model,
5156
org.osgi.service.event;version="[1.3.0,2.0.0)"
5257
Bundle-RequiredExecutionEnvironment: JavaSE-17
5358
Eclipse-BundleShape: dir

‎ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/performance/parts/TargetPlatformPerfTest.java

+8-7
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import org.eclipse.pde.ui.tests.util.TestBundleCreator;
5151
import org.eclipse.test.performance.Dimension;
5252
import org.eclipse.test.performance.PerformanceTestCase;
53+
import org.junit.Assert;
5354
import org.osgi.framework.Version;
5455

5556
/**
@@ -117,7 +118,7 @@ public void testSearchModelRegistry() throws Exception {
117118
// Create a workspace model
118119
IWorkspace ws = ResourcesPlugin.getWorkspace();
119120
IProject proj = ws.getRoot().getProject(SEARCH_TEST_WORKSPACE_NAME);
120-
assertFalse("Project should not exist", proj.exists());
121+
Assert.assertFalse("Project should not exist", proj.exists());
121122
IBundleProjectDescription description = service.getDescription(proj);
122123
description.setSymbolicName(SEARCH_TEST_WORKSPACE_NAME);
123124
description.setBundleVersion(new Version("1.1.1"));
@@ -203,19 +204,19 @@ public void testSearchModelRegistry() throws Exception {
203204
private void executeSearchTest() {
204205
IPluginModelBase[] models;
205206
models = PluginRegistry.getAllModels();
206-
assertEquals(SEARCH_TEST_EXTERNAL_COUNT + 1, models.length);
207+
Assert.assertEquals(SEARCH_TEST_EXTERNAL_COUNT + 1, models.length);
207208
models = PluginRegistry.getWorkspaceModels();
208-
assertEquals(1, models.length);
209+
Assert.assertEquals(1, models.length);
209210
models = PluginRegistry.getExternalModels();
210-
assertEquals(SEARCH_TEST_EXTERNAL_COUNT, models.length);
211+
Assert.assertEquals(SEARCH_TEST_EXTERNAL_COUNT, models.length);
211212

212213
IPluginModelBase model;
213214
IWorkspace ws = ResourcesPlugin.getWorkspace();
214215
model = PluginRegistry.findModel(SEARCH_TEST_WORKSPACE_NAME);
215-
assertNotNull(model);
216+
Assert.assertNotNull(model);
216217
IProject project = ws.getRoot().getProject(SEARCH_TEST_WORKSPACE_NAME);
217218
model = PluginRegistry.findModel(project);
218-
assertNotNull(model);
219+
Assert.assertNotNull(model);
219220

220221
model = PluginRegistry.findModel(SEARCH_TEST_EXTERNAL_NAME);
221222
openRequiredBundles(model, new HashSet<>());
@@ -230,7 +231,7 @@ private void executeSearchTest() {
230231
* @param allBundleNames set of symbolic names that have been looked up to prevent stack overflows
231232
*/
232233
private void openRequiredBundles(IPluginModelBase model, Set<String> allBundleNames) {
233-
assertNotNull(model);
234+
Assert.assertNotNull(model);
234235
BundleSpecification[] required = model.getBundleDescription().getRequiredBundles();
235236
for (BundleSpecification element : required) {
236237
if (!allBundleNames.contains(element.getName())) {

0 commit comments

Comments
 (0)