Skip to content

Commit f32bebf

Browse files
HannesWellakurtakov
authored andcommitted
Migrate all pde.ds.tests to JUnit 5 and remove launch configuration
The launch configuration isn't usable and wasn't working as it was still set to use a 'J2SE-1.5' JRE. Just launching the the desired tests with a new launch configuration from the context menu works very well.
1 parent 3135d4f commit f32bebf

File tree

12 files changed

+41
-93
lines changed

12 files changed

+41
-93
lines changed

ds/org.eclipse.pde.ds.tests/All DS Tests.launch

Lines changed: 0 additions & 49 deletions
This file was deleted.

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
1313
Bundle-Localization: plugin
1414
Bundle-Vendor: %providerName
1515
Export-Package: org.eclipse.pde.internal.ds.tests;x-internal:=true
16-
Import-Package: org.junit,
17-
org.junit.jupiter.api;version="[5.13.0,6.0.0)",
18-
org.junit.platform.suite.api;version="[1.13.0,2.0.0)",
19-
org.junit.runner,
20-
org.junit.runners
16+
Import-Package: org.junit.jupiter.api;version="[5.13.0,6.0.0)",
17+
org.junit.platform.suite.api;version="[1.13.0,2.0.0)"
2118
Eclipse-BundleShape: dir
2219
Automatic-Module-Name: org.eclipse.pde.ds.tests

ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/AbstractDSModelTestCase.java

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

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

1818
import org.eclipse.core.runtime.CoreException;
1919
import org.eclipse.jface.text.BadLocationException;
@@ -24,7 +24,7 @@
2424
import org.eclipse.text.edits.MalformedTreeException;
2525
import org.eclipse.text.edits.MultiTextEdit;
2626
import org.eclipse.text.edits.TextEdit;
27-
import org.junit.Before;
27+
import org.junit.jupiter.api.BeforeEach;
2828

2929
public abstract class AbstractDSModelTestCase {
3030

@@ -38,7 +38,7 @@ public abstract class AbstractDSModelTestCase {
3838
protected DSModel fModel;
3939
protected IModelTextChangeListener fListener;
4040

41-
@Before
41+
@BeforeEach
4242
public void setUp() throws Exception {
4343
fDocument = new Document();
4444
}

ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSComponentTestCase.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
*******************************************************************************/
1515
package org.eclipse.pde.internal.ds.tests;
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.pde.internal.core.text.IDocumentElementNode;
2323
import org.eclipse.pde.internal.ds.core.IDSComponent;
@@ -27,7 +27,7 @@
2727
import org.eclipse.pde.internal.ds.core.IDSProperty;
2828
import org.eclipse.pde.internal.ds.core.IDSReference;
2929
import org.eclipse.pde.internal.ds.core.IDSService;
30-
import org.junit.Test;
30+
import org.junit.jupiter.api.Test;
3131

3232
public class DSComponentTestCase extends AbstractDSModelTestCase {
3333
@Test

ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSImplementationTestCase.java

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

17-
import static org.junit.Assert.assertEquals;
18-
import static org.junit.Assert.assertNotNull;
19-
import static org.junit.Assert.assertTrue;
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.assertTrue;
2020

2121
import org.eclipse.pde.internal.ds.core.IDSComponent;
2222
import org.eclipse.pde.internal.ds.core.IDSDocumentFactory;
2323
import org.eclipse.pde.internal.ds.core.IDSImplementation;
24-
import org.junit.Test;
24+
import org.junit.jupiter.api.Test;
2525

2626
public class DSImplementationTestCase extends AbstractDSModelTestCase {
2727

ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSObjectTestCase.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
*******************************************************************************/
1414
package org.eclipse.pde.internal.ds.tests;
1515

16-
import static org.junit.Assert.assertEquals;
17-
import static org.junit.Assert.assertNotNull;
18-
import static org.junit.Assert.assertTrue;
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
17+
import static org.junit.jupiter.api.Assertions.assertNotNull;
18+
import static org.junit.jupiter.api.Assertions.assertTrue;
1919

2020
import java.util.List;
2121

@@ -28,7 +28,7 @@
2828
import org.eclipse.pde.internal.ds.core.IDSProperty;
2929
import org.eclipse.pde.internal.ds.core.IDSReference;
3030
import org.eclipse.pde.internal.ds.core.IDSService;
31-
import org.junit.Test;
31+
import org.junit.jupiter.api.Test;
3232

3333
public class DSObjectTestCase extends AbstractDSModelTestCase {
3434

ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSPropertiesTestCase.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
*******************************************************************************/
1414
package org.eclipse.pde.internal.ds.tests;
1515

16-
import static org.junit.Assert.assertEquals;
17-
import static org.junit.Assert.assertNotNull;
18-
import static org.junit.Assert.assertTrue;
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
17+
import static org.junit.jupiter.api.Assertions.assertNotNull;
18+
import static org.junit.jupiter.api.Assertions.assertTrue;
1919

2020
import org.eclipse.pde.internal.ds.core.IDSComponent;
2121
import org.eclipse.pde.internal.ds.core.IDSDocumentFactory;
2222
import org.eclipse.pde.internal.ds.core.IDSProperties;
23-
import org.junit.Test;
23+
import org.junit.jupiter.api.Test;
2424

2525
public class DSPropertiesTestCase extends AbstractDSModelTestCase {
2626
@Test

ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSPropertyTestCase.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
*******************************************************************************/
1414
package org.eclipse.pde.internal.ds.tests;
1515

16-
import static org.junit.Assert.assertEquals;
17-
import static org.junit.Assert.assertNotNull;
18-
import static org.junit.Assert.assertTrue;
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
17+
import static org.junit.jupiter.api.Assertions.assertNotNull;
18+
import static org.junit.jupiter.api.Assertions.assertTrue;
1919

2020
import org.eclipse.pde.internal.ds.core.IDSComponent;
2121
import org.eclipse.pde.internal.ds.core.IDSProperty;
22-
import org.junit.Test;
22+
import org.junit.jupiter.api.Test;
2323

2424
public class DSPropertyTestCase extends AbstractDSModelTestCase {
2525
@Test

ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSProvideTestCase.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
*******************************************************************************/
1414
package org.eclipse.pde.internal.ds.tests;
1515

16-
import static org.junit.Assert.assertEquals;
17-
import static org.junit.Assert.assertNotNull;
18-
import static org.junit.Assert.assertTrue;
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
17+
import static org.junit.jupiter.api.Assertions.assertNotNull;
18+
import static org.junit.jupiter.api.Assertions.assertTrue;
1919

2020
import org.eclipse.pde.internal.ds.core.IDSComponent;
2121
import org.eclipse.pde.internal.ds.core.IDSDocumentFactory;
2222
import org.eclipse.pde.internal.ds.core.IDSProvide;
2323
import org.eclipse.pde.internal.ds.core.IDSService;
24-
import org.junit.Test;
24+
import org.junit.jupiter.api.Test;
2525

2626
public class DSProvideTestCase extends AbstractDSModelTestCase {
2727
@Test

ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSReferenceTestCase.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
*******************************************************************************/
1414
package org.eclipse.pde.internal.ds.tests;
1515

16-
import static org.junit.Assert.assertEquals;
17-
import static org.junit.Assert.assertNotNull;
18-
import static org.junit.Assert.assertTrue;
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
17+
import static org.junit.jupiter.api.Assertions.assertNotNull;
18+
import static org.junit.jupiter.api.Assertions.assertTrue;
1919

2020
import org.eclipse.pde.internal.ds.core.IDSComponent;
2121
import org.eclipse.pde.internal.ds.core.IDSReference;
22-
import org.junit.Test;
22+
import org.junit.jupiter.api.Test;
2323

2424
public class DSReferenceTestCase extends AbstractDSModelTestCase {
2525
@Test

0 commit comments

Comments
 (0)