diff --git a/team/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF b/team/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF index 0d5d6a02de2..5ba4292466a 100644 --- a/team/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF +++ b/team/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF @@ -12,8 +12,9 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, org.eclipse.compare, org.eclipse.ui;bundle-version="3.208.0", - org.eclipse.jface.text, - org.junit + org.eclipse.jface.text +Import-Package: org.junit.jupiter.api;version="[5.14.0,6.0.0)", + org.junit.platform.suite.api;version="[1.14.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: org.eclipse.compare.examples.xml diff --git a/team/examples/org.eclipse.compare.examples.xml/tests/org/eclipse/compare/examples/xml/AllXMLCompareTests.java b/team/examples/org.eclipse.compare.examples.xml/tests/org/eclipse/compare/examples/xml/AllXMLCompareTests.java index 45f52d196b7..e23ddb51be0 100644 --- a/team/examples/org.eclipse.compare.examples.xml/tests/org/eclipse/compare/examples/xml/AllXMLCompareTests.java +++ b/team/examples/org.eclipse.compare.examples.xml/tests/org/eclipse/compare/examples/xml/AllXMLCompareTests.java @@ -13,15 +13,15 @@ *******************************************************************************/ package org.eclipse.compare.examples.xml; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * TestSuite that runs all the XML Compare tests. */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ - TestXMLStructureCreator.class +@Suite +@SelectClasses({ // + TestXMLStructureCreator.class, // }) public class AllXMLCompareTests { //test suite diff --git a/team/examples/org.eclipse.compare.examples.xml/tests/org/eclipse/compare/examples/xml/TestXMLStructureCreator.java b/team/examples/org.eclipse.compare.examples.xml/tests/org/eclipse/compare/examples/xml/TestXMLStructureCreator.java index 7bd6bb308ae..3a26c59bb52 100644 --- a/team/examples/org.eclipse.compare.examples.xml/tests/org/eclipse/compare/examples/xml/TestXMLStructureCreator.java +++ b/team/examples/org.eclipse.compare.examples.xml/tests/org/eclipse/compare/examples/xml/TestXMLStructureCreator.java @@ -13,8 +13,8 @@ *******************************************************************************/ package org.eclipse.compare.examples.xml; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -23,8 +23,8 @@ import org.eclipse.compare.IEncodedStreamContentAccessor; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.text.Document; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class TestXMLStructureCreator { @@ -49,7 +49,7 @@ public String getCharset() { } } - @Before + @BeforeEach public void setUp() { fdoc = new Document(); fsc = new XMLStructureCreator();