Skip to content

Commit 8f2890b

Browse files
vogellavogella
committed
Migrate org.eclipse.ui.tests.navigator to JUnit 5
1 parent 8cfdecd commit 8f2890b

31 files changed

Lines changed: 159 additions & 179 deletions

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@ Require-Bundle: org.eclipse.core.resources,
1010
org.eclipse.ui,
1111
org.eclipse.ui.ide,
1212
org.eclipse.ui.workbench,
13-
org.junit,
1413
org.eclipse.ui.navigator.resources,
1514
org.eclipse.ui.tests.harness,
1615
org.eclipse.ui.editors,
17-
org.eclipse.jdt.ui,
16+
org.eclipse.jdt.ui;bundle-version="3.37.0",
1817
org.eclipse.ui.genericeditor
1918
Bundle-Vendor: Eclipse.org
2019
Import-Package: org.junit.jupiter.api;version="[5.14.0,6.0.0)",
21-
org.junit.platform.suite.api;version="[1.14.0,2.0.0)"
20+
org.junit.jupiter.api.function;version="[5.14.0,6.0.0)",
21+
org.junit.platform.suite.api;version="[1.14.0,2.0.0)",
22+
org.opentest4j
2223
Bundle-RequiredExecutionEnvironment: JavaSE-21
2324
Export-Package: org.eclipse.ui.tests.navigator;x-internal:=true
2425
Eclipse-BundleShape: dir

‎tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/ActionProviderTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
*******************************************************************************/
1515
package org.eclipse.ui.tests.navigator;
1616

17-
import static org.junit.Assert.assertEquals;
18-
import static org.junit.Assert.assertNotNull;
19-
import static org.junit.Assert.assertNull;
17+
import static org.junit.jupiter.api.Assertions.assertEquals;
18+
import static org.junit.jupiter.api.Assertions.assertNotNull;
19+
import static org.junit.jupiter.api.Assertions.assertNull;
2020

2121
import java.util.ArrayList;
2222
import java.util.List;
@@ -33,7 +33,7 @@
3333
import org.eclipse.ui.tests.harness.util.DisplayHelper;
3434
import org.eclipse.ui.tests.navigator.extension.TestContentProvider;
3535
import org.eclipse.ui.tests.navigator.extension.TestExtensionTreeData;
36-
import org.junit.Test;
36+
import org.junit.jupiter.api.Test;
3737

3838
public class ActionProviderTest extends NavigatorTestBase {
3939

‎tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/ActivityTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*******************************************************************************/
1616
package org.eclipse.ui.tests.navigator;
1717

18-
import static org.junit.Assert.assertFalse;
19-
import static org.junit.Assert.assertTrue;
18+
import static org.junit.jupiter.api.Assertions.assertFalse;
19+
import static org.junit.jupiter.api.Assertions.assertTrue;
2020

2121
import java.util.HashSet;
2222
import java.util.Set;
@@ -25,7 +25,7 @@
2525
import org.eclipse.jface.viewers.StructuredSelection;
2626
import org.eclipse.ui.PlatformUI;
2727
import org.eclipse.ui.activities.IWorkbenchActivitySupport;
28-
import org.junit.Test;
28+
import org.junit.jupiter.api.Test;
2929

3030
public class ActivityTest extends NavigatorTestBase {
3131

‎tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/DecorationSchedulerRaceConditionTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*******************************************************************************/
1414
package org.eclipse.ui.tests.navigator;
1515

16-
import static org.junit.Assert.assertEquals;
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
1717

1818
import java.util.concurrent.Semaphore;
1919

@@ -32,9 +32,9 @@
3232
import org.eclipse.ui.tests.harness.util.DisplayHelper;
3333
import org.eclipse.ui.tests.navigator.extension.DecorationSchedulerRaceConditionTestDecorator;
3434
import org.eclipse.ui.tests.navigator.util.TestWorkspace;
35-
import org.junit.After;
36-
import org.junit.Before;
37-
import org.junit.Test;
35+
import org.junit.jupiter.api.AfterEach;
36+
import org.junit.jupiter.api.BeforeEach;
37+
import org.junit.jupiter.api.Test;
3838

3939
/**
4040
* @since 3.3
@@ -79,7 +79,7 @@ public DecorationSchedulerRaceConditionTest() {
7979
}
8080

8181
@Override
82-
@Before
82+
@BeforeEach
8383
public void setUp() throws CoreException {
8484
super.setUp();
8585

@@ -102,7 +102,7 @@ public void setUp() throws CoreException {
102102
assertEquals(TestWorkspace.P1_PROJECT_NAME + DECORATION_TEXT_1, rootItems[0].getText());
103103
}
104104

105-
@After
105+
@AfterEach
106106
public void resetDecoratorEnablement() throws CoreException {
107107
IDecoratorManager manager = PlatformUI.getWorkbench().getDecoratorManager();
108108
manager.setEnabled("org.eclipse.ui.tests.navigator.bug417255Decorator", false);

‎tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/DnDTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
*******************************************************************************/
1515
package org.eclipse.ui.tests.navigator;
1616

17-
import static org.junit.Assert.assertEquals;
18-
import static org.junit.Assert.assertFalse;
19-
import static org.junit.Assert.assertNotNull;
20-
import static org.junit.Assert.assertTrue;
17+
import static org.junit.jupiter.api.Assertions.assertEquals;
18+
import static org.junit.jupiter.api.Assertions.assertFalse;
19+
import static org.junit.jupiter.api.Assertions.assertNotNull;
20+
import static org.junit.jupiter.api.Assertions.assertTrue;
2121

2222
import org.eclipse.core.resources.IFile;
2323
import org.eclipse.jface.viewers.StructuredSelection;
@@ -31,7 +31,7 @@
3131
import org.eclipse.ui.tests.harness.util.DisplayHelper;
3232
import org.eclipse.ui.tests.harness.util.SWTEventHelper;
3333
import org.eclipse.ui.tests.navigator.extension.TestDragAssistant;
34-
import org.junit.Test;
34+
import org.junit.jupiter.api.Test;
3535

3636
public class DnDTest extends NavigatorTestBase {
3737

‎tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/EvaluationCacheTest.java‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@
2323
import org.eclipse.ui.navigator.INavigatorViewerDescriptor;
2424
import org.eclipse.ui.tests.navigator.util.TestNavigatorActivationService;
2525
import org.eclipse.ui.tests.navigator.util.TestNavigatorViewerDescriptor;
26-
import org.junit.Assert;
27-
import org.junit.Test;
26+
import org.junit.jupiter.api.Assertions;
27+
import org.junit.jupiter.api.BeforeEach;
28+
import org.junit.jupiter.api.Test;
2829

2930
/**
3031
* Tests the {@link EvaluationCache} to ensure it can find various key types as
@@ -38,6 +39,7 @@ public EvaluationCacheTest() {
3839
}
3940

4041
@Override
42+
@BeforeEach
4143
public void setUp() throws CoreException {
4244
super.setUp();
4345
INavigatorViewerDescriptor mockViewerDescript = new TestNavigatorViewerDescriptor();
@@ -51,9 +53,9 @@ private void doSimpleAddGet(boolean toComputeOverrides) {
5153
Object key = new Object();
5254
NavigatorContentDescriptor[] value = new NavigatorContentDescriptor[0];
5355
cache.setDescriptors(key, value, toComputeOverrides);
54-
Assert.assertSame(value, cache.getDescriptors(key, toComputeOverrides));
56+
Assertions.assertSame(value, cache.getDescriptors(key, toComputeOverrides));
5557
// The other "half" of the cache should not have this.
56-
Assert.assertNull(cache.getDescriptors(key, !toComputeOverrides));
58+
Assertions.assertNull(cache.getDescriptors(key, !toComputeOverrides));
5759
}
5860

5961
@Test
@@ -76,10 +78,10 @@ private void doNotSameInstEqual(boolean toComputeOverrides) {
7678
// Equal thing but different instance should still be equal.
7779
java.util.List key2 = new ArrayList<>(key);
7880
// Should also find it under this new, equal key.
79-
Assert.assertSame(value, cache.getDescriptors(key2, toComputeOverrides));
81+
Assertions.assertSame(value, cache.getDescriptors(key2, toComputeOverrides));
8082
// The other "half" of the cache should not have this for either key.
81-
Assert.assertNull(cache.getDescriptors(key, !toComputeOverrides));
82-
Assert.assertNull(cache.getDescriptors(key2, !toComputeOverrides));
83+
Assertions.assertNull(cache.getDescriptors(key, !toComputeOverrides));
84+
Assertions.assertNull(cache.getDescriptors(key2, !toComputeOverrides));
8385
}
8486

8587
@Test
@@ -96,10 +98,10 @@ private void doTestReplace(boolean toComputeOverrides) {
9698
Object key = new Object();
9799
NavigatorContentDescriptor[] value1 = new NavigatorContentDescriptor[0];
98100
cache.setDescriptors(key, value1, toComputeOverrides);
99-
Assert.assertSame(value1, cache.getDescriptors(key, toComputeOverrides));
101+
Assertions.assertSame(value1, cache.getDescriptors(key, toComputeOverrides));
100102
NavigatorContentDescriptor[] value2 = new NavigatorContentDescriptor[0];
101103
cache.setDescriptors(key, value2, toComputeOverrides);
102-
Assert.assertSame(value2, cache.getDescriptors(key, toComputeOverrides));
104+
Assertions.assertSame(value2, cache.getDescriptors(key, toComputeOverrides));
103105
}
104106

105107
@Test
@@ -118,14 +120,14 @@ public void testOnVisibilityOrActivationChangeClearsCaches() {
118120
NavigatorContentDescriptor[] value1 = new NavigatorContentDescriptor[0];
119121
cache.setDescriptors(key, value1, false);
120122
// Make sure they actually got inserted.
121-
Assert.assertSame(value1, cache.getDescriptors(key, false));
123+
Assertions.assertSame(value1, cache.getDescriptors(key, false));
122124
NavigatorContentDescriptor[] value2 = new NavigatorContentDescriptor[0];
123125
cache.setDescriptors(key, value2, true);
124-
Assert.assertSame(value2, cache.getDescriptors(key, true));
126+
Assertions.assertSame(value2, cache.getDescriptors(key, true));
125127
cache.onVisibilityOrActivationChange();
126128
// Now trying to find them should give null (non present).
127-
Assert.assertNull(cache.getDescriptors(key, false));
128-
Assert.assertNull(cache.getDescriptors(key, true));
129+
Assertions.assertNull(cache.getDescriptors(key, false));
130+
Assertions.assertNull(cache.getDescriptors(key, true));
129131
}
130132

131133
// TODO Some way to reliably test the clearing of entries. Possibly using

‎tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/ExtensionsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
*******************************************************************************/
1616
package org.eclipse.ui.tests.navigator;
1717

18-
import static org.junit.Assert.assertEquals;
18+
import static org.junit.jupiter.api.Assertions.assertEquals;
1919

2020
import org.eclipse.swt.widgets.Display;
2121
import org.eclipse.ui.internal.navigator.filters.CommonFilterSelectionDialog;
2222
import org.eclipse.ui.navigator.CommonViewer;
2323
import org.eclipse.ui.tests.harness.util.DisplayHelper;
24-
import org.junit.Test;
24+
import org.junit.jupiter.api.Test;
2525

2626
public class ExtensionsTest extends NavigatorTestBase {
2727

‎tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/FilterTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
*******************************************************************************/
1616
package org.eclipse.ui.tests.navigator;
1717

18-
import static org.junit.Assert.assertEquals;
19-
import static org.junit.Assert.assertTrue;
18+
import static org.junit.jupiter.api.Assertions.assertEquals;
19+
import static org.junit.jupiter.api.Assertions.assertTrue;
2020

2121
import org.eclipse.swt.widgets.TreeItem;
2222
import org.eclipse.ui.internal.navigator.NavigatorContentService;
2323
import org.eclipse.ui.internal.navigator.NavigatorFilterService;
24-
import org.junit.Test;
24+
import org.junit.jupiter.api.Test;
2525

2626
public class FilterTest extends NavigatorTestBase {
2727

‎tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/FirstClassM1Tests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import org.eclipse.swt.widgets.TreeItem;
2121
import org.eclipse.ui.tests.navigator.m12.model.M1Project;
22-
import org.junit.Test;
22+
import org.junit.jupiter.api.Test;
2323

2424
/**
2525
* M1/M2 tests with M1 as a first class provider (i.e. override policy set to

‎tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/INavigatorContentServiceTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.eclipse.ui.navigator.NavigatorContentServiceFactory;
3232
import org.eclipse.ui.tests.harness.util.EditorTestHelper;
3333
import org.eclipse.ui.tests.navigator.extension.TestContentProvider;
34-
import org.junit.Test;
34+
import org.junit.jupiter.api.Test;
3535

3636
public class INavigatorContentServiceTests extends NavigatorTestBase {
3737

0 commit comments

Comments
 (0)