diff --git a/org.eclipse.wb.tests/META-INF/MANIFEST.MF b/org.eclipse.wb.tests/META-INF/MANIFEST.MF index ad3aa2505..84e13af11 100644 --- a/org.eclipse.wb.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.wb.tests/META-INF/MANIFEST.MF @@ -45,13 +45,13 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.31.100,4.0.0)", org.eclipse.wb.swing.java6;bundle-version="[1.9.1000,2.0.0)";resolution:=optional, org.eclipse.draw2d;bundle-version="[3.20.0,4.0.0)", org.eclipse.gef;bundle-version="[3.21.100,4.0.0)", - org.junit;bundle-version="[4.13.2,5.0.0)", org.mockito.mockito-core;bundle-version="[5.12.0,6.0.0)", org.objectweb.asm;bundle-version="[9.7.0,10.0.0)", org.objenesis;bundle-version="[3.4.0,4.0.0)", net.bytebuddy.byte-buddy;bundle-version="[1.14.16,2.0.0)", junit-jupiter-api;bundle-version="[5.10.2,6.0.0)", - junit-platform-suite-api;bundle-version="[1.10.2,2.0.0)" + junit-platform-suite-api;bundle-version="[1.10.2,2.0.0)", + org.opentest4j;bundle-version="[1.3.0,2.0.0)" Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.wb.tests.designer;x-internal:=true, org.eclipse.wb.tests.designer.core;x-internal:=true, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/JUnitUtils.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/JUnitUtils.java index a3d5583ff..11cae0a3b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/JUnitUtils.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/JUnitUtils.java @@ -12,13 +12,13 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.platform.suite.api.SelectClasses; import java.io.File; import java.lang.annotation.Annotation; @@ -45,11 +45,11 @@ public class JUnitUtils { private static File TEST_DIR = new File("src"); private static Set> TEST_ANNOTATIONS = Set.of( // Test.class, // - Ignore.class, // - Before.class, // - After.class, // - BeforeClass.class, // - AfterClass.class); + Disabled.class, // + BeforeEach.class, // + AfterEach.class, // + BeforeAll.class, // + AfterAll.class); public static Set> getRepeatedlyExecutedClasses() { Map, Integer> counts = new HashMap<>(); @@ -103,7 +103,7 @@ private static List> getAllExecutedClasses(Class clazz) { List> result = new ArrayList<>(); result.add(clazz); - SuiteClasses suiteClasses = clazz.getAnnotation(SuiteClasses.class); + SelectClasses suiteClasses = clazz.getAnnotation(SelectClasses.class); if (suiteClasses != null) { for (Class suiteClass : suiteClasses.value()) { result.addAll(getAllExecutedClasses(suiteClass)); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/ResourceUtils.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/ResourceUtils.java index e324c28a9..e402eba31 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/ResourceUtils.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/ResourceUtils.java @@ -21,7 +21,7 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.jdt.core.JavaModelException; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/TestUtils.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/TestUtils.java index 1d8a11b88..8f16c615a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/TestUtils.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/TestUtils.java @@ -15,7 +15,6 @@ import org.eclipse.wb.internal.core.DesignerPlugin; import org.eclipse.wb.internal.core.utils.IOUtils2; import org.eclipse.wb.internal.core.utils.external.ExternalFactoriesHelper; -import org.eclipse.wb.internal.core.utils.reflect.ReflectionUtils; import org.eclipse.wb.tests.designer.core.TestProject; import org.eclipse.wb.tests.designer.tests.Activator; @@ -42,27 +41,13 @@ import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWizard; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.apache.commons.lang3.StringUtils; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.Opcodes; import org.osgi.framework.Bundle; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileOutputStream; -import java.io.InputStream; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.Vector; import java.util.jar.JarOutputStream; import java.util.zip.ZipEntry; @@ -377,75 +362,4 @@ public static String createTemporaryJar(String entryName, String content) throws // return path to "jar" return tempFile.getAbsolutePath(); } - - //////////////////////////////////////////////////////////////////////////// - // - // TestSuite - // - //////////////////////////////////////////////////////////////////////////// - /** - * Sorts test methods in the given {@link TestSuite} to same order as they are declared in source - * of test class. - */ - public static void sortTestSuiteMethods(Class clazz, TestSuite suite) { - try { - final List sourceMethodNames = getSourceMethodNames(clazz); - Vector tests = getTestsVector(suite); - Collections.sort(tests, new Comparator() { - @Override - public int compare(TestCase o1, TestCase o2) { - String method_1 = o1.getName(); - String method_2 = o2.getName(); - if ("test_setUp".equals(method_1)) { - return -1; - } - if ("test_setUp".equals(method_2)) { - return 1; - } - if ("test_tearDown".equals(method_1)) { - return 1; - } - if ("test_tearDown".equals(method_2)) { - return -1; - } - return sourceMethodNames.indexOf(method_1) - sourceMethodNames.indexOf(method_2); - } - }); - } catch (Throwable e) { - ReflectionUtils.propagate(e); - } - } - - /** - * @return the names of methods declared in the given {@link Class}, in same order as in source. - */ - private static List getSourceMethodNames(Class testClass) throws Exception { - final List sourceMethodNames = new ArrayList<>(); - String classPath = testClass.getName().replace('.', '/') + ".class"; - InputStream classStream = testClass.getClassLoader().getResourceAsStream(classPath); - ClassReader classReader = new ClassReader(classStream); - classReader.accept(new ClassVisitor(Opcodes.ASM9) { - @Override - public MethodVisitor visitMethod(int access, - String name, - String desc, - String signature, - String[] exceptions) { - sourceMethodNames.add(name); - return new MethodVisitor(Opcodes.ASM9) {}; - } - }, 0); - return sourceMethodNames; - } - - /** - * @return the live {@link Vector} of tests in the given {@link TestSuite}. - */ - private static Vector getTestsVector(TestSuite suite) throws Exception { - Field testsField = TestSuite.class.getDeclaredField("fTests"); - testsField.setAccessible(true); - @SuppressWarnings("unchecked") - Vector tests = (Vector) testsField.get(suite); - return tests; - } } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/WaitForMemoryProfilerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/WaitForMemoryProfilerTest.java index 58b744770..e8bf1d698 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/WaitForMemoryProfilerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/WaitForMemoryProfilerTest.java @@ -16,17 +16,16 @@ import org.eclipse.wb.internal.core.utils.state.GlobalState; import org.eclipse.wb.tests.designer.tests.DesignerTestCase; -import junit.framework.TestCase; - -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** - * Fake {@link TestCase} that just wait long time, so that we have time to get memory snapshot. + * Fake test case that just wait long time, so that we have time to get memory + * snapshot. * * @author scheglov_ke */ -@Ignore +@Disabled public class WaitForMemoryProfilerTest extends DesignerTestCase { @Test public void test_waitForProfiler() throws InterruptedException { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/WindowBuilderTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/WindowBuilderTests.java index 9cee61c74..dc261cd13 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/WindowBuilderTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/WindowBuilderTests.java @@ -22,9 +22,8 @@ import org.eclipse.wb.tests.gef.GefTests; import org.eclipse.wb.tests.utils.CommonTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * All WindowBuilder tests. @@ -32,8 +31,8 @@ * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ Draw2dTests.class, // GefTests.class, // SwtTests.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/AbstractJavaProjectTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/AbstractJavaProjectTest.java index 4536bc8cf..9661da698 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/AbstractJavaProjectTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/AbstractJavaProjectTest.java @@ -14,6 +14,7 @@ import org.eclipse.wb.internal.core.utils.IOUtils2; import org.eclipse.wb.internal.core.utils.reflect.ReflectionUtils; +import org.eclipse.wb.tests.designer.core.AbstractJavaProjectTest.AnnotationExtension; import org.eclipse.wb.tests.designer.core.annotations.DisposeProjectAfter; import org.eclipse.wb.tests.designer.core.annotations.DisposeProjectBefore; import org.eclipse.wb.tests.designer.core.annotations.WaitForAutoBuildAfter; @@ -38,17 +39,17 @@ import org.eclipse.swt.graphics.ImageData; import org.eclipse.swt.graphics.ImageLoader; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Rule; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.MultipleFailureException; -import org.junit.runners.model.Statement; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.extension.AfterTestExecutionCallback; +import org.junit.jupiter.api.extension.BeforeTestExecutionCallback; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.extension.ExtensionContext; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.InputStream; +import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; @@ -57,6 +58,7 @@ * * @author scheglov_ke */ +@ExtendWith(AnnotationExtension.class) public abstract class AbstractJavaProjectTest extends DesignerTestCase { private static final List m_createdResources = new ArrayList<>(); @@ -66,7 +68,7 @@ public abstract class AbstractJavaProjectTest extends DesignerTestCase { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { // remove resources (with retries) { @@ -97,7 +99,7 @@ public void tearDown() throws Exception { super.tearDown(); } - @AfterClass + @AfterAll public static void tearDownClass() throws Exception { do_projectDispose(); } @@ -108,39 +110,30 @@ public static void tearDownClass() throws Exception { // //////////////////////////////////////////////////////////////////////////// - @Rule - public TestRule methodRule = new TestRule() { + public static class AnnotationExtension implements BeforeTestExecutionCallback, AfterTestExecutionCallback { @Override - public Statement apply(Statement base, Description description) { - return new Statement() { - @Override - public void evaluate() throws Throwable { - List errors = new ArrayList<>(); - if (description.getAnnotation(DisposeProjectBefore.class) != null) { - waitEventLoop(10); - do_projectDispose(); - waitEventLoop(10); - } - try { - base.evaluate(); - } catch (Throwable t) { - errors.add(t); - } finally { - if (description.getAnnotation(DisposeProjectAfter.class) != null) { - waitEventLoop(10); - do_projectDispose(); - waitEventLoop(10); - } - if (description.getAnnotation(WaitForAutoBuildAfter.class) != null) { - waitForAutoBuild(); - } + public void beforeTestExecution(ExtensionContext context) throws Exception { + Method method = context.getRequiredTestMethod(); + if (method.getAnnotation(DisposeProjectBefore.class) != null) { + waitEventLoop(10); + do_projectDispose(); + waitEventLoop(10); + } + } - } - MultipleFailureException.assertEmpty(errors); - } - }; + @Override + public void afterTestExecution(ExtensionContext context) throws Exception { + Method method = context.getRequiredTestMethod(); + if (method.getAnnotation(DisposeProjectAfter.class) != null) { + waitEventLoop(10); + do_projectDispose(); + waitEventLoop(10); + } + if (method.getAnnotation(WaitForAutoBuildAfter.class) != null) { + waitForAutoBuild(); + } } - }; + } //////////////////////////////////////////////////////////////////////////// // diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/AbstractJavaTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/AbstractJavaTest.java index 052cca7cc..562291078 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/AbstractJavaTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/AbstractJavaTest.java @@ -55,7 +55,7 @@ import org.eclipse.jdt.core.dom.VariableDeclarationStatement; import org.apache.commons.lang3.StringUtils; -import org.junit.After; +import org.junit.jupiter.api.AfterEach; import java.util.List; @@ -69,7 +69,7 @@ public abstract class AbstractJavaTest extends AbstractJavaProjectTest { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { // don't ignore model compilation problems m_ignoreModelCompileProblems = false; @@ -252,11 +252,11 @@ protected static void assertRelatedNodes(JavaInfo javaInfo, String[] sourceTight throws Exception { List nodes = javaInfo.getRelatedNodes(); assertEquals( + sourceTightlyNodes.length, + nodes.size(), StringUtils.join(sourceTightlyNodes, ", ") + " != " - + StringUtils.join(nodes.iterator(), ", "), - sourceTightlyNodes.length, - nodes.size()); + + StringUtils.join(nodes.iterator(), ", ")); for (int i = 0; i < nodes.size(); i++) { ASTNode node = nodes.get(i); // prepare node to compare source diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/BundleResourceProviderTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/BundleResourceProviderTest.java index 9b8c59de4..02fc4255c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/BundleResourceProviderTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/BundleResourceProviderTest.java @@ -23,7 +23,7 @@ import org.eclipse.swt.graphics.Image; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.osgi.framework.Bundle; import java.io.InputStream; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/CoreTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/CoreTests.java index b82f68e46..231b4612a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/CoreTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/CoreTests.java @@ -19,16 +19,15 @@ import org.eclipse.wb.tests.designer.core.palette.PaletteTests; import org.eclipse.wb.tests.designer.core.util.UtilTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ BundleResourceProviderTest.class, DesignerPluginTest.class, EnvironmentUtilsTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/DesignerPluginTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/DesignerPluginTest.java index f99faeea7..f14b4eadd 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/DesignerPluginTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/DesignerPluginTest.java @@ -19,8 +19,8 @@ import org.eclipse.core.runtime.ILogListener; import org.eclipse.core.runtime.IStatus; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.swing.JFrame; import javax.swing.WindowConstants; @@ -37,7 +37,7 @@ public class DesignerPluginTest extends DesignerTestCase { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/EnvironmentUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/EnvironmentUtilsTest.java index 2e359fd4a..2b227089a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/EnvironmentUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/EnvironmentUtilsTest.java @@ -15,7 +15,7 @@ import org.eclipse.wb.internal.core.EnvironmentUtils; import org.eclipse.wb.tests.designer.tests.DesignerTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link EnvironmentUtils}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/databinding/CoreDbTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/databinding/CoreDbTests.java index 70422a39c..2e45fbdcf 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/databinding/CoreDbTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/databinding/CoreDbTests.java @@ -12,14 +12,13 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.core.databinding; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @author lobas_av */ -@RunWith(Suite.class) -@SuiteClasses({ ObjectsTreeContentProviderTest.class }) +@Suite +@SelectClasses({ ObjectsTreeContentProviderTest.class }) public class CoreDbTests { } \ No newline at end of file diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/databinding/ObjectsTreeContentProviderTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/databinding/ObjectsTreeContentProviderTest.java index 4f716116c..079c3c84e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/databinding/ObjectsTreeContentProviderTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/databinding/ObjectsTreeContentProviderTest.java @@ -20,7 +20,7 @@ import org.apache.commons.lang3.ArrayUtils; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/AbstractEngineTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/AbstractEngineTest.java index 5b99386bc..b0676fda0 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/AbstractEngineTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/AbstractEngineTest.java @@ -80,9 +80,9 @@ public void evaluationSuccessful(Expression expression, Object value) throws Exc } }; Object evaluationResult = AstEvaluationEngine.evaluate(context, expressionToEvaluate); - assertTrue(MessageFormat.format( + assertTrue(expressionEvaluated[0], MessageFormat.format( "Expression ''{0}'' was not notified in evaluationSuccessful()", - expressionToEvaluate), expressionEvaluated[0]); + expressionToEvaluate)); return evaluationResult; } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/AstEvaluationEngineTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/AstEvaluationEngineTests.java index 22690b8b0..36c51c2a3 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/AstEvaluationEngineTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/AstEvaluationEngineTests.java @@ -25,9 +25,8 @@ import org.eclipse.wb.tests.designer.core.eval.primities.IntegerTest; import org.eclipse.wb.tests.designer.core.eval.primities.LongTest; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for {@link AstEvaluationEngine}. @@ -35,8 +34,8 @@ * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ EngineTest.class, BooleanTest.class, CharTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/EngineTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/EngineTest.java index 57c9cb4e2..e4522a3bb 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/EngineTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/EngineTest.java @@ -29,8 +29,8 @@ import org.eclipse.jdt.core.dom.Statement; import org.eclipse.jdt.core.dom.TypeDeclaration; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.List; @@ -48,7 +48,7 @@ public class EngineTest extends AbstractEngineTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject == null) { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/ExecutionFlowUtils2Test.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/ExecutionFlowUtils2Test.java index 19d8f7d52..47370a1ef 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/ExecutionFlowUtils2Test.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/ExecutionFlowUtils2Test.java @@ -25,8 +25,8 @@ import org.eclipse.jdt.core.dom.SimpleName; import org.eclipse.jdt.core.dom.TypeDeclaration; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link ExecutionFlowUtils2}. @@ -40,7 +40,7 @@ public class ExecutionFlowUtils2Test extends AbstractEngineTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject == null) { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/ExecutionFlowUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/ExecutionFlowUtilsTest.java index f70f7cb6d..1f066316c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/ExecutionFlowUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/ExecutionFlowUtilsTest.java @@ -56,8 +56,8 @@ import org.apache.commons.lang3.StringUtils; import org.assertj.core.api.Assertions; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -76,7 +76,7 @@ public class ExecutionFlowUtilsTest extends AbstractEngineTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject == null) { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/MethodInvocationTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/MethodInvocationTest.java index 906b97b74..a37a02963 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/MethodInvocationTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/MethodInvocationTest.java @@ -39,8 +39,8 @@ import org.eclipse.jdt.core.dom.TypeDeclaration; import org.assertj.core.api.Assertions; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.lang.reflect.Constructor; import java.lang.reflect.Method; @@ -57,7 +57,7 @@ public class MethodInvocationTest extends AbstractEngineTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject == null) { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/other/ArrayTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/other/ArrayTest.java index d8055ccac..033565b95 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/other/ArrayTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/other/ArrayTest.java @@ -15,8 +15,8 @@ import org.eclipse.wb.tests.designer.core.eval.AbstractEngineTest; import org.apache.commons.lang3.ArrayUtils; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author scheglov_ke @@ -28,7 +28,7 @@ public class ArrayTest extends AbstractEngineTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject == null) { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/other/CastTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/other/CastTest.java index 75aebf24d..24bb862e1 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/other/CastTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/other/CastTest.java @@ -14,8 +14,8 @@ import org.eclipse.wb.tests.designer.core.eval.AbstractEngineTest; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; /** * @author scheglov_ke @@ -26,7 +26,7 @@ public class CastTest extends AbstractEngineTest { // Project creation // //////////////////////////////////////////////////////////////////////////// - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { do_projectCreate(); } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/other/ClassTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/other/ClassTest.java index 4cca00937..43c7e6bee 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/other/ClassTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/other/ClassTest.java @@ -15,8 +15,8 @@ import org.eclipse.wb.internal.core.eval.evaluators.ClassEvaluator; import org.eclipse.wb.tests.designer.core.eval.AbstractEngineTest; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.ArrayList; @@ -31,7 +31,7 @@ public class ClassTest extends AbstractEngineTest { // Project creation // //////////////////////////////////////////////////////////////////////////// - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { do_projectCreate(); } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/other/FieldTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/other/FieldTest.java index 9df0775c0..5bce88bb3 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/other/FieldTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/other/FieldTest.java @@ -17,8 +17,8 @@ import org.eclipse.jdt.core.dom.TypeDeclaration; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Test for {@link FieldAccessEvaluator}. @@ -32,7 +32,7 @@ public class FieldTest extends AbstractEngineTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject == null) { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/other/StringTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/other/StringTest.java index 0dfeb9a1a..123c61573 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/other/StringTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/other/StringTest.java @@ -14,8 +14,8 @@ import org.eclipse.wb.tests.designer.core.eval.AbstractEngineTest; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; /** * @author scheglov_ke @@ -26,7 +26,7 @@ public class StringTest extends AbstractEngineTest { // Project creation // //////////////////////////////////////////////////////////////////////////// - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { do_projectCreate(); } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/primities/BooleanTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/primities/BooleanTest.java index d0f51445e..5e4954ae4 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/primities/BooleanTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/primities/BooleanTest.java @@ -15,8 +15,8 @@ import org.eclipse.wb.internal.core.eval.evaluators.BooleanEvaluator; import org.eclipse.wb.tests.designer.core.eval.AbstractEngineTest; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; /** * Test for {@link BooleanEvaluator}. @@ -29,7 +29,7 @@ public class BooleanTest extends AbstractEngineTest { // Project creation // //////////////////////////////////////////////////////////////////////////// - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { do_projectCreate(); } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/primities/CharTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/primities/CharTest.java index 7616cc919..f0463b843 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/primities/CharTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/primities/CharTest.java @@ -14,8 +14,8 @@ import org.eclipse.wb.tests.designer.core.eval.AbstractEngineTest; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; /** * @author scheglov_ke @@ -26,7 +26,7 @@ public class CharTest extends AbstractEngineTest { // Project creation // //////////////////////////////////////////////////////////////////////////// - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { do_projectCreate(); } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/primities/DoubleTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/primities/DoubleTest.java index a4a4d1df3..0b26656e9 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/primities/DoubleTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/primities/DoubleTest.java @@ -14,8 +14,8 @@ import org.eclipse.wb.tests.designer.core.eval.AbstractEngineTest; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; /** * @author scheglov_ke @@ -26,7 +26,7 @@ public class DoubleTest extends AbstractEngineTest { // Project creation // //////////////////////////////////////////////////////////////////////////// - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { do_projectCreate(); } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/primities/FloatTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/primities/FloatTest.java index b9b3cc919..5abfe6089 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/primities/FloatTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/primities/FloatTest.java @@ -14,8 +14,8 @@ import org.eclipse.wb.tests.designer.core.eval.AbstractEngineTest; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; /** * @author scheglov_ke @@ -26,7 +26,7 @@ public class FloatTest extends AbstractEngineTest { // Project creation // //////////////////////////////////////////////////////////////////////////// - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { do_projectCreate(); } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/primities/IntegerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/primities/IntegerTest.java index 807bb1595..0d3747d57 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/primities/IntegerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/primities/IntegerTest.java @@ -16,8 +16,8 @@ import org.eclipse.jdt.core.dom.TypeDeclaration; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; /** * @author scheglov_ke @@ -28,7 +28,7 @@ public class IntegerTest extends AbstractEngineTest { // Project creation // //////////////////////////////////////////////////////////////////////////// - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { do_projectCreate(); } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/primities/LongTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/primities/LongTest.java index 83109889a..efcc61555 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/primities/LongTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/eval/primities/LongTest.java @@ -14,8 +14,8 @@ import org.eclipse.wb.tests.designer.core.eval.AbstractEngineTest; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; /** * @author scheglov_ke @@ -26,7 +26,7 @@ public class LongTest extends AbstractEngineTest { // Project creation // //////////////////////////////////////////////////////////////////////////// - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { do_projectCreate(); } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/AbstractComponentTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/AbstractComponentTest.java index 95d1a7932..4b5843e67 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/AbstractComponentTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/AbstractComponentTest.java @@ -20,7 +20,7 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.swt.graphics.Image; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link AbstractComponentInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/ArrayObjectTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/ArrayObjectTest.java index b7877904c..04bade756 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/ArrayObjectTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/ArrayObjectTest.java @@ -31,8 +31,8 @@ import org.eclipse.jdt.core.dom.MethodInvocation; import org.assertj.core.api.Assertions; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import java.lang.reflect.Field; import java.util.List; @@ -56,7 +56,7 @@ public class ArrayObjectTest extends SwingModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { // clear fields for (Field field : getClass().getDeclaredFields()) { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/ClassLoadingTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/ClassLoadingTest.java index e49e9d46c..fafad4ed4 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/ClassLoadingTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/ClassLoadingTest.java @@ -20,7 +20,7 @@ import org.eclipse.core.runtime.IConfigurationElement; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.osgi.framework.Bundle; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/DefaultJavaInfoPresentationTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/DefaultJavaInfoPresentationTest.java index bce46571b..039d7a12c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/DefaultJavaInfoPresentationTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/DefaultJavaInfoPresentationTest.java @@ -22,7 +22,7 @@ import org.eclipse.core.resources.IFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link DefaultJavaInfoPresentation}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/DefaultObjectPresentationTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/DefaultObjectPresentationTest.java index d9fe540c9..de5e2fa4b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/DefaultObjectPresentationTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/DefaultObjectPresentationTest.java @@ -22,7 +22,7 @@ import org.eclipse.wb.tests.designer.tests.DesignerTestCase; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/EllipsisObjectInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/EllipsisObjectInfoTest.java index 904bdbbf2..1fe723d7b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/EllipsisObjectInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/EllipsisObjectInfoTest.java @@ -30,8 +30,8 @@ import org.eclipse.jdt.core.dom.MethodInvocation; import org.assertj.core.api.Assertions; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import java.lang.reflect.Field; import java.util.List; @@ -55,7 +55,7 @@ public class EllipsisObjectInfoTest extends SwingModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { // clear fields for (Field field : getClass().getDeclaredFields()) { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/JavaInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/JavaInfoTest.java index 1412b59d0..6572c039e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/JavaInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/JavaInfoTest.java @@ -57,7 +57,7 @@ import org.eclipse.jdt.core.dom.VariableDeclarationStatement; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.Component; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/LibraryInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/LibraryInfoTest.java index 3c5abd597..3ca573972 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/LibraryInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/LibraryInfoTest.java @@ -24,8 +24,8 @@ import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.Platform; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.osgi.framework.Bundle; import java.io.File; @@ -38,7 +38,7 @@ public class LibraryInfoTest extends AbstractJavaProjectTest { private LibraryInfo libraryInfo; private IFile libraryFile; - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); @@ -77,7 +77,7 @@ public void test_updateBundle() throws Exception { private IFile getBundleFile(String symbolicName) { Bundle bundle = Platform.getBundle(symbolicName); - assertNotNull("Bundle not found: " + symbolicName, bundle); + assertNotNull(bundle, "Bundle not found: " + symbolicName); File bundleFile = FileLocator.getBundleFileLocation(bundle).orElse(null); assertNotNull("Bundle file not found: " + symbolicName); @@ -94,7 +94,7 @@ private static IConfigurationElement findBundleLibrary(String symbolicName) { .filter(element -> symbolicName.equals(element.getAttribute("symbolicName"))) // .findFirst() // .orElse(null); - assertNotNull("bundle-library extension point not found: " + SYMBOLIC_NAME, libraryElement); + assertNotNull(libraryElement, "bundle-library extension point not found: " + SYMBOLIC_NAME); return libraryElement; } } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/ModelTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/ModelTests.java index 0eb2e4664..20bd626f9 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/ModelTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/ModelTests.java @@ -24,15 +24,14 @@ import org.eclipse.wb.tests.designer.core.model.util.UtilTests; import org.eclipse.wb.tests.designer.core.model.variables.VariablesTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ ObjectInfoTest.class, DefaultObjectPresentationTest.class, ObjectReferenceInfoTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/ObjectInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/ObjectInfoTest.java index 7f628e585..afbe11f76 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/ObjectInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/ObjectInfoTest.java @@ -30,7 +30,7 @@ import org.apache.commons.lang3.ArrayUtils; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import java.util.ArrayList; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/ObjectReferenceInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/ObjectReferenceInfoTest.java index 9ff20fa10..c87af5fa2 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/ObjectReferenceInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/ObjectReferenceInfoTest.java @@ -16,7 +16,7 @@ import org.eclipse.wb.internal.core.model.ObjectReferenceInfo; import org.eclipse.wb.tests.designer.tests.DesignerTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link ObjectReferenceInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/WrapperInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/WrapperInfoTest.java index d9d71f302..7401be8e7 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/WrapperInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/WrapperInfoTest.java @@ -37,7 +37,7 @@ import org.eclipse.jdt.core.dom.MethodInvocation; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link WrapperMethodInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/AssociationObjectFactoriesTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/AssociationObjectFactoriesTest.java index 305df1a6e..adb5e538b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/AssociationObjectFactoriesTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/AssociationObjectFactoriesTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.core.model.association.InvocationChildAssociation; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link AssociationObjectFactories}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/AssociationObjectsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/AssociationObjectsTest.java index 72b3c4c69..24d6ca3ec 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/AssociationObjectsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/AssociationObjectsTest.java @@ -21,7 +21,7 @@ import org.eclipse.wb.internal.core.model.nonvisual.NonVisualAssociation; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link AssociationObjects}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/AssociationTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/AssociationTests.java index 0f0be9703..5ddffc38f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/AssociationTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/AssociationTests.java @@ -14,17 +14,16 @@ import org.eclipse.wb.core.model.association.Association; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for {@link Association}'s. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ // constructor ConstructorParentAssociationTest.class, ConstructorChildAssociationTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/CompoundAssociationTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/CompoundAssociationTest.java index ad93e562f..95b9f1e8e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/CompoundAssociationTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/CompoundAssociationTest.java @@ -32,7 +32,7 @@ import static org.mockito.Mockito.when; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/ConstructorChildAssociationTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/ConstructorChildAssociationTest.java index a866dc8fb..0ca45f9ee 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/ConstructorChildAssociationTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/ConstructorChildAssociationTest.java @@ -21,8 +21,8 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.List; @@ -200,7 +200,7 @@ public void test_delete_noDelete() throws Exception { /** * Can not delete because only one constructor in parent, so it can not be created without child. */ - @Ignore + @Disabled @Test public void test_delete_noDelete_withGenerics() throws Exception { setFileContentSrc( diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/ConstructorParentAssociationTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/ConstructorParentAssociationTest.java index 0a0915f04..0c8258cfd 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/ConstructorParentAssociationTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/ConstructorParentAssociationTest.java @@ -22,7 +22,7 @@ import org.eclipse.wb.internal.swing.model.layout.FlowLayoutInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link ConstructorParentAssociation}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/EmptyAssociationTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/EmptyAssociationTest.java index 015d71527..1e3ca40c2 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/EmptyAssociationTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/EmptyAssociationTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.tests.designer.swing.SwingModelTest; import org.apache.commons.lang3.NotImplementedException; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link EmptyAssociation}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/FactoryParentAssociationTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/FactoryParentAssociationTest.java index 766033acb..5f16316dc 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/FactoryParentAssociationTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/FactoryParentAssociationTest.java @@ -27,7 +27,7 @@ import org.eclipse.wb.internal.swing.model.layout.FlowLayoutInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link FactoryParentAssociation}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/ImplicitFactoryArgumentAssociationTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/ImplicitFactoryArgumentAssociationTest.java index d1ed1bcae..a0f579b8b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/ImplicitFactoryArgumentAssociationTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/ImplicitFactoryArgumentAssociationTest.java @@ -19,7 +19,7 @@ import org.eclipse.wb.internal.swing.model.layout.FlowLayoutInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link ImplicitFactoryArgumentAssociation}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/ImplicitObjectAssociationTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/ImplicitObjectAssociationTest.java index 4acc2df8a..001664093 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/ImplicitObjectAssociationTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/ImplicitObjectAssociationTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.tests.designer.swing.SwingModelTest; import org.apache.commons.lang3.NotImplementedException; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link ImplicitObjectAssociation}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/InvocationChildAssociationTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/InvocationChildAssociationTest.java index 1d97901a5..b82aee33e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/InvocationChildAssociationTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/InvocationChildAssociationTest.java @@ -32,7 +32,7 @@ import org.eclipse.jdt.core.dom.Statement; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link InvocationChildAssociation}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/InvocationSecondaryAssociationTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/InvocationSecondaryAssociationTest.java index 72ceaf3a4..5becc98c2 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/InvocationSecondaryAssociationTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/InvocationSecondaryAssociationTest.java @@ -19,7 +19,7 @@ import org.eclipse.wb.tests.designer.swing.SwingModelTest; import org.apache.commons.lang3.NotImplementedException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.BorderLayout; import java.awt.Component; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/InvocationVoidAssociationTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/InvocationVoidAssociationTest.java index cb5ebfcec..d765997f9 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/InvocationVoidAssociationTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/InvocationVoidAssociationTest.java @@ -21,7 +21,7 @@ import org.eclipse.wb.internal.swing.model.component.JToolBarSeparatorInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.JToolBar; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/RootAssociationTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/RootAssociationTest.java index a3c303467..28acec003 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/RootAssociationTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/RootAssociationTest.java @@ -16,7 +16,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link RootAssociation}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/SuperConstructorArgumentAssociationTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/SuperConstructorArgumentAssociationTest.java index 12f04b73e..6e1c4d506 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/SuperConstructorArgumentAssociationTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/SuperConstructorArgumentAssociationTest.java @@ -19,7 +19,7 @@ import org.eclipse.jdt.core.dom.SuperConstructorInvocation; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link SuperConstructorArgumentAssociation}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/UnknownAssociationTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/UnknownAssociationTest.java index f870c5c8e..60a2a353e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/UnknownAssociationTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/UnknownAssociationTest.java @@ -15,7 +15,7 @@ import org.eclipse.wb.core.model.association.UnknownAssociation; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link UnknownAssociation}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/ConstructorCreationSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/ConstructorCreationSupportTest.java index f408a42da..b719f0dfa 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/ConstructorCreationSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/ConstructorCreationSupportTest.java @@ -46,7 +46,7 @@ import org.eclipse.jface.preference.FieldEditor; import org.apache.commons.lang3.ArrayUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.JButton; import javax.swing.JPanel; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/CreationsTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/CreationsTests.java index fcc77d6a0..1c7651a02 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/CreationsTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/CreationsTests.java @@ -14,17 +14,16 @@ import org.eclipse.wb.internal.core.model.description.helpers.FactoryDescriptionHelper; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for {@link FactoryDescriptionHelper} and static/instance factories. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ // creations ThisCreationSupportTest.class, ConstructorCreationSupportTest.class, ExposedPropertyCreationSupportTest.class, ExposedFieldCreationSupportTest.class, SuperInvocationCreationSupportTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/ExposedFieldCreationSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/ExposedFieldCreationSupportTest.java index a9485cf1c..cd99088ef 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/ExposedFieldCreationSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/ExposedFieldCreationSupportTest.java @@ -26,7 +26,7 @@ import org.eclipse.jdt.core.dom.QualifiedName; import org.eclipse.jdt.core.dom.SimpleName; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.JFrame; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/ExposedPropertyCreationSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/ExposedPropertyCreationSupportTest.java index 1e550ea90..4c619bc5f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/ExposedPropertyCreationSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/ExposedPropertyCreationSupportTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.JButton; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/FactoriesTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/FactoriesTests.java index 384b1999b..eee57a496 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/FactoriesTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/FactoriesTests.java @@ -14,17 +14,16 @@ import org.eclipse.wb.internal.core.model.description.helpers.FactoryDescriptionHelper; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for {@link FactoryDescriptionHelper} and static/instance factories. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ FactoryDescriptionHelperTest.class, StaticFactoryCreationSupportTest.class, InstanceFactoryCreationSupportTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/FactoryDescriptionHelperTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/FactoryDescriptionHelperTest.java index 71711d4b4..a4337d4ce 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/FactoryDescriptionHelperTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/FactoryDescriptionHelperTest.java @@ -36,8 +36,8 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.assertj.core.api.Assertions; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Map; @@ -808,7 +808,7 @@ public void test_descriptions_cached() throws Exception { /** * We don't support member classes as factories. */ - @Ignore + @Disabled @Test public void test_descriptions_memberClass() throws Exception { setFileContentSrc( @@ -970,7 +970,7 @@ public void test_descriptions_bindByName_invalid() throws Exception { * Kosta.20080407: I consider this not correct anymore, so disable this test. */ @Test - @Ignore + @Disabled public void test_descriptionsInstanceStatic() throws Exception { setFileContentSrc( "test/InstanceFactory.java", diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/FactoryTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/FactoryTest.java index 489fa2a7e..55123ed1e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/FactoryTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/FactoryTest.java @@ -17,7 +17,7 @@ import org.eclipse.wb.internal.core.utils.exception.ICoreExceptionConstants; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for any factory. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/ICreationSupportPermissionsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/ICreationSupportPermissionsTest.java index a6a3fb46e..af9fed669 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/ICreationSupportPermissionsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/ICreationSupportPermissionsTest.java @@ -17,7 +17,7 @@ import org.eclipse.wb.tests.designer.swing.SwingModelTest; import org.apache.commons.lang3.NotImplementedException; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link ICreationSupportPermissions}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/ImplicitFactoryCreationSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/ImplicitFactoryCreationSupportTest.java index 7ce311a4e..9d7855ccb 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/ImplicitFactoryCreationSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/ImplicitFactoryCreationSupportTest.java @@ -28,7 +28,7 @@ import org.eclipse.wb.tests.designer.swing.SwingModelTest; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.Component; import java.io.ByteArrayOutputStream; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/InstanceFactoryCreationSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/InstanceFactoryCreationSupportTest.java index 99504c66b..117347021 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/InstanceFactoryCreationSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/InstanceFactoryCreationSupportTest.java @@ -48,7 +48,7 @@ import org.eclipse.jdt.core.dom.MethodInvocation; import org.eclipse.jface.resource.ImageDescriptor; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/InvocationChainCreationSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/InvocationChainCreationSupportTest.java index 019a33896..a1319aee6 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/InvocationChainCreationSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/InvocationChainCreationSupportTest.java @@ -17,7 +17,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link InvocationChainCreationSupport}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/OpaqueCreationSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/OpaqueCreationSupportTest.java index 9c9af6706..778224812 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/OpaqueCreationSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/OpaqueCreationSupportTest.java @@ -30,7 +30,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.JButton; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/StaticFactoryCreationSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/StaticFactoryCreationSupportTest.java index 5d44cbc0b..a7a6ed492 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/StaticFactoryCreationSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/StaticFactoryCreationSupportTest.java @@ -46,7 +46,7 @@ import org.eclipse.jdt.core.IMethod; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/SuperInvocationCreationSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/SuperInvocationCreationSupportTest.java index c0632b931..ca8489ee5 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/SuperInvocationCreationSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/SuperInvocationCreationSupportTest.java @@ -16,7 +16,7 @@ import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link SuperInvocationCreationSupport}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/ThisCreationSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/ThisCreationSupportTest.java index f862774ae..e24099501 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/ThisCreationSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/creation/ThisCreationSupportTest.java @@ -36,7 +36,7 @@ import org.eclipse.jdt.core.dom.TypeDeclaration; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/BeanPropertyTagsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/BeanPropertyTagsTest.java index f66accb0a..6b58e6231 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/BeanPropertyTagsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/BeanPropertyTagsTest.java @@ -22,7 +22,7 @@ import org.eclipse.wb.internal.core.model.property.category.PropertyCategory; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link StandardBeanPropertyTagRule}, {@link StandardBeanPropertiesFlaggedRule}, its diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/ComponentDescriptionHelperTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/ComponentDescriptionHelperTest.java index 65de38a93..569cb4694 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/ComponentDescriptionHelperTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/ComponentDescriptionHelperTest.java @@ -48,7 +48,7 @@ import static org.assertj.core.data.MapEntry.entry; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.osgi.framework.Bundle; import org.xml.sax.SAXParseException; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/ComponentDescriptionIbmTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/ComponentDescriptionIbmTest.java index 4412c7a9e..911577c6c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/ComponentDescriptionIbmTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/ComponentDescriptionIbmTest.java @@ -21,9 +21,9 @@ import org.eclipse.wb.tests.designer.core.AbstractJavaProjectTest; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link ComponentDescriptionHelper}, {@link ComponentDescription}, etc. @@ -37,7 +37,7 @@ public class ComponentDescriptionIbmTest extends SwingModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // enable IBM emulation @@ -94,7 +94,7 @@ public void test_descriptin_nonIBM() throws Exception { assertNotNull(panel.getPropertyByTitle("testProperty")); } - @AfterClass + @AfterAll public static void tearDownClass() throws Exception { AbstractJavaProjectTest.tearDownClass(); // reset Environment diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/ComponentDescriptionKeyTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/ComponentDescriptionKeyTest.java index cefe0794c..e2fcb8f73 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/ComponentDescriptionKeyTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/ComponentDescriptionKeyTest.java @@ -15,7 +15,7 @@ import org.eclipse.wb.internal.core.model.description.ComponentDescriptionKey; import org.eclipse.wb.tests.designer.tests.DesignerTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.Component; import java.awt.Container; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/ComponentDescriptionTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/ComponentDescriptionTest.java index 66ce52fbb..105bce69f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/ComponentDescriptionTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/ComponentDescriptionTest.java @@ -27,7 +27,7 @@ import org.eclipse.jdt.core.dom.IMethodBinding; import org.eclipse.jdt.core.dom.SuperConstructorInvocation; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link ComponentDescriptionHelper}, {@link ComponentDescription}, etc. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/CreationDescriptionLoadingTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/CreationDescriptionLoadingTest.java index 123cb58e2..edfffb6c5 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/CreationDescriptionLoadingTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/CreationDescriptionLoadingTest.java @@ -26,8 +26,8 @@ import static org.assertj.core.data.MapEntry.entry; import org.assertj.core.api.Assertions; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import java.util.Map; @@ -45,7 +45,7 @@ public class CreationDescriptionLoadingTest extends SwingModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { m_myButtonClass = null; super.tearDown(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/CreationDescriptionTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/CreationDescriptionTest.java index b704a98dd..ceda4d473 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/CreationDescriptionTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/CreationDescriptionTest.java @@ -30,7 +30,7 @@ import static org.mockito.Mockito.when; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/DescriptionProcessorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/DescriptionProcessorTest.java index f87b54360..560398373 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/DescriptionProcessorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/DescriptionProcessorTest.java @@ -19,7 +19,7 @@ import org.eclipse.wb.tests.designer.TestUtils; import org.eclipse.wb.tests.designer.tests.DesignerTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for loading of {@link IDescriptionProcessor}'s. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/DescriptionTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/DescriptionTests.java index 4c19d7ae7..bf412e158 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/DescriptionTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/DescriptionTests.java @@ -15,17 +15,16 @@ import org.eclipse.wb.internal.core.model.description.ComponentDescription; import org.eclipse.wb.internal.core.model.description.helpers.ComponentDescriptionHelper; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for {@link ComponentDescription}, {@link ComponentDescriptionHelper}, etc. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ ToolkitDescriptionTest.class, LayoutDescriptionTest.class, DescriptionProcessorTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/DescriptionVersionsProvidersTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/DescriptionVersionsProvidersTest.java index 2f50a64ff..c8cd9f131 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/DescriptionVersionsProvidersTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/DescriptionVersionsProvidersTest.java @@ -28,7 +28,7 @@ import org.eclipse.jdt.core.IJavaProject; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.osgi.framework.Bundle; import java.awt.Component; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/GenericPropertyDescriptionTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/GenericPropertyDescriptionTest.java index 2a81057f4..c6da95d13 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/GenericPropertyDescriptionTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/GenericPropertyDescriptionTest.java @@ -20,7 +20,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link GenericPropertyDescription}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/LayoutDescriptionTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/LayoutDescriptionTest.java index c9fa278e4..897e8d7a1 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/LayoutDescriptionTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/LayoutDescriptionTest.java @@ -17,7 +17,7 @@ import org.eclipse.wb.internal.core.model.description.helpers.LayoutDescriptionHelper; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/MethodPropertyRuleTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/MethodPropertyRuleTest.java index 49d4a5e6e..60e37e997 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/MethodPropertyRuleTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/MethodPropertyRuleTest.java @@ -24,7 +24,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link MethodPropertyRule}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/MorphingTargetDescriptionTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/MorphingTargetDescriptionTest.java index 4cb382493..86804647f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/MorphingTargetDescriptionTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/MorphingTargetDescriptionTest.java @@ -18,8 +18,8 @@ import org.eclipse.wb.tests.designer.swing.SwingModelTest; import org.assertj.core.api.Assertions; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.List; @@ -35,7 +35,7 @@ public class MorphingTargetDescriptionTest extends SwingModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); parseContainer( diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/ToolkitDescriptionTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/ToolkitDescriptionTest.java index 09b8febfd..a2bb3dc0b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/ToolkitDescriptionTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/ToolkitDescriptionTest.java @@ -25,7 +25,7 @@ import org.eclipse.core.runtime.Platform; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashSet; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/ContainerObjectValidatorsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/ContainerObjectValidatorsTest.java index 5435c3ec8..b7a74f8b8 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/ContainerObjectValidatorsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/ContainerObjectValidatorsTest.java @@ -20,7 +20,7 @@ import org.eclipse.wb.tests.designer.swing.SwingModelTest; import org.apache.commons.lang3.StringUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.function.Predicate; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/DblClickRunScriptEditPolicyTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/DblClickRunScriptEditPolicyTest.java index 611440601..b33e2df1f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/DblClickRunScriptEditPolicyTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/DblClickRunScriptEditPolicyTest.java @@ -15,7 +15,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingGefTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for double-click.runScript support. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/FlipBooleanPropertyGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/FlipBooleanPropertyGefTest.java index eeb8486fa..31d94d599 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/FlipBooleanPropertyGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/FlipBooleanPropertyGefTest.java @@ -15,7 +15,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingGefTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for double-click.flipBooleanProperty support. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/FlowContainerAbstractGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/FlowContainerAbstractGefTest.java index 56bb4b6ba..effd69563 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/FlowContainerAbstractGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/FlowContainerAbstractGefTest.java @@ -20,7 +20,7 @@ import org.eclipse.draw2d.PositionConstants; import org.eclipse.jface.action.IAction; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for "flow container" support for container itself or for its "layout manager". diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/FlowContainerGroupGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/FlowContainerGroupGefTest.java index b7a6d3a3e..12bf6ff49 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/FlowContainerGroupGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/FlowContainerGroupGefTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.wb.internal.swing.model.component.ContainerInfo; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for "flow container" support for "layout manager", created by diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/FlowContainerModelTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/FlowContainerModelTest.java index 8b73d1eea..496a8b3cf 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/FlowContainerModelTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/FlowContainerModelTest.java @@ -37,7 +37,7 @@ import org.apache.commons.lang3.StringUtils; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import java.text.MessageFormat; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/GenericTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/GenericTests.java index 30dc68e79..b7392f470 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/GenericTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/GenericTests.java @@ -12,17 +12,16 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.core.model.generic; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for generic simple/flow containers support. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ ContainerObjectValidatorsTest.class, FlowContainerModelTest.class, FlowContainerGefTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/OpenListenerEditPolicyTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/OpenListenerEditPolicyTest.java index f044b935d..f7ae01c52 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/OpenListenerEditPolicyTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/OpenListenerEditPolicyTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.wb.tests.designer.swing.SwingGefTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/SimpleContainerAbstractGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/SimpleContainerAbstractGefTest.java index d8e3e7a10..f2d020c83 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/SimpleContainerAbstractGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/SimpleContainerAbstractGefTest.java @@ -20,7 +20,7 @@ import org.eclipse.jface.action.IAction; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for "simple container" support, such as {@link SimpleContainer} interface. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/SimpleContainerModelTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/SimpleContainerModelTest.java index 57cd4b9bc..397f826ee 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/SimpleContainerModelTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/generic/SimpleContainerModelTest.java @@ -40,7 +40,7 @@ import static org.mockito.Mockito.when; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import java.text.MessageFormat; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/nonvisual/NonVisualBeansGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/nonvisual/NonVisualBeansGefTest.java index 7a57c457a..381531fb2 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/nonvisual/NonVisualBeansGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/nonvisual/NonVisualBeansGefTest.java @@ -15,7 +15,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingGefTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for non visual beans. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/nonvisual/NonVisualBeansTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/nonvisual/NonVisualBeansTest.java index 9996d0199..2579caf4a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/nonvisual/NonVisualBeansTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/nonvisual/NonVisualBeansTest.java @@ -28,7 +28,7 @@ import org.eclipse.draw2d.geometry.Point; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/operations/AddTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/operations/AddTest.java index c2c47d4b4..0909f56bf 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/operations/AddTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/operations/AddTest.java @@ -25,7 +25,7 @@ import org.eclipse.wb.tests.designer.swing.SwingTestUtils; import org.apache.commons.lang3.StringUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.JButton; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/operations/DeleteTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/operations/DeleteTest.java index ced8e7694..744a56886 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/operations/DeleteTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/operations/DeleteTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.JPanel; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/AbstractJavaInfoRelatedTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/AbstractJavaInfoRelatedTest.java index b7c15b8c5..ee16baf5e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/AbstractJavaInfoRelatedTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/AbstractJavaInfoRelatedTest.java @@ -62,8 +62,8 @@ import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; -import org.junit.AfterClass; -import org.junit.BeforeClass; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import java.util.ArrayList; import java.util.Collections; @@ -475,13 +475,13 @@ protected static void openPropertyDialog(Property property) throws Exception { private static Shell TEST_COMBO_SHELL; private static CCombo3 TEST_COMBO; - @BeforeClass + @BeforeAll public static void setUpAll() { TEST_COMBO_SHELL = new Shell(); TEST_COMBO = new CCombo3(TEST_COMBO_SHELL, SWT.NONE); } - @AfterClass + @AfterAll public static void tearDownAll() { TEST_COMBO_SHELL.dispose(); } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/AbstractJavaInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/AbstractJavaInfoTest.java index 873a5edca..8ae80635c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/AbstractJavaInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/AbstractJavaInfoTest.java @@ -55,8 +55,8 @@ import org.assertj.core.api.Assertions; import org.assertj.core.description.Description; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import java.util.List; @@ -67,7 +67,7 @@ public abstract class AbstractJavaInfoTest extends AbstractJavaInfoRelatedTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); m_ignoreCompilationProblems = false; @@ -87,7 +87,7 @@ protected void configureToolkits() { } @Override - @After + @AfterEach public void tearDown() throws Exception { disposeLastModel(); tearDown_afterLastModelDispose(); @@ -319,7 +319,7 @@ public void endVisit(ObjectInfo objectInfo) throws Exception { if (objectInfo instanceof AbsoluteLayoutInfo) { // in Swing absolute layout has object "null" } else if (objectInfo instanceof JavaInfo javaInfo) { - assertNotNull("Object expected.", javaInfo.getObject()); + assertNotNull(javaInfo.getObject(), "Object expected."); } } }); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/BadNodesTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/BadNodesTest.java index fb3a62c39..2d4edd899 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/BadNodesTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/BadNodesTest.java @@ -26,7 +26,7 @@ import org.eclipse.jdt.core.dom.MethodDeclaration; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/EditorStateTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/EditorStateTest.java index 421ff622b..679e0a6ee 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/EditorStateTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/EditorStateTest.java @@ -19,7 +19,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.beans.PropertyEditor; import java.beans.PropertyEditorManager; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/ExecuteOnParseTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/ExecuteOnParseTest.java index 6435a4c4a..453438673 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/ExecuteOnParseTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/ExecuteOnParseTest.java @@ -72,7 +72,7 @@ import org.eclipse.jface.dialogs.Dialog; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.BorderLayout; import java.awt.Component; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/GenerationSettingsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/GenerationSettingsTest.java index 0c564ebaa..ffe1596ed 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/GenerationSettingsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/GenerationSettingsTest.java @@ -30,7 +30,7 @@ import org.eclipse.wb.internal.swing.model.layout.absolute.AbsoluteLayoutInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link GenerationSettings}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/ParserBroadcastsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/ParserBroadcastsTest.java index d40bc45c6..b76f9c77f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/ParserBroadcastsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/ParserBroadcastsTest.java @@ -25,7 +25,7 @@ import org.eclipse.wb.tests.designer.TestUtils; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.JTextField; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/ParserTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/ParserTests.java index 1ca47d0f3..cdf5053ee 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/ParserTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/ParserTests.java @@ -14,15 +14,14 @@ import org.eclipse.wb.tests.designer.core.model.creation.CreationsTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ SimpleParserTest.class, SwingParserTest.class, ParserBroadcastsTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/SimpleParserTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/SimpleParserTest.java index f8ddd0ed9..4624db181 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/SimpleParserTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/SimpleParserTest.java @@ -25,7 +25,7 @@ import org.eclipse.jdt.core.dom.QualifiedName; import org.eclipse.jdt.core.dom.SimpleName; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.JButton; import javax.swing.JFrame; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/SwingParserTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/SwingParserTest.java index 2841788db..3cc39e544 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/SwingParserTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/SwingParserTest.java @@ -40,7 +40,7 @@ import org.eclipse.jdt.core.dom.SuperMethodInvocation; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.Component; import java.awt.Container; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/ComponentClassPropertyTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/ComponentClassPropertyTest.java index 19caedbf1..ff51e744a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/ComponentClassPropertyTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/ComponentClassPropertyTest.java @@ -20,7 +20,7 @@ import org.eclipse.wb.internal.swing.model.layout.absolute.AbsoluteLayoutInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link ComponentClassProperty}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/EmptyPropertyTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/EmptyPropertyTest.java index c65896ff3..57c0e8986 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/EmptyPropertyTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/EmptyPropertyTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.internal.core.model.property.editor.IntegerPropertyEditor; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link EmptyProperty}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/EventsPropertyTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/EventsPropertyTest.java index 2ff2c6793..bf8b9f5a2 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/EventsPropertyTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/EventsPropertyTest.java @@ -50,9 +50,9 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; import org.assertj.core.api.Assertions; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; @@ -71,14 +71,14 @@ public class EventsPropertyTest extends SwingModelTest implements IPreferenceCon // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); setPreferencesDefaults(); } @Override - @After + @AfterEach public void tearDown() throws Exception { waitEventLoop(0); setPreferencesDefaults(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/ExposePropertySupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/ExposePropertySupportTest.java index 95c2eaecf..39bbc6830 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/ExposePropertySupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/ExposePropertySupportTest.java @@ -35,7 +35,7 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link ExposePropertySupport}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/PropertiesTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/PropertiesTests.java index 28ec37511..fa2cfb2f0 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/PropertiesTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/PropertiesTests.java @@ -16,15 +16,14 @@ import org.eclipse.wb.tests.designer.core.model.property.editor.PropertyEditorsTests; import org.eclipse.wb.tests.designer.core.model.property.table.PropertyTableTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ StandardConvertersTest.class, PropertyCategoryProvidersTest.class, PropertyCategoryTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/PropertyCategoryProvidersTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/PropertyCategoryProvidersTest.java index cead2057c..bb43d782c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/PropertyCategoryProvidersTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/PropertyCategoryProvidersTest.java @@ -21,7 +21,7 @@ import org.eclipse.wb.tests.designer.swing.SwingModelTest; import org.eclipse.wb.tests.designer.tests.common.PropertyWithTitle; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link PropertyCategoryProviders}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/PropertyCategoryTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/PropertyCategoryTest.java index 3cd457f29..a01f84d21 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/PropertyCategoryTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/PropertyCategoryTest.java @@ -15,7 +15,7 @@ import org.eclipse.wb.internal.core.model.property.category.PropertyCategory; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link PropertyCategory}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/PropertyManagerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/PropertyManagerTest.java index 833877893..b2a904fcc 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/PropertyManagerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/PropertyManagerTest.java @@ -23,8 +23,8 @@ import org.eclipse.wb.tests.designer.swing.SwingModelTest; import org.eclipse.wb.tests.designer.tests.common.PropertyWithTitle; -import org.junit.AfterClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; /** * Test for {@link PropertyManager}. @@ -121,7 +121,7 @@ public void test_GenericProperty2() throws Exception { // Test suite tear down // //////////////////////////////////////////////////////////////////////////// - @AfterClass + @AfterAll public static void tearDownClass() throws Exception { AbstractJavaProjectTest.tearDownClass(); PropertyManager.setCategory(SwingToolkitDescription.INSTANCE, "background", null); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/PropertyTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/PropertyTest.java index 42bf28a7e..b2194a706 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/PropertyTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/PropertyTest.java @@ -43,7 +43,7 @@ import org.eclipse.jdt.core.dom.Expression; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.lang.reflect.Method; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/StandardConvertersTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/StandardConvertersTest.java index 0067e8434..aba0ccf8e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/StandardConvertersTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/StandardConvertersTest.java @@ -43,7 +43,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.jdt.core.JavaCore; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Locale; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/TabOrderPropertyTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/TabOrderPropertyTest.java index ba7173be0..d465fa72b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/TabOrderPropertyTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/TabOrderPropertyTest.java @@ -31,7 +31,7 @@ import org.eclipse.jdt.core.dom.MethodInvocation; import org.eclipse.jdt.core.dom.TypeDeclaration; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/AccessorUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/AccessorUtilsTest.java index e55a472d4..ca96a9157 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/AccessorUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/AccessorUtilsTest.java @@ -26,7 +26,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/AccessorsTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/AccessorsTests.java index bef623bc7..9b2a17c04 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/AccessorsTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/AccessorsTests.java @@ -14,17 +14,16 @@ import org.eclipse.wb.internal.core.model.property.accessor.ExpressionAccessor; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for core {@link ExpressionAccessor}'s. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ AccessorUtilsTest.class, FieldAccessorTest.class, SetterAccessorTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/ConstructorAccessorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/ConstructorAccessorTest.java index e9f8d25be..c1a646f59 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/ConstructorAccessorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/ConstructorAccessorTest.java @@ -26,7 +26,7 @@ import org.eclipse.jdt.core.dom.Expression; import org.eclipse.jdt.core.dom.StringLiteral; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link ConstructorAccessor}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/FactoryAccessorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/FactoryAccessorTest.java index bfd22fb01..d6a458996 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/FactoryAccessorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/FactoryAccessorTest.java @@ -20,8 +20,8 @@ import org.eclipse.jdt.core.dom.StringLiteral; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link FactoryAccessor}. @@ -35,7 +35,7 @@ public class FactoryAccessorTest extends SwingModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject != null) { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/FieldAccessorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/FieldAccessorTest.java index c5bc1fb1f..9cf95e42e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/FieldAccessorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/FieldAccessorTest.java @@ -27,7 +27,7 @@ import org.eclipse.jdt.core.dom.Assignment; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/InvocationChildAssociationAccessorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/InvocationChildAssociationAccessorTest.java index 4c1b4998e..6cf496f0c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/InvocationChildAssociationAccessorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/InvocationChildAssociationAccessorTest.java @@ -19,8 +19,8 @@ import org.eclipse.jdt.core.dom.StringLiteral; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link InvocationChildAssociationAccessor}. @@ -34,7 +34,7 @@ public class InvocationChildAssociationAccessorTest extends SwingModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject != null) { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/MethodInvocationAccessorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/MethodInvocationAccessorTest.java index 37e17c1b6..8b764812b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/MethodInvocationAccessorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/MethodInvocationAccessorTest.java @@ -22,8 +22,8 @@ import org.eclipse.jdt.core.dom.MethodInvocation; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link MethodInvocationAccessor}. @@ -37,7 +37,7 @@ public class MethodInvocationAccessorTest extends SwingModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // prepare MyPanel diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/MethodInvocationArgumentAccessorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/MethodInvocationArgumentAccessorTest.java index 5e7435af8..7ce2416e9 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/MethodInvocationArgumentAccessorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/MethodInvocationArgumentAccessorTest.java @@ -21,8 +21,8 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.lang.reflect.Method; @@ -38,7 +38,7 @@ public class MethodInvocationArgumentAccessorTest extends SwingModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // prepare MyPanel diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/SetterAccessorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/SetterAccessorTest.java index 453b94799..978c5a53e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/SetterAccessorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/SetterAccessorTest.java @@ -31,7 +31,7 @@ import org.eclipse.jdt.core.dom.BooleanLiteral; import org.eclipse.jdt.core.dom.MethodInvocation; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.lang.reflect.Method; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/SuperConstructorAccessorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/SuperConstructorAccessorTest.java index 9a5111b9b..338a3fe50 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/SuperConstructorAccessorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/accessor/SuperConstructorAccessorTest.java @@ -22,8 +22,8 @@ import org.eclipse.jdt.core.dom.MethodDeclaration; import org.eclipse.jdt.core.dom.SuperConstructorInvocation; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link SuperConstructorAccessor}. @@ -37,7 +37,7 @@ public class SuperConstructorAccessorTest extends SwingModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); setFileContentSrc( diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/BooleanObjectPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/BooleanObjectPropertyEditorTest.java index ec5be1cd4..28c45c9f9 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/BooleanObjectPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/BooleanObjectPropertyEditorTest.java @@ -20,7 +20,7 @@ import org.eclipse.draw2d.geometry.Point; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link BooleanPropertyEditor}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/BooleanPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/BooleanPropertyEditorTest.java index f3c44585e..396a9fff3 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/BooleanPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/BooleanPropertyEditorTest.java @@ -19,7 +19,7 @@ import org.eclipse.draw2d.geometry.Point; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link BooleanPropertyEditor}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/ByteObjectPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/ByteObjectPropertyEditorTest.java index e44c62b76..56ad06576 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/ByteObjectPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/ByteObjectPropertyEditorTest.java @@ -21,7 +21,7 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link ByteObjectPropertyEditor}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/ConstantSelectionPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/ConstantSelectionPropertyEditorTest.java index 4e91e9d52..ef576714d 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/ConstantSelectionPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/ConstantSelectionPropertyEditorTest.java @@ -28,9 +28,9 @@ import org.eclipse.swt.widgets.Shell; import org.assertj.core.api.Assertions; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.HashSet; import java.util.List; @@ -50,7 +50,7 @@ public class ConstantSelectionPropertyEditorTest extends SwingModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // prepare test Shell @@ -103,7 +103,7 @@ public void setUp() throws Exception { } @Override - @After + @AfterEach public void tearDown() throws Exception { super.tearDown(); if (m_shell != null) { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/DatePropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/DatePropertyEditorTest.java index 165e3d424..2e6359530 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/DatePropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/DatePropertyEditorTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.wb.internal.swing.model.component.ContainerInfo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/DisplayExpressionPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/DisplayExpressionPropertyEditorTest.java index 234c08285..34da6ad0b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/DisplayExpressionPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/DisplayExpressionPropertyEditorTest.java @@ -17,7 +17,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link DisplayExpressionPropertyEditor}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/DoubleObjectPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/DoubleObjectPropertyEditorTest.java index 9a5a5daa3..092b377c9 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/DoubleObjectPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/DoubleObjectPropertyEditorTest.java @@ -21,7 +21,7 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link DoubleObjectPropertyEditor}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/EnumCustomPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/EnumCustomPropertyEditorTest.java index b7b4483e1..41ddade27 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/EnumCustomPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/EnumCustomPropertyEditorTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.internal.core.utils.reflect.ReflectionUtils; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link EnumCustomPropertyEditor}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/EnumPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/EnumPropertyEditorTest.java index d262f30eb..0fe6b7a58 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/EnumPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/EnumPropertyEditorTest.java @@ -22,7 +22,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link EnumPropertyEditor}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/EnumerationValuesPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/EnumerationValuesPropertyEditorTest.java index e84f95d60..b1dfeef74 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/EnumerationValuesPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/EnumerationValuesPropertyEditorTest.java @@ -21,7 +21,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link EnumerationValuesPropertyEditor}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/ExpressionListPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/ExpressionListPropertyEditorTest.java index 41098b00b..964271e0a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/ExpressionListPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/ExpressionListPropertyEditorTest.java @@ -16,7 +16,7 @@ import org.eclipse.wb.internal.core.utils.check.AssertionFailedException; import org.assertj.core.util.Lists; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashMap; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/InnerClassPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/InnerClassPropertyEditorTest.java index 303549697..6b4916805 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/InnerClassPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/InnerClassPropertyEditorTest.java @@ -30,7 +30,7 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link InnerClassPropertyEditor}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/InstanceListPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/InstanceListPropertyEditorTest.java index 96383ea89..6825aee06 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/InstanceListPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/InstanceListPropertyEditorTest.java @@ -16,7 +16,7 @@ import org.eclipse.wb.internal.core.utils.check.AssertionFailedException; import org.assertj.core.util.Lists; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/InstanceObjectPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/InstanceObjectPropertyEditorTest.java index 8dcf1b646..55f526d22 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/InstanceObjectPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/InstanceObjectPropertyEditorTest.java @@ -27,7 +27,7 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/IntegerArrayPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/IntegerArrayPropertyEditorTest.java index 1e45bab4a..56ebc7dd1 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/IntegerArrayPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/IntegerArrayPropertyEditorTest.java @@ -21,7 +21,7 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link IntegerArrayPropertyEditor}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/IntegerObjectPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/IntegerObjectPropertyEditorTest.java index ca6cae9d5..433d6c302 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/IntegerObjectPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/IntegerObjectPropertyEditorTest.java @@ -21,7 +21,7 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link IntegerObjectPropertyEditor}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/IntegerPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/IntegerPropertyEditorTest.java index b28fa5ccc..f8fe37355 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/IntegerPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/IntegerPropertyEditorTest.java @@ -21,7 +21,7 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link IntegerPropertyEditor}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/LocalePropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/LocalePropertyEditorTest.java index b6fd39932..f68d777af 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/LocalePropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/LocalePropertyEditorTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Locale; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/LongObjectPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/LongObjectPropertyEditorTest.java index 7f23a419d..3a3da8e66 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/LongObjectPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/LongObjectPropertyEditorTest.java @@ -21,7 +21,7 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link LongObjectPropertyEditor}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/ObjectPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/ObjectPropertyEditorTest.java index eda65c678..6631b1d3c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/ObjectPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/ObjectPropertyEditorTest.java @@ -34,7 +34,7 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.Component; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/PropertyEditorsTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/PropertyEditorsTests.java index 9687956ad..99fcbc5cd 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/PropertyEditorsTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/PropertyEditorsTests.java @@ -14,17 +14,16 @@ import org.eclipse.wb.internal.core.model.property.editor.PropertyEditor; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for {@link PropertyEditor}'s. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ // primitives BooleanPropertyEditorTest.class, IntegerPropertyEditorTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/ShortObjectPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/ShortObjectPropertyEditorTest.java index 83166bf3d..ef587e208 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/ShortObjectPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/ShortObjectPropertyEditorTest.java @@ -21,7 +21,7 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link ShortObjectPropertyEditor}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/StaticFieldPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/StaticFieldPropertyEditorTest.java index eee20f9f8..20ec08f2c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/StaticFieldPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/StaticFieldPropertyEditorTest.java @@ -27,7 +27,7 @@ import org.apache.commons.lang3.ArrayUtils; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Map; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/StringListPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/StringListPropertyEditorTest.java index 11ad0a916..1e663b04f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/StringListPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/StringListPropertyEditorTest.java @@ -21,7 +21,7 @@ import org.eclipse.wb.tests.designer.tests.common.PropertyWithTitle; import org.assertj.core.util.Lists; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/StringsAddPropertyTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/StringsAddPropertyTest.java index 9a85d0280..479b1b9ac 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/StringsAddPropertyTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/StringsAddPropertyTest.java @@ -19,7 +19,7 @@ import org.eclipse.wb.tests.designer.swing.SwingModelTest; import org.apache.commons.lang3.ArrayUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link StringsAddPropertyFactory} and {@link StringsAddPropertyEditor}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/StylePropertyEditorLongTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/StylePropertyEditorLongTest.java index 4af522cf4..b838998e2 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/StylePropertyEditorLongTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/StylePropertyEditorLongTest.java @@ -35,8 +35,8 @@ import org.eclipse.jface.action.Separator; import org.assertj.core.api.Assertions; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import java.text.MessageFormat; @@ -89,7 +89,7 @@ protected void configureNewProject() throws Exception { // TODO clear all fields in DesignerEditorTestCase @Override - @After + @AfterEach public void tearDown() throws Exception { m_styleProperty = null; m_editor = null; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/StylePropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/StylePropertyEditorTest.java index 618942f1a..e87bd7ef8 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/StylePropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/editor/StylePropertyEditorTest.java @@ -35,7 +35,7 @@ import org.eclipse.jface.action.Separator; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.text.MessageFormat; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/table/AbstractPropertyTableTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/table/AbstractPropertyTableTest.java index 58b65bff5..5a427646a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/table/AbstractPropertyTableTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/table/AbstractPropertyTableTest.java @@ -24,8 +24,8 @@ import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Shell; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; public abstract class AbstractPropertyTableTest extends DesignerTestCase { protected Shell m_shell; @@ -38,7 +38,7 @@ public abstract class AbstractPropertyTableTest extends DesignerTestCase { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // create GUI @@ -57,7 +57,7 @@ public void setUp() throws Exception { } @Override - @After + @AfterEach public void tearDown() throws Exception { m_shell.dispose(); super.tearDown(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/table/PropertyTableEditorsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/table/PropertyTableEditorsTest.java index f4698ed0c..77d7191c8 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/table/PropertyTableEditorsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/table/PropertyTableEditorsTest.java @@ -19,7 +19,7 @@ import org.eclipse.swt.graphics.Point; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link PropertyEditor}'s in {@link PropertyTable}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/table/PropertyTableTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/table/PropertyTableTest.java index ae5d47e69..2082197db 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/table/PropertyTableTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/table/PropertyTableTest.java @@ -22,8 +22,8 @@ import org.eclipse.draw2d.Cursors; import org.eclipse.swt.graphics.Point; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for basic {@link PropertyTable} features. @@ -40,7 +40,7 @@ public class PropertyTableTest extends AbstractPropertyTableTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // set up properties diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/table/PropertyTableTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/table/PropertyTableTests.java index 22d1c7272..48eab5eb8 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/table/PropertyTableTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/table/PropertyTableTests.java @@ -14,17 +14,16 @@ import org.eclipse.wb.internal.core.model.property.table.PropertyTable; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for {@link PropertyTable}. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ PropertyTableTest.class, PropertyTableTooltipTest.class, PropertyTableEditorsTest.class diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/table/PropertyTableTooltipTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/table/PropertyTableTooltipTest.java index 7674d4340..a96dd0e1c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/table/PropertyTableTooltipTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/table/PropertyTableTooltipTest.java @@ -27,15 +27,15 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * Tests for basic {@link PropertyTable} features. * * @author scheglov_ke */ -@Ignore +@Disabled public class PropertyTableTooltipTest extends AbstractPropertyTableTest { private static final PropertyEditor stringEditor = StringPropertyEditor.INSTANCE; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/ComponentOrderTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/ComponentOrderTest.java index c32feb124..bccb36a47 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/ComponentOrderTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/ComponentOrderTest.java @@ -23,7 +23,7 @@ import org.eclipse.wb.internal.swing.model.layout.FlowLayoutInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link ComponentOrder}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/ExposeComponentSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/ExposeComponentSupportTest.java index be703dc9b..3df86ed7a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/ExposeComponentSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/ExposeComponentSupportTest.java @@ -22,7 +22,7 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.MenuManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link ExposeComponentSupport}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/FactoryActionsSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/FactoryActionsSupportTest.java index 72a32614e..cb1643d53 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/FactoryActionsSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/FactoryActionsSupportTest.java @@ -23,7 +23,7 @@ import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/FactoryActionsTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/FactoryActionsTests.java index a75292ca5..d63660dc7 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/FactoryActionsTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/FactoryActionsTests.java @@ -12,15 +12,14 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.core.model.util; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ FactoryActionsSupportTest.class, FactoryCreateActionTest.class, FactoryApplyActionTest.class diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/FactoryApplyActionTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/FactoryApplyActionTest.java index 0408100d0..1447111d7 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/FactoryApplyActionTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/FactoryApplyActionTest.java @@ -27,7 +27,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link FactoryApplyAction}. @@ -431,7 +431,7 @@ private static void doApply(JavaInfo component, String methodSignature) throws E EditorState.get(editor).getEditorLoader().loadClass("test.StaticFactory"); factoryDescription = FactoryDescriptionHelper.getDescription(editor, factoryClass, methodSignature, true); - assertNotNull("No factory method with signature: " + methodSignature, factoryDescription); + assertNotNull(factoryDescription, "No factory method with signature: " + methodSignature); } // apply factory FactoryApplyAction action = new FactoryApplyAction(component, factoryDescription); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/FactoryCreateActionTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/FactoryCreateActionTest.java index ddcd53303..09356db92 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/FactoryCreateActionTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/FactoryCreateActionTest.java @@ -42,8 +42,8 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import java.util.List; @@ -60,7 +60,7 @@ public class FactoryCreateActionTest extends SwingModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { action = null; super.tearDown(); @@ -519,7 +519,7 @@ public void test_generate_newFactoryClass() throws Exception { callGenerate(button, new int[]{}, new String[]{}, new int[][]{}); ICompilationUnit factoryUnit = m_testProject.getJavaProject().findType("test.StaticFactory").getCompilationUnit(); - assertNotNull("New factory class test.StaticFactory should be created.", factoryUnit); + assertNotNull(factoryUnit, "New factory class test.StaticFactory should be created."); try { m_getSource_ignoreSpacesCheck = true; assertEquals( @@ -1338,7 +1338,7 @@ private String generate_configureInvocations(JavaInfo component, for (int i = 0; i < invocationSignatures.length; i++) { String signature = invocationSignatures[i]; Object invocation = generate_findInvocation(signature); - assertNotNull("Can not find invocation with signature: " + signature, invocation); + assertNotNull(invocation, "Can not find invocation with signature: " + signature); ReflectionUtils.setField(invocation, "m_extract", Boolean.TRUE); generate_fillParameters(invocation, invocationParameters[i]); } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/GenericTypeResolverJavaInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/GenericTypeResolverJavaInfoTest.java index 975df1892..95a54fdc9 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/GenericTypeResolverJavaInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/GenericTypeResolverJavaInfoTest.java @@ -18,7 +18,7 @@ import org.eclipse.jdt.core.dom.ClassInstanceCreation; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.lang.reflect.TypeVariable; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/JavaInfoUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/JavaInfoUtilsTest.java index 6f0fcc386..acea53c07 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/JavaInfoUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/JavaInfoUtilsTest.java @@ -76,7 +76,7 @@ import org.assertj.core.api.Assertions; import org.assertj.core.util.Lists; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import java.awt.FlowLayout; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/MethodOrderTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/MethodOrderTest.java index 5b588acdc..3f9c5186c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/MethodOrderTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/MethodOrderTest.java @@ -35,7 +35,7 @@ import org.eclipse.jface.dialogs.TitleAreaDialog; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/MorphingSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/MorphingSupportTest.java index bb07509d6..e7b58d4e0 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/MorphingSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/MorphingSupportTest.java @@ -38,7 +38,7 @@ import static org.mockito.Mockito.mock; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/ObjectInfoUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/ObjectInfoUtilsTest.java index 4f0d18677..f032541b0 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/ObjectInfoUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/ObjectInfoUtilsTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ObjectInfoUtilsTest extends SwingModelTest { //////////////////////////////////////////////////////////////////////////// diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/ObjectsLabelProviderTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/ObjectsLabelProviderTest.java index f3b0d26e0..71ef397e5 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/ObjectsLabelProviderTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/ObjectsLabelProviderTest.java @@ -25,7 +25,7 @@ import org.eclipse.jface.viewers.DecorationOverlayIcon; import org.eclipse.jface.viewers.IDecoration; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link ObjectsLabelProvider}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/ObjectsTreeContentProviderTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/ObjectsTreeContentProviderTest.java index 82cb2df43..262e5b086 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/ObjectsTreeContentProviderTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/ObjectsTreeContentProviderTest.java @@ -20,7 +20,7 @@ import org.eclipse.jface.viewers.ITreeContentProvider; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.function.Predicate; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/PredicatesTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/PredicatesTest.java index 8c0389c47..37855a854 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/PredicatesTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/PredicatesTest.java @@ -19,7 +19,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.function.Predicate; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/PropertyUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/PropertyUtilsTest.java index 3e9948a49..b956067e4 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/PropertyUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/PropertyUtilsTest.java @@ -22,7 +22,7 @@ import org.assertj.core.api.Assertions; import org.assertj.core.util.Lists; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.function.Predicate; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/RenameConvertSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/RenameConvertSupportTest.java index f19ed4ec8..739877837 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/RenameConvertSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/RenameConvertSupportTest.java @@ -33,7 +33,7 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/ScriptUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/ScriptUtilsTest.java index 7fd36bba5..5e03441f9 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/ScriptUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/ScriptUtilsTest.java @@ -19,7 +19,7 @@ import org.eclipse.wb.tests.designer.swing.SwingModelTest; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Map; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/StackContainerSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/StackContainerSupportTest.java index a78e0b068..cec0406e2 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/StackContainerSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/StackContainerSupportTest.java @@ -22,7 +22,7 @@ import org.eclipse.wb.internal.swing.model.layout.FlowLayoutInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/TemplateUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/TemplateUtilsTest.java index a906da4b4..b58f5e26e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/TemplateUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/TemplateUtilsTest.java @@ -30,8 +30,8 @@ import org.apache.commons.collections4.BidiMap; import org.apache.commons.collections4.bidimap.DualHashBidiMap; import org.apache.commons.collections4.bidimap.UnmodifiableBidiMap; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.text.MessageFormat; import java.util.List; @@ -75,7 +75,7 @@ public void test_getExpression() throws Exception { /** * Test for {@link TemplateUtils#format(String, Object...)}. */ - @Ignore + @Disabled @Test public void test_format() throws Exception { ContainerInfo panel = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/UtilTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/UtilTests.java index 6faa59270..baffb1633 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/UtilTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/UtilTests.java @@ -14,15 +14,14 @@ import org.eclipse.wb.tests.designer.core.model.util.generic.GenericTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ ExposeComponentSupportTest.class, FactoryActionsTests.class, JavaInfoUtilsTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/generic/CopyPropertyTopChildTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/generic/CopyPropertyTopChildTest.java index 1930ad30e..327370c53 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/generic/CopyPropertyTopChildTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/generic/CopyPropertyTopChildTest.java @@ -21,7 +21,7 @@ import org.eclipse.wb.tests.designer.swing.SwingModelTest; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/generic/CopyPropertyTopTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/generic/CopyPropertyTopTest.java index 2164a6531..1a70bdcfa 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/generic/CopyPropertyTopTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/generic/CopyPropertyTopTest.java @@ -19,7 +19,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link CopyPropertyTopSupport}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/generic/GenericTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/generic/GenericTests.java index 4d4ed0ff6..ec38951be 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/generic/GenericTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/generic/GenericTests.java @@ -12,17 +12,16 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.core.model.util.generic; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Test for generic, description driven features. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ CopyPropertyTopChildTest.class, CopyPropertyTopTest.class, ModelMethodPropertyTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/generic/ModelMethodPropertyChildTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/generic/ModelMethodPropertyChildTest.java index c104864c5..7aaae276e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/generic/ModelMethodPropertyChildTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/generic/ModelMethodPropertyChildTest.java @@ -25,7 +25,7 @@ import org.eclipse.wb.tests.designer.swing.SwingModelTest; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/generic/ModelMethodPropertyTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/generic/ModelMethodPropertyTest.java index 1ff0f5e09..e8ec49116 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/generic/ModelMethodPropertyTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/generic/ModelMethodPropertyTest.java @@ -28,7 +28,7 @@ import org.eclipse.wb.tests.designer.swing.SwingModelTest; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/AbstractNamedTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/AbstractNamedTest.java index 045ed9fee..3027b0407 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/AbstractNamedTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/AbstractNamedTest.java @@ -33,7 +33,7 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.HashSet; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/AbstractSimpleTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/AbstractSimpleTest.java index b1f57cc22..767d1c3ad 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/AbstractSimpleTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/AbstractSimpleTest.java @@ -30,7 +30,7 @@ import org.eclipse.jdt.core.dom.MethodDeclaration; import org.eclipse.jdt.core.dom.Statement; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/AbstractVariableSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/AbstractVariableSupportTest.java index 8344ef3b7..bc704605d 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/AbstractVariableSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/AbstractVariableSupportTest.java @@ -21,7 +21,7 @@ import static org.mockito.Mockito.mock; import org.apache.commons.lang3.NotImplementedException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/EmptyInvocationTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/EmptyInvocationTest.java index 0838099d2..c8b7f2624 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/EmptyInvocationTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/EmptyInvocationTest.java @@ -21,7 +21,7 @@ import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.wb.internal.swing.model.component.ContainerInfo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.JButton; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/EmptyPureTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/EmptyPureTest.java index 4910081d9..4b7206bc4 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/EmptyPureTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/EmptyPureTest.java @@ -20,7 +20,7 @@ import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.wb.internal.swing.model.component.ContainerInfo; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for adding using {@link EmptyPureVariableSupport}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/EmptyTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/EmptyTest.java index 091c747b9..ee8d2b1ea 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/EmptyTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/EmptyTest.java @@ -38,7 +38,7 @@ import org.eclipse.jdt.core.dom.Statement; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.Container; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/ExposedFieldTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/ExposedFieldTest.java index 4ae06d19c..5640e1935 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/ExposedFieldTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/ExposedFieldTest.java @@ -24,7 +24,7 @@ import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.dom.Statement; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link ExposedFieldVariableSupport}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/ExposedPropertyTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/ExposedPropertyTest.java index 7bc26417c..88601f36f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/ExposedPropertyTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/ExposedPropertyTest.java @@ -23,7 +23,7 @@ import org.eclipse.jdt.core.dom.Statement; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.Component; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/FieldInitializerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/FieldInitializerTest.java index 4c63fcae4..931f711a9 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/FieldInitializerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/FieldInitializerTest.java @@ -42,7 +42,7 @@ import org.eclipse.jdt.core.dom.VariableDeclaration; import org.apache.commons.lang3.StringUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/FieldReuseTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/FieldReuseTest.java index c6e8bfb1d..376718a40 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/FieldReuseTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/FieldReuseTest.java @@ -21,7 +21,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link FieldReuseVariableSupport}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/FieldUniqueTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/FieldUniqueTest.java index 75acc0ebb..e48dbfd15 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/FieldUniqueTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/FieldUniqueTest.java @@ -36,7 +36,7 @@ import org.eclipse.jdt.core.dom.TypeDeclaration; import org.eclipse.jdt.core.dom.VariableDeclaration; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/LazyTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/LazyTest.java index a07201e2e..92bc77158 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/LazyTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/LazyTest.java @@ -36,7 +36,7 @@ import org.apache.commons.lang3.StringUtils; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link LazyVariableSupport}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/LocalReuseTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/LocalReuseTest.java index 313bf12d3..1bbe15fbf 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/LocalReuseTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/LocalReuseTest.java @@ -21,7 +21,7 @@ import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.wb.internal.swing.model.component.ContainerInfo; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link LocalReuseVariableSupport}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/LocalUniqueTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/LocalUniqueTest.java index 807ff6944..c13f3b59b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/LocalUniqueTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/LocalUniqueTest.java @@ -48,7 +48,7 @@ import org.eclipse.jdt.core.dom.Statement; import org.eclipse.jdt.core.dom.TypeDeclaration; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/MethodParameterTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/MethodParameterTest.java index 9086f19fc..1618eb027 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/MethodParameterTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/MethodParameterTest.java @@ -39,7 +39,7 @@ import org.eclipse.jdt.core.dom.SuperConstructorInvocation; import org.eclipse.jdt.core.dom.TypeDeclaration; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.JButton; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/NamesManagerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/NamesManagerTest.java index d2a2ea48c..108062f5f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/NamesManagerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/NamesManagerTest.java @@ -30,7 +30,7 @@ import org.eclipse.jface.preference.IPreferenceStore; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/TextPropertyRenameTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/TextPropertyRenameTest.java index de1542ad3..4abeec646 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/TextPropertyRenameTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/TextPropertyRenameTest.java @@ -31,7 +31,7 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/ThisForcedMethodTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/ThisForcedMethodTest.java index 5f97dc110..1d332d636 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/ThisForcedMethodTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/ThisForcedMethodTest.java @@ -26,9 +26,9 @@ import org.eclipse.jdt.core.dom.SuperConstructorInvocation; import org.eclipse.jface.preference.IPreferenceStore; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.swing.JFrame; @@ -46,14 +46,14 @@ public class ThisForcedMethodTest extends SwingModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); PREFERENCES.setValue(GenerationSettings.P_FORCED_METHOD, "init"); } @Override - @After + @AfterEach public void tearDown() throws Exception { PREFERENCES.setToDefault(GenerationSettings.P_FORCED_METHOD); super.tearDown(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/ThisTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/ThisTest.java index e3a73dd80..bca1d2423 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/ThisTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/ThisTest.java @@ -24,7 +24,7 @@ import org.eclipse.jdt.core.dom.SuperMethodInvocation; import org.eclipse.jdt.core.dom.TypeDeclaration; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link ThisVariableSupport}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/VariablesTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/VariablesTests.java index 1366d3020..34f348cbc 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/VariablesTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/VariablesTests.java @@ -14,17 +14,16 @@ import org.eclipse.wb.internal.core.model.variable.VariableSupport; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for {@link VariableSupport}. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ AbstractVariableSupportTest.class, ThisTest.class, ThisForcedMethodTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/VoidInvocationTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/VoidInvocationTest.java index c4242ecf7..9b6388bbe 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/VoidInvocationTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/variables/VoidInvocationTest.java @@ -30,7 +30,7 @@ import org.apache.commons.lang3.NotImplementedException; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.Component; import java.awt.Container; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/AbstractNlsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/AbstractNlsTest.java index 7324ce0e4..69c8f7cd6 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/AbstractNlsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/AbstractNlsTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.internal.core.nls.bundle.eclipse.old.EclipseSource; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.After; +import org.junit.jupiter.api.AfterEach; /** * Abstract test for NLS. @@ -32,7 +32,7 @@ public abstract class AbstractNlsTest extends SwingModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { // process UI messages (without this we have exception from Java UI) waitEventLoop(1); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/BundleInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/BundleInfoTest.java index 5d4749674..284d7a989 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/BundleInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/BundleInfoTest.java @@ -19,8 +19,8 @@ import org.eclipse.core.resources.IFile; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.Locale; import java.util.Map; @@ -38,7 +38,7 @@ public class BundleInfoTest extends SwingModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); setFileContentSrc("test/messages.properties", getSourceDQ("frame.title=My JFrame")); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/EditableSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/EditableSupportTest.java index 5f2abbbcd..7a8ade1f3 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/EditableSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/EditableSupportTest.java @@ -40,7 +40,7 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; @@ -1096,7 +1096,7 @@ public void keyRenamed(String oldKey, String newKey) { private void assertStringSet(Set set, String[] expectedValues) { assertEquals(expectedValues.length, set.size()); for (String expectedValue : expectedValues) { - assertTrue(expectedValue + " not found in " + set, set.contains(expectedValue)); + assertTrue(set.contains(expectedValue), expectedValue + " not found in " + set); } } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/LocaleInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/LocaleInfoTest.java index 1c236c664..fb6cd8f61 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/LocaleInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/LocaleInfoTest.java @@ -15,7 +15,7 @@ import org.eclipse.wb.internal.core.nls.model.LocaleInfo; import org.eclipse.wb.tests.designer.tests.DesignerTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Locale; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/NlsSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/NlsSupportTest.java index 849223ed7..bf0277f90 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/NlsSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/NlsSupportTest.java @@ -41,8 +41,8 @@ import org.eclipse.swt.widgets.Shell; import org.assertj.core.api.Assertions; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Locale; @@ -66,7 +66,7 @@ public class NlsSupportTest extends SwingModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { waitEventLoop(0); if (m_frame != null) { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/NlsTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/NlsTests.java index e112bace1..0cfda5cfa 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/NlsTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/NlsTests.java @@ -14,15 +14,14 @@ import org.eclipse.wb.tests.designer.core.nls.ui.NlsUiTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ LocaleInfoTest.class, BundleInfoTest.class, NlsSupportTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/SourceAbstractSpecialTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/SourceAbstractSpecialTest.java index 44f188369..1d0e63d23 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/SourceAbstractSpecialTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/SourceAbstractSpecialTest.java @@ -24,7 +24,7 @@ import org.eclipse.jdt.core.dom.StringLiteral; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.BorderLayout; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/SourceDirectTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/SourceDirectTest.java index e8aa896f2..3c4b38083 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/SourceDirectTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/SourceDirectTest.java @@ -31,7 +31,7 @@ import org.eclipse.core.runtime.Path; import org.eclipse.jdt.core.IJavaProject; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/SourceEclipseModernTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/SourceEclipseModernTest.java index 4a1f2f09f..a28fe1563 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/SourceEclipseModernTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/SourceEclipseModernTest.java @@ -35,8 +35,8 @@ import org.apache.commons.lang3.StringUtils; import org.assertj.core.api.Assertions; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.List; @@ -54,7 +54,7 @@ public class SourceEclipseModernTest extends AbstractNlsTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); m_testProject.addPlugin("org.eclipse.osgi"); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/SourceEclipseOldTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/SourceEclipseOldTest.java index bb47166a7..1c8cafd6e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/SourceEclipseOldTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/SourceEclipseOldTest.java @@ -26,7 +26,7 @@ import org.eclipse.jdt.core.IJavaProject; import org.apache.commons.lang3.StringUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.JFrame; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/SourceFieldTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/SourceFieldTest.java index 816ce539d..2b10be413 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/SourceFieldTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/SourceFieldTest.java @@ -32,7 +32,7 @@ import org.eclipse.jdt.core.dom.StringLiteral; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/AbstractNlsUiTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/AbstractNlsUiTest.java index f7fb96069..62b84bd56 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/AbstractNlsUiTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/AbstractNlsUiTest.java @@ -25,9 +25,9 @@ import org.apache.commons.lang3.function.FailableBiConsumer; import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; /** * Abstract test for NLS UI. @@ -98,7 +98,7 @@ public void accept(SWTBot bot) throws Exception { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject == null) { @@ -107,7 +107,7 @@ public void setUp() throws Exception { } @Override - @After + @AfterEach public void tearDown() throws Exception { // process UI messages (without this we have exception from Java UI) waitEventLoop(1); @@ -123,7 +123,7 @@ public void tearDown() throws Exception { // Project life cycle // //////////////////////////////////////////////////////////////////////////// - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { do_projectCreate(); } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/ContributionItemTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/ContributionItemTest.java index 88e445d5c..26eb3eecc 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/ContributionItemTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/ContributionItemTest.java @@ -22,7 +22,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotRootMenu; import org.apache.commons.lang3.function.FailableBiConsumer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; @@ -56,7 +56,7 @@ public Test() { assertEquals("My JFrame", ((JFrame) m_contentJavaInfo.getObject()).getTitle()); { // check locales combo, and switch to "it" locale - assertNotNull("NLS dialog item not found.", m_dialogItem); + assertNotNull(m_dialogItem, "NLS dialog item not found."); // initialize menu creation new UiContext().executeAndCheck(() -> { // noop diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/FlagRepositoryTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/FlagRepositoryTest.java index 5ffc449f2..63a570233 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/FlagRepositoryTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/FlagRepositoryTest.java @@ -18,7 +18,7 @@ import org.eclipse.swt.graphics.Image; import org.apache.commons.lang3.ArrayUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Locale; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/LocaleUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/LocaleUtilsTest.java index 504f63eae..f81bbd8f1 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/LocaleUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/LocaleUtilsTest.java @@ -17,7 +17,7 @@ import org.eclipse.wb.internal.core.nls.ui.LocaleUtils; import org.eclipse.wb.tests.designer.tests.DesignerTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Locale; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/NewSourceDialogTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/NewSourceDialogTest.java index fedda54ae..65878ae9b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/NewSourceDialogTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/NewSourceDialogTest.java @@ -29,7 +29,7 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link NewSourceDialog}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/NlsDialogTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/NlsDialogTest.java index 40e00bd31..df43954b6 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/NlsDialogTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/NlsDialogTest.java @@ -20,7 +20,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; import org.apache.commons.lang3.function.FailableBiConsumer; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link NlsDialog}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/NlsUiTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/NlsUiTests.java index bb86851c0..52a86cc8f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/NlsUiTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/NlsUiTests.java @@ -12,15 +12,14 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.core.nls.ui; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ FlagRepositoryTest.class, LocaleUtilsTest.class, ContributionItemTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/PropertiesCompositeTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/PropertiesCompositeTest.java index 82ed151ee..9ca1becda 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/PropertiesCompositeTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/PropertiesCompositeTest.java @@ -33,7 +33,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.apache.commons.lang3.function.FailableBiConsumer; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link PropertiesComposite}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/SourceCompositeTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/SourceCompositeTest.java index 8dd91fd00..308411e92 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/SourceCompositeTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/nls/ui/SourceCompositeTest.java @@ -48,9 +48,9 @@ import org.apache.commons.lang3.function.FailableBiConsumer; import org.apache.commons.lang3.function.FailableRunnable; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.io.Closeable; import java.io.IOException; @@ -65,7 +65,7 @@ public class SourceCompositeTest extends AbstractDialogTest { private static String SWTBOT_KEYBOARD_STRATEGY; private static String SWTBOT_KEYBOARD_LAYOUT; - @BeforeClass + @BeforeAll public static void setUpAll() { SWTBOT_KEYBOARD_STRATEGY = SWTBotPreferences.KEYBOARD_STRATEGY; SWTBotPreferences.KEYBOARD_STRATEGY = SWTKeyboardStrategy.class.getName(); @@ -73,7 +73,7 @@ public static void setUpAll() { SWTBOT_KEYBOARD_LAYOUT = SWTBotPreferences.KEYBOARD_LAYOUT; } - @AfterClass + @AfterAll public static void tearDownAll() { SWTBotPreferences.KEYBOARD_STRATEGY = SWTBOT_KEYBOARD_STRATEGY; SWTBotPreferences.KEYBOARD_LAYOUT = SWTBOT_KEYBOARD_LAYOUT; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/AbstractElementInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/AbstractElementInfoTest.java index 6c9e023d2..8bd08744d 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/AbstractElementInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/AbstractElementInfoTest.java @@ -17,7 +17,7 @@ import org.eclipse.wb.internal.core.utils.check.AssertionFailedException; import org.eclipse.wb.tests.designer.tests.DesignerTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link AbstractElementInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/AbstractPaletteTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/AbstractPaletteTest.java index 797624423..86a309d74 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/AbstractPaletteTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/AbstractPaletteTest.java @@ -22,7 +22,7 @@ import org.eclipse.wb.tests.designer.swing.SwingModelTest; import org.apache.commons.lang3.StringUtils; -import org.junit.After; +import org.junit.jupiter.api.AfterEach; import javax.swing.JPanel; @@ -42,7 +42,7 @@ public abstract class AbstractPaletteTest extends SwingModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { removeToolkitExtension(); if (m_lastManager != null) { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/AttributesProvidersTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/AttributesProvidersTest.java index 21cfa7168..0af24f1a0 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/AttributesProvidersTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/AttributesProvidersTest.java @@ -20,7 +20,7 @@ import org.eclipse.core.runtime.IConfigurationElement; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.xml.sax.Attributes; import org.xml.sax.InputSource; import org.xml.sax.SAXException; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/CategoryCommandsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/CategoryCommandsTest.java index 0a2d412d6..e9ada88d9 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/CategoryCommandsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/CategoryCommandsTest.java @@ -23,7 +23,7 @@ import org.eclipse.wb.internal.core.editor.palette.command.ElementVisibilityCommand; import org.eclipse.wb.internal.core.utils.reflect.ReflectionUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/CategoryInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/CategoryInfoTest.java index 32f04d1c3..aa3aca931 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/CategoryInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/CategoryInfoTest.java @@ -17,7 +17,7 @@ import org.eclipse.wb.core.editor.palette.model.PaletteInfo; import org.eclipse.wb.core.editor.palette.model.entry.ComponentEntryInfo; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link CategoryInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/ChooseComponentEntryInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/ChooseComponentEntryInfoTest.java index 02b35fdbf..ec84d2d35 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/ChooseComponentEntryInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/ChooseComponentEntryInfoTest.java @@ -33,8 +33,8 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.concurrent.atomic.AtomicBoolean; @@ -211,7 +211,7 @@ public void accept(SWTBot bot) { */ @DisposeProjectAfter // Test may get stuck on the Linux build... - @Ignore + @Disabled @Test public void test_createTool_inProject_butNotInClassLoader() throws Exception { JavaInfo panel = parseEmptyPanel(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/ComponentCommandsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/ComponentCommandsTest.java index a408f6e4c..89c69687e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/ComponentCommandsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/ComponentCommandsTest.java @@ -26,7 +26,7 @@ import org.eclipse.wb.internal.core.editor.palette.command.EntryRemoveCommand; import org.eclipse.wb.internal.core.utils.reflect.ReflectionUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/ComponentEntryInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/ComponentEntryInfoTest.java index 3ff619954..5dda90980 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/ComponentEntryInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/ComponentEntryInfoTest.java @@ -55,7 +55,7 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.osgi.framework.Bundle; import java.util.Map; @@ -244,7 +244,7 @@ public void test_initialize_1_allDefaults() throws Exception { ComponentDescriptionHelper.getDescription(m_lastEditor, JPanel.class); CreationDescription creation = componentDescription.getCreation(null); assertEquals(creation.getDescription(), entry.getDescription()); - assertTrue("Same icons.", UiUtils.equals(creation.getIcon(), entry.getIcon())); + assertTrue(UiUtils.equals(creation.getIcon(), entry.getIcon()), "Same icons."); } } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/FactoryCommandsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/FactoryCommandsTest.java index 156eb5ff4..a74874357 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/FactoryCommandsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/FactoryCommandsTest.java @@ -23,7 +23,7 @@ import org.eclipse.wb.internal.core.editor.palette.model.entry.InstanceFactoryEntryInfo; import org.eclipse.wb.internal.core.editor.palette.model.entry.StaticFactoryEntryInfo; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for palette {@link FactoryEntryInfo} {@link Command}'s. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/InstanceFactoryEntryInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/InstanceFactoryEntryInfoTest.java index 619e780c7..ebccf347a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/InstanceFactoryEntryInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/InstanceFactoryEntryInfoTest.java @@ -28,7 +28,7 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/MarqueeSelectionToolEntryInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/MarqueeSelectionToolEntryInfoTest.java index 06b3d2954..5b8aeb417 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/MarqueeSelectionToolEntryInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/MarqueeSelectionToolEntryInfoTest.java @@ -16,7 +16,7 @@ import org.eclipse.wb.gef.graphical.tools.MarqueeSelectionTool; import org.eclipse.wb.tests.designer.tests.DesignerTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link MarqueeSelectionToolEntryInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/PaletteInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/PaletteInfoTest.java index c7f10aa7a..df276b74c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/PaletteInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/PaletteInfoTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.core.editor.palette.model.entry.ComponentEntryInfo; import org.eclipse.wb.tests.designer.tests.DesignerTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link PaletteInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/PaletteManagerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/PaletteManagerTest.java index c9c0748d8..4c4c2e320 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/PaletteManagerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/PaletteManagerTest.java @@ -36,7 +36,7 @@ import org.eclipse.jdt.core.JavaCore; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Map; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/PaletteTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/PaletteTests.java index 80d03e754..8d50843ad 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/PaletteTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/PaletteTests.java @@ -14,17 +14,16 @@ import org.eclipse.wb.core.editor.palette.model.PaletteInfo; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for {@link PaletteInfo}. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ AttributesProvidersTest.class, AbstractElementInfoTest.class, PaletteInfoTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/SelectionToolEntryInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/SelectionToolEntryInfoTest.java index 543c0eb9f..dd73ee411 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/SelectionToolEntryInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/SelectionToolEntryInfoTest.java @@ -16,7 +16,7 @@ import org.eclipse.wb.gef.graphical.tools.SelectionTool; import org.eclipse.wb.tests.designer.tests.DesignerTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link SelectionToolEntryInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/StaticFactoryEntryInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/StaticFactoryEntryInfoTest.java index f7e058e9c..8836ae039 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/StaticFactoryEntryInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/StaticFactoryEntryInfoTest.java @@ -29,7 +29,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link StaticFactoryEntryInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/TabOrderToolEntryInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/TabOrderToolEntryInfoTest.java index d11daeb1b..aab3387f3 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/TabOrderToolEntryInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/TabOrderToolEntryInfoTest.java @@ -28,7 +28,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.mockito.InOrder; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/ToolEntryInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/ToolEntryInfoTest.java index fd6f1b22f..26cd3c7a5 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/ToolEntryInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/ToolEntryInfoTest.java @@ -22,7 +22,7 @@ import org.eclipse.jface.resource.ImageDescriptor; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for abstract {@link ToolEntryInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/BrandingUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/BrandingUtilsTest.java index 1ab760384..7b8762da0 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/BrandingUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/BrandingUtilsTest.java @@ -16,8 +16,8 @@ import org.eclipse.wb.core.branding.IBrandingDescription; import org.eclipse.wb.tests.designer.tests.DesignerTestCase; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; /** * Test for {@link BrandingUtils}. @@ -32,7 +32,7 @@ public class BrandingUtilsTest extends DesignerTestCase { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { super.tearDown(); } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/CoreExceptionRewriterTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/CoreExceptionRewriterTest.java index f3e5aa003..b009ea5dc 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/CoreExceptionRewriterTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/CoreExceptionRewriterTest.java @@ -20,7 +20,7 @@ import org.eclipse.wb.os.OSSupportError; import org.eclipse.wb.tests.designer.tests.DesignerTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link CoreExceptionRewriter}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/DesignerExceptionTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/DesignerExceptionTest.java index 16eece34a..70d4542cd 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/DesignerExceptionTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/DesignerExceptionTest.java @@ -15,9 +15,8 @@ import org.eclipse.wb.internal.core.utils.exception.DesignerException; import org.eclipse.wb.internal.core.utils.exception.ICoreExceptionConstants; -import org.assertj.core.api.Assertions; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.lang.reflect.Field; @@ -26,7 +25,7 @@ * * @author scheglov_ke */ -public class DesignerExceptionTest extends Assert { +public class DesignerExceptionTest extends Assertions { private static final int CODE = 12345; private static final String PARAMETER_0 = "a"; private static final String PARAMETER_1 = "b"; @@ -42,7 +41,7 @@ public void test_1() { assertEquals(CODE, designerException.getCode()); { String[] parameters = designerException.getParameters(); - Assertions.assertThat(parameters).hasSize(1); + assertEquals(parameters.length, 1); assertSame(PARAMETER_0, parameters[0]); } } @@ -53,7 +52,7 @@ public void test_2() { assertEquals(CODE, designerException.getCode()); { String[] parameters = designerException.getParameters(); - Assertions.assertThat(parameters).hasSize(2); + assertEquals(parameters.length, 2); assertSame(PARAMETER_0, parameters[0]); assertSame(PARAMETER_1, parameters[1]); } @@ -67,7 +66,7 @@ public void test_all() { assertSame(cause, designerException.getCause()); { String[] parameters = designerException.getParameters(); - Assertions.assertThat(parameters).hasSize(1); + assertEquals(parameters.length, 1); assertSame(PARAMETER_0, parameters[0]); } } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/DesignerExceptionUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/DesignerExceptionUtilsTest.java index 7e0ec7d18..cb12c518c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/DesignerExceptionUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/DesignerExceptionUtilsTest.java @@ -23,8 +23,8 @@ import org.eclipse.wb.tests.designer.tests.DesignerTestCase; import org.assertj.core.api.Assertions; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; /** * Test for {@link DesignerExceptionUtils}. @@ -38,7 +38,7 @@ public class DesignerExceptionUtilsTest extends DesignerTestCase { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { DesignerExceptionUtils.flushErrorEntriesCache(); super.tearDown(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/EditorWarningTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/EditorWarningTest.java index 766aeec9a..5a285f677 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/EditorWarningTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/EditorWarningTest.java @@ -15,7 +15,7 @@ import org.eclipse.wb.internal.core.utils.state.EditorWarning; import org.eclipse.wb.tests.designer.tests.DesignerTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link EditorWarning}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ExternalFactoriesHelperTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ExternalFactoriesHelperTest.java index c48ab8c77..4f44da762 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ExternalFactoriesHelperTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ExternalFactoriesHelperTest.java @@ -24,8 +24,8 @@ import org.eclipse.swt.graphics.Image; import org.assertj.core.api.Assertions; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.osgi.framework.Bundle; import java.util.List; @@ -53,7 +53,7 @@ public void _test_exit() throws Exception { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { waitEventLoop(0); super.tearDown(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/GenericsUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/GenericsUtilsTest.java index fa8d9464a..b82decbae 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/GenericsUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/GenericsUtilsTest.java @@ -24,7 +24,7 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.lang.reflect.Method; import java.lang.reflect.Type; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/PairTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/PairTest.java index d370f58db..7a891c02d 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/PairTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/PairTest.java @@ -15,7 +15,7 @@ import org.eclipse.wb.internal.core.utils.Pair; import org.eclipse.wb.tests.designer.tests.DesignerTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link Pair}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/UtilTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/UtilTests.java index eae159dc6..c94cbea65 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/UtilTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/UtilTests.java @@ -25,15 +25,14 @@ import org.eclipse.wb.tests.designer.core.util.ui.MenuIntersectorTest; import org.eclipse.wb.tests.designer.core.util.xml.XmlTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ AssertTest.class, Base64UtilsTest.class, XmlWriterTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/XmlWriterTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/XmlWriterTest.java index 88d602f9a..649606f41 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/XmlWriterTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/XmlWriterTest.java @@ -15,7 +15,7 @@ import org.eclipse.wb.internal.core.utils.XmlWriter; import org.eclipse.wb.tests.designer.tests.DesignerTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.DataOutputStream; import java.io.StringWriter; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/AstEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/AstEditorTest.java index ce4d95f21..7ede05e4f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/AstEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/AstEditorTest.java @@ -87,9 +87,9 @@ import org.apache.commons.lang3.StringUtils; import org.assertj.core.api.Assertions; import org.assertj.core.util.Lists; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.List; @@ -107,7 +107,7 @@ public class AstEditorTest extends AbstractJavaTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject == null) { @@ -116,7 +116,7 @@ public void setUp() throws Exception { } @Override - @After + @AfterEach public void tearDown() throws Exception { super.tearDown(); DesignerPlugin.getActivePage().closeAllEditors(false); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/AstNodeUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/AstNodeUtilsTest.java index 1d3f816cd..e6f1b063e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/AstNodeUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/AstNodeUtilsTest.java @@ -63,8 +63,8 @@ import org.apache.commons.lang3.ArrayUtils; import org.assertj.core.api.Assertions; import org.assertj.core.util.Lists; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.lang.reflect.TypeVariable; import java.util.Arrays; @@ -86,7 +86,7 @@ public class AstNodeUtilsTest extends AbstractJavaTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject == null) { @@ -1316,7 +1316,7 @@ private static void assertHasMethods(List methods, Assertions.assertThat(actualSignatures).contains(expectedSignatures); // un-expected for (String unExpectedSignature : unExpectedSignatures) { - assertFalse("" + actualSignatures, actualSignatures.contains(unExpectedSignature)); + assertFalse(actualSignatures.contains(unExpectedSignature), "" + actualSignatures); } } @@ -1393,7 +1393,7 @@ private static void assertHasFields(List actualFields, Assertions.assertThat(actualNames).contains(expectedNames); // un-expected for (String unExpectedSignature : unExpectedNames) { - assertFalse("" + actualNames, actualNames.contains(unExpectedSignature)); + assertFalse(actualNames.contains(unExpectedSignature), "" + actualNames); } } @@ -1844,7 +1844,7 @@ private void check_getVariableDeclarationsAll(String[] lines, String[] expectedN // check declarations List declarations = AstNodeUtils.getVariableDeclarationsAll(typeDeclaration); - assertEquals("Wrong count of variables.", expectedNames.length, declarations.size()); + assertEquals(expectedNames.length, declarations.size(), "Wrong count of variables."); for (int i = 0; i < declarations.size(); i++) { VariableDeclaration declaration = declarations.get(i); assertEquals(declaration.getName().getIdentifier(), expectedNames[i]); @@ -1888,7 +1888,7 @@ private void check_getVariableDeclarationsAfter(String[] lines, // prepare shadowing declarations List declarations = AstNodeUtils.getVariableDeclarationsAfter(typeDeclaration, position); - assertEquals("Wrong count of shadowing variables.", expectedNames.length, declarations.size()); + assertEquals(expectedNames.length, declarations.size(), "Wrong count of shadowing variables."); for (int i = 0; i < declarations.size(); i++) { VariableDeclaration declaration = declarations.get(i); assertEquals(declaration.getName().getIdentifier(), expectedNames[i]); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/AstReflectionUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/AstReflectionUtilsTest.java index 6898ca833..80a638bbe 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/AstReflectionUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/AstReflectionUtilsTest.java @@ -25,8 +25,8 @@ import org.eclipse.jdt.core.dom.SimpleName; import org.eclipse.jdt.core.dom.SuperConstructorInvocation; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.lang.reflect.Constructor; import java.lang.reflect.Method; @@ -44,7 +44,7 @@ public class AstReflectionUtilsTest extends AbstractJavaTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject == null) { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/AstTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/AstTests.java index f408fc344..a271db032 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/AstTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/AstTests.java @@ -12,15 +12,14 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.core.util.ast; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ AstEditorTest.class, GathererTest.class, AstNodeUtilsTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/AstVisitorExTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/AstVisitorExTest.java index 876718f38..7193e6c04 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/AstVisitorExTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/AstVisitorExTest.java @@ -23,8 +23,8 @@ import org.eclipse.jdt.core.dom.TryStatement; import org.eclipse.jdt.core.dom.TypeDeclaration; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link AstVisitorEx}. @@ -38,7 +38,7 @@ public class AstVisitorExTest extends AbstractJavaTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject == null) { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/BindingsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/BindingsTest.java index bd5f9dc55..911a0841b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/BindingsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/BindingsTest.java @@ -41,9 +41,9 @@ import org.apache.commons.lang3.ArrayUtils; import org.assertj.core.api.Assertions; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.lang.reflect.Array; import java.lang.reflect.InvocationTargetException; @@ -62,7 +62,7 @@ public class BindingsTest extends AbstractJavaTest { // Project creation // //////////////////////////////////////////////////////////////////////////// - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { do_projectCreate(); } @@ -84,7 +84,7 @@ public void _test_exit() throws Exception { /** * Object type. */ - @Ignore + @Disabled @Test public void test_DesignerTypeBinding_1() throws Exception { String code = "private java.util.List foo() {return null;}"; @@ -94,7 +94,7 @@ public void test_DesignerTypeBinding_1() throws Exception { /** * Primitive type. */ - @Ignore + @Disabled @Test public void test_DesignerTypeBinding_2() throws Exception { String code = "private int foo() {return 0;}"; @@ -104,7 +104,7 @@ public void test_DesignerTypeBinding_2() throws Exception { /** * Array type. */ - @Ignore + @Disabled @Test public void test_DesignerTypeBinding_3() throws Exception { String code = "private int[] foo() {return null;}"; @@ -114,7 +114,7 @@ public void test_DesignerTypeBinding_3() throws Exception { /** * Inner type. */ - @Ignore + @Disabled @Test public void test_DesignerTypeBinding_4() throws Exception { String code = "class Foo {} private Foo foo() {return null;}"; @@ -307,7 +307,7 @@ private static void assert_TypeBinding_names(ITypeBinding binding, // DesignerPackageBinding // //////////////////////////////////////////////////////////////////////////// - @Ignore + @Disabled @Test public void test_DesignerPackageBinding() throws Exception { TypeDeclaration typeDeclaration = createTypeDeclaration_TestC(""); @@ -327,7 +327,7 @@ public void test_DesignerPackageBinding() throws Exception { /** * Basic test for {@link DesignerMethodBinding}. */ - @Ignore + @Disabled @Test public void test_DesignerMethodBinding_1() throws Exception { TypeDeclaration typeDeclaration = @@ -415,7 +415,7 @@ public void test_DesignerMethodBinding_removeParameterType() throws Exception { * When we remove parameter from generic {@link IMethodBinding} we should also update its * {@link IMethodBinding#getMethodDeclaration()}. */ - @Ignore + @Disabled @Test public void test_DesignerMethodBinding_removeParameterType_whenGenerics() throws Exception { createTypeDeclaration_TestC(getSourceDQ( @@ -447,7 +447,7 @@ public void test_DesignerMethodBinding_removeParameterType_whenGenerics() throws /** * Basic test for {@link DesignerVariableBinding}. */ - @Ignore + @Disabled @Test public void test_DesignerVariableBinding_1() throws Exception { TypeDeclaration typeDeclaration = createTypeDeclaration_TestC("private int m_value;"); @@ -500,7 +500,7 @@ public void test_DesignerVariableBinding_2() throws Exception { /** * Test for {@link BindingContext#getCopy(ITypeBinding)}. */ - @Ignore + @Disabled @Test public void test_getCopy() throws Exception { TypeDeclaration typeDeclaration = createTypeDeclaration_Test(""" @@ -603,9 +603,9 @@ private static void assert_sameProperties(Class clazz, private static void assert_equals(Method method, Object expectedValue, Object actualValue) { String message = "For method " + method; if (expectedValue == null) { - assertNull(message, actualValue); + assertNull(actualValue, message); } else if (expectedValue.getClass().isArray()) { - assertTrue(message, actualValue.getClass().isArray()); + assertTrue(actualValue.getClass().isArray(), message); int length = Array.getLength(expectedValue); for (int i = 0; i < length; i++) { Object expectedElement = Array.get(expectedValue, i); @@ -622,10 +622,10 @@ private static void assert_equals(Method method, Object expectedValue, Object ac getFullyQualifiedName((ITypeBinding) actualValue, false)); } else if (expectedValue instanceof IPackageBinding expectedPackage) { IPackageBinding actualPackage = (IPackageBinding) actualValue; - assertEquals(message, expectedPackage.getName(), actualPackage.getName()); - assertEquals(message, expectedPackage.isUnnamed(), actualPackage.isUnnamed()); + assertEquals(expectedPackage.getName(), actualPackage.getName(), message); + assertEquals(expectedPackage.isUnnamed(), actualPackage.isUnnamed(), message); } else { - assertEquals(message, expectedValue, actualValue); + assertEquals(expectedValue, actualValue, message); } } } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/GathererTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/GathererTest.java index 97ad56403..7c98a0129 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/GathererTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ast/GathererTest.java @@ -22,8 +22,8 @@ import org.eclipse.jdt.core.dom.VariableDeclaration; import org.eclipse.jdt.core.dom.VariableDeclarationFragment; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.Collection; import java.util.List; @@ -38,7 +38,7 @@ public class GathererTest extends AbstractJavaTest { // Project creation // //////////////////////////////////////////////////////////////////////////// - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { do_projectCreate(); } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/base64/Base64UtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/base64/Base64UtilsTest.java index 277fe5a5f..cf4dc2580 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/base64/Base64UtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/base64/Base64UtilsTest.java @@ -16,7 +16,7 @@ import org.eclipse.wb.tests.designer.tests.DesignerTestCase; import org.apache.commons.lang3.StringUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/check/AssertTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/check/AssertTest.java index b4800a752..154174e83 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/check/AssertTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/check/AssertTest.java @@ -16,14 +16,15 @@ import org.eclipse.wb.internal.core.utils.check.AssertionFailedException; import org.eclipse.wb.internal.core.utils.exception.DesignerException; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * Tests for {@link Assert}. * * @author scheglov_ke */ -public class AssertTest extends org.junit.Assert { +public class AssertTest extends Assertions { //////////////////////////////////////////////////////////////////////////// // // isLegal diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/execution/ExecutionUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/execution/ExecutionUtilsTest.java index f84febeac..cdc80eb64 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/execution/ExecutionUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/execution/ExecutionUtilsTest.java @@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.Display; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.beans.Beans; import java.util.concurrent.Callable; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/execution/NoOpProgressMonitorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/execution/NoOpProgressMonitorTest.java index 9833ec2ee..04636c4c0 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/execution/NoOpProgressMonitorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/execution/NoOpProgressMonitorTest.java @@ -15,7 +15,7 @@ import org.eclipse.wb.internal.core.utils.execution.NoOpProgressMonitor; import org.eclipse.wb.tests.designer.tests.DesignerTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link NoOpProgressMonitor}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/CodeUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/CodeUtilsTest.java index 4f6fbee03..3b9fbfdcb 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/CodeUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/CodeUtilsTest.java @@ -46,8 +46,8 @@ import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.assertj.core.api.Assertions; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.lang.reflect.InvocationTargetException; import java.util.List; @@ -64,7 +64,7 @@ public class CodeUtilsTest extends AbstractJavaTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject == null) { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/JavaDocUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/JavaDocUtilsTest.java index 385c9170c..ac339afb3 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/JavaDocUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/JavaDocUtilsTest.java @@ -23,9 +23,9 @@ import org.eclipse.jdt.core.dom.IMethodBinding; import org.eclipse.jdt.core.dom.TypeDeclaration; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * Tests for {@link JavaDocUtils}. @@ -39,7 +39,7 @@ public class JavaDocUtilsTest extends AbstractJavaTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject == null) { @@ -61,7 +61,7 @@ public void _test_exit() throws Exception { // getTooltip // //////////////////////////////////////////////////////////////////////////// - @Ignore + @Disabled @Test public void test_getTooltip_basic() throws Exception { TypeDeclaration typeDeclaration = createTypeDeclaration_Test(""" diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/JdtCoreTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/JdtCoreTests.java index 2715be9be..276802700 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/JdtCoreTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/JdtCoreTests.java @@ -12,15 +12,14 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.core.util.jdt.core; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ CodeUtilsTest.class, JavaDocUtilsTest.class, SubtypesScopeTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/ProjectUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/ProjectUtilsTest.java index ec4023892..8e17b9418 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/ProjectUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/ProjectUtilsTest.java @@ -41,9 +41,9 @@ import org.eclipse.jdt.core.JavaCore; import org.assertj.core.api.Assertions; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.osgi.framework.Bundle; import java.io.File; @@ -66,7 +66,7 @@ public class ProjectUtilsTest extends AbstractJavaTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject == null) { @@ -216,7 +216,7 @@ public void test_waitForAutoBuild() throws Exception { * Test for {@link ProjectUtils#ensureResourceType(IJavaProject, Bundle, String)}. */ @DisposeProjectAfter - @Ignore + @Disabled @Test public void test_ensureResourceType_existsButNotUpToDate() throws Exception { String managerClassName = "pkg.MyManager"; @@ -268,7 +268,7 @@ public void test_ensureResourceType_existsButNotUpToDate() throws Exception { * update it in required project; not generate new copy in given {@link IJavaProject}. */ @DisposeProjectAfter - @Ignore + @Disabled @Test public void test_ensureResourceType_existsInDifferentProject_butNotUpToDate() throws Exception { @@ -329,7 +329,7 @@ public void test_ensureResourceType_existsInDifferentProject_butNotUpToDate() * We should ignore {@link IType} if it is declared in binary file. */ @DisposeProjectAfter - @Ignore + @Disabled @Test public void test_ensureResourceType_binary() throws Exception { String managerClassName = "pkg.MyManager"; @@ -397,7 +397,7 @@ public void test_ensureResourceType_binary() throws Exception { * We should not try to update {@link IType} if it is in "read-only" unit. */ @DisposeProjectAfter - @Ignore + @Disabled @Test public void test_ensureResourceType_readOnly() throws Exception { String managerClassName = "pkg.MyManager"; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/SubtypesScopeTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/SubtypesScopeTest.java index 2a7c9b88f..b95308c0b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/SubtypesScopeTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/SubtypesScopeTest.java @@ -20,10 +20,10 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IType; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * Tests for {@link SubtypesScope}. @@ -43,7 +43,7 @@ public class SubtypesScopeTest extends AbstractJavaTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject != null) { @@ -76,7 +76,7 @@ public void setUp() throws Exception { // Project creation // //////////////////////////////////////////////////////////////////////////// - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { do_projectCreate(); } @@ -124,7 +124,7 @@ public void test_deprecated() throws Exception { assertTrue(scope.includesClasspaths()); } - @Ignore + @Disabled @Test public void test_otherScope() throws Exception { SubtypesScope scope2 = new SubtypesScope(javaProject.findType("java.util.List")); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/refactoring/RefactoringTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/refactoring/RefactoringTests.java index 97b334e0e..9804c60ef 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/refactoring/RefactoringTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/refactoring/RefactoringTests.java @@ -16,16 +16,15 @@ import org.eclipse.ltk.core.refactoring.Change; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for {@link ReflectionUtils} and its {@link Change}s. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ RefactoringUtilsTest.class }) +@Suite +@SelectClasses({ RefactoringUtilsTest.class }) public class RefactoringTests { } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/refactoring/RefactoringUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/refactoring/RefactoringUtilsTest.java index 658e139a0..6a80d894f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/refactoring/RefactoringUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/refactoring/RefactoringUtilsTest.java @@ -36,8 +36,8 @@ import static org.mockito.Mockito.when; import org.assertj.core.api.Assertions; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link RefactoringUtils}. @@ -53,7 +53,7 @@ public class RefactoringUtilsTest extends AbstractJavaTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject == null) { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/reflect/IntrospectionHelperTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/reflect/IntrospectionHelperTest.java index 690a3d07e..475706550 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/reflect/IntrospectionHelperTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/reflect/IntrospectionHelperTest.java @@ -15,7 +15,7 @@ import org.eclipse.wb.internal.core.utils.reflect.IntrospectionHelper; import org.eclipse.wb.tests.designer.tests.DesignerTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.beans.BeanDescriptor; import java.beans.Customizer; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/reflect/ReflectionUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/reflect/ReflectionUtilsTest.java index 997edb0d0..ac40086ea 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/reflect/ReflectionUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/reflect/ReflectionUtilsTest.java @@ -24,7 +24,7 @@ import net.bytebuddy.matcher.ElementMatchers; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.Component; import java.beans.BeanInfo; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ui/ImageUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ui/ImageUtilsTest.java index aec68368b..52f98ff63 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ui/ImageUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ui/ImageUtilsTest.java @@ -22,7 +22,7 @@ import org.eclipse.swt.graphics.Rectangle; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ui/MenuIntersectorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ui/MenuIntersectorTest.java index c76541dad..9de9ac42b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ui/MenuIntersectorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/ui/MenuIntersectorTest.java @@ -25,7 +25,7 @@ import org.eclipse.jface.action.Separator; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -170,16 +170,16 @@ public void run() { runExecuted_1[0] = false; runExecuted_2[0] = false; wrapperAction.runWithEvent(null); - assertTrue("action_1 executed", runExecuted_1[0]); - assertTrue("action_2 executed", runExecuted_2[0]); + assertTrue(runExecuted_1[0], "action_1 executed"); + assertTrue(runExecuted_2[0], "action_2 executed"); } // execute IAction using run() { runExecuted_1[0] = false; runExecuted_2[0] = false; wrapperAction.run(); - assertTrue("action_1 executed", runExecuted_1[0]); - assertTrue("action_2 executed", runExecuted_2[0]); + assertTrue(runExecuted_1[0], "action_1 executed"); + assertTrue(runExecuted_2[0], "action_2 executed"); } } @@ -226,8 +226,8 @@ public void run() { runExecuted_1[0] = false; runExecuted_2[0] = false; wrapperAction.run(); - assertTrue("action_1 executed", runExecuted_1[0]); - assertFalse("action_2 executed", runExecuted_2[0]); + assertTrue(runExecuted_1[0], "action_1 executed"); + assertFalse(runExecuted_2[0], "action_2 executed"); } } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/xml/QParserTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/xml/QParserTest.java index 64db03520..d884ff29f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/xml/QParserTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/xml/QParserTest.java @@ -20,9 +20,9 @@ import org.apache.commons.lang3.StringUtils; import org.assertj.core.api.Assertions; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.StringReader; import java.text.MessageFormat; @@ -53,7 +53,7 @@ public void _test_exit() throws Exception { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject == null) { @@ -62,7 +62,7 @@ public void setUp() throws Exception { } @Override - @After + @AfterEach public void tearDown() throws Exception { handler = null; super.tearDown(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/xml/XmlDocumentTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/xml/XmlDocumentTest.java index ecf26c6f0..a5461cf81 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/xml/XmlDocumentTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/xml/XmlDocumentTest.java @@ -30,9 +30,9 @@ import org.eclipse.jface.text.Document; import org.assertj.core.api.Assertions; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.PrintWriter; import java.io.StringWriter; @@ -64,7 +64,7 @@ public void _test_exit() throws Exception { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject == null) { @@ -73,7 +73,7 @@ public void setUp() throws Exception { } @Override - @After + @AfterEach public void tearDown() throws Exception { if (context != null) { context.disconnect(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/xml/XmlTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/xml/XmlTests.java index 04f03f2fa..f656758c9 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/xml/XmlTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/xml/XmlTests.java @@ -12,15 +12,14 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.core.util.xml; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ QParserTest.class, XmlDocumentTest.class }) diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/AstModelSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/AstModelSupportTest.java index 35ad5c67e..820bd40ca 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/AstModelSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/AstModelSupportTest.java @@ -25,8 +25,8 @@ import org.eclipse.jdt.core.dom.TypeDeclaration; import org.eclipse.jdt.core.dom.VariableDeclarationStatement; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.List; @@ -40,7 +40,7 @@ public class AstModelSupportTest extends AbstractJavaTest { // Project creation // //////////////////////////////////////////////////////////////////////////// - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { do_projectCreate(); } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/BindingTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/BindingTests.java index 9d5f433bf..2ee9b40d9 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/BindingTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/BindingTests.java @@ -25,16 +25,15 @@ import org.eclipse.wb.tests.designer.databinding.rcp.model.widgets.WidgetBindableTest; import org.eclipse.wb.tests.designer.databinding.rcp.model.widgets.WidgetObservableTest; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @author lobas_av * */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ AstModelSupportTest.class, UtilsTest.class, BeanBindableTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/JFaceDatabindingsFactoryTestRcp.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/JFaceDatabindingsFactoryTestRcp.java index 5478aef62..58b28451e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/JFaceDatabindingsFactoryTestRcp.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/JFaceDatabindingsFactoryTestRcp.java @@ -17,7 +17,7 @@ import org.eclipse.wb.internal.swt.model.widgets.CompositeInfo; import org.eclipse.wb.tests.designer.rcp.RcpModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author lobas_av diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/JFaceDatabindingsFactoryTestSwing.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/JFaceDatabindingsFactoryTestSwing.java index 2f9cf56ba..38e77b0ff 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/JFaceDatabindingsFactoryTestSwing.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/JFaceDatabindingsFactoryTestSwing.java @@ -17,7 +17,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author lobas_av diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/UtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/UtilsTest.java index eb25f9596..cb1208345 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/UtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/UtilsTest.java @@ -26,8 +26,8 @@ import org.eclipse.jdt.core.dom.Statement; import org.eclipse.jdt.core.dom.TypeDeclaration; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.List; @@ -41,7 +41,7 @@ public class UtilsTest extends AbstractJavaTest { // Project creation // //////////////////////////////////////////////////////////////////////////// - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { do_projectCreate(); } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/CodeGenerationTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/CodeGenerationTest.java index 89f43588c..5bcad7117 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/CodeGenerationTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/CodeGenerationTest.java @@ -84,7 +84,7 @@ import org.eclipse.jdt.core.dom.TypeDeclaration; import org.eclipse.swt.SWT; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -3117,7 +3117,7 @@ private static void assertStrategy(UpdateStrategyInfo strategy, assertEquals(expectedSourceCode, strategy.getSourceCode(lines, generationSupport)); assertEquals(expectedLines.length, lines.size()); for (int i = 0; i < expectedLines.length; i++) { - assertEquals("line:" + i, expectedLines[i], lines.get(i)); + assertEquals(expectedLines[i], lines.get(i), "line:" + i); } } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/DatabindingsProviderTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/DatabindingsProviderTest.java index 027ac15c4..8104548f9 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/DatabindingsProviderTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/DatabindingsProviderTest.java @@ -54,7 +54,7 @@ import org.eclipse.wb.tests.designer.core.model.util.MorphingSupportTest; import org.eclipse.wb.tests.designer.databinding.rcp.DatabindingTestUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/ReferenceProvidersTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/ReferenceProvidersTest.java index 8a5431b5a..777bcd2e6 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/ReferenceProvidersTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/ReferenceProvidersTest.java @@ -15,14 +15,14 @@ import org.eclipse.wb.internal.core.databinding.model.reference.CompoundReferenceProvider; import org.eclipse.wb.internal.core.databinding.model.reference.StringReferenceProvider; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author lobas_av * */ -public class ReferenceProvidersTest extends Assert { +public class ReferenceProvidersTest extends Assertions { @Test public void test_StringReferenceProvider() throws Exception { StringReferenceProvider referenceProvider = new StringReferenceProvider("test"); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/UiConfigurationTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/UiConfigurationTest.java index 563c94bdd..0e9c9375d 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/UiConfigurationTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/UiConfigurationTest.java @@ -37,7 +37,7 @@ import org.eclipse.swt.graphics.Image; import org.apache.commons.lang3.ArrayUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/beans/BeanBindableTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/beans/BeanBindableTest.java index dd36dd238..eb1715806 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/beans/BeanBindableTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/beans/BeanBindableTest.java @@ -26,7 +26,7 @@ import org.eclipse.wb.internal.swt.model.widgets.CompositeInfo; import org.eclipse.wb.tests.designer.databinding.rcp.model.AbstractBindingTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/beans/BeanObservableTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/beans/BeanObservableTest.java index e073fecc1..c0ac4ff5f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/beans/BeanObservableTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/beans/BeanObservableTest.java @@ -41,7 +41,7 @@ import org.eclipse.wb.tests.designer.databinding.rcp.DatabindingTestUtils; import org.eclipse.wb.tests.designer.databinding.rcp.model.AbstractBindingTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/context/BindListTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/context/BindListTest.java index 330d2f8a6..2a8b15956 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/context/BindListTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/context/BindListTest.java @@ -24,7 +24,7 @@ import org.eclipse.wb.tests.designer.databinding.rcp.DatabindingTestUtils; import org.eclipse.wb.tests.designer.databinding.rcp.model.AbstractBindingTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/context/BindSetTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/context/BindSetTest.java index ff7dbf3b3..2bf6700de 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/context/BindSetTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/context/BindSetTest.java @@ -24,7 +24,7 @@ import org.eclipse.wb.tests.designer.databinding.rcp.DatabindingTestUtils; import org.eclipse.wb.tests.designer.databinding.rcp.model.AbstractBindingTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/context/BindValueTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/context/BindValueTest.java index 0053c9aeb..eee0dbd5e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/context/BindValueTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/context/BindValueTest.java @@ -25,7 +25,7 @@ import org.eclipse.wb.tests.designer.databinding.rcp.DatabindingTestUtils; import org.eclipse.wb.tests.designer.databinding.rcp.model.AbstractBindingTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/widgets/ViewerObservableTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/widgets/ViewerObservableTest.java index 5a9967bae..4b4205bb5 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/widgets/ViewerObservableTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/widgets/ViewerObservableTest.java @@ -54,7 +54,7 @@ import org.eclipse.wb.tests.designer.databinding.rcp.DatabindingTestUtils; import org.eclipse.wb.tests.designer.databinding.rcp.model.AbstractBindingTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/widgets/WidgetBindableTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/widgets/WidgetBindableTest.java index 1417e9eff..f2cdbc687 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/widgets/WidgetBindableTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/widgets/WidgetBindableTest.java @@ -27,7 +27,7 @@ import org.eclipse.wb.internal.swt.model.widgets.ControlInfo; import org.eclipse.wb.tests.designer.databinding.rcp.model.AbstractBindingTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/widgets/WidgetObservableTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/widgets/WidgetObservableTest.java index cc9773d24..e8d12b2f9 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/widgets/WidgetObservableTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/model/widgets/WidgetObservableTest.java @@ -27,7 +27,7 @@ import org.eclipse.swt.SWT; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/swing/BindValueTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/swing/BindValueTest.java index 3a944160b..ac018f77d 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/swing/BindValueTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/swing/BindValueTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.internal.swing.databinding.model.bindings.UpdateStrategyInfo; import org.eclipse.wb.internal.swing.model.component.JPanelInfo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/swing/BindingTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/swing/BindingTests.java index f39e29bf1..6dfc48546 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/swing/BindingTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/swing/BindingTests.java @@ -12,16 +12,15 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.databinding.swing; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @author sablin_aa * */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ SwingDatabindingsFactoryTest.class, GenericUtilsTest.class, BindValueTest.class diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/swing/GenericUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/swing/GenericUtilsTest.java index 82d984b62..0a83961c7 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/swing/GenericUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/swing/GenericUtilsTest.java @@ -21,7 +21,7 @@ import org.eclipse.wb.internal.swing.databinding.model.generic.IGenericType; import org.eclipse.wb.internal.swing.model.component.JPanelInfo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/swing/SwingDatabindingsFactoryTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/swing/SwingDatabindingsFactoryTest.java index 04c2bd146..d1b45808f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/swing/SwingDatabindingsFactoryTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/swing/SwingDatabindingsFactoryTest.java @@ -18,8 +18,8 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; /** * @author sablin_aa @@ -31,7 +31,7 @@ public class SwingDatabindingsFactoryTest extends SwingModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { super.tearDown(); do_projectDispose(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/ComponentsPropertiesPageTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/ComponentsPropertiesPageTest.java index db427a5b5..884e82bd0 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/ComponentsPropertiesPageTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/ComponentsPropertiesPageTest.java @@ -24,7 +24,7 @@ import org.eclipse.wb.tests.designer.core.TestBundle; import org.eclipse.wb.tests.designer.swing.SwingGefTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/ComponentsTreePageTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/ComponentsTreePageTest.java index f3898ab2b..919e12870 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/ComponentsTreePageTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/ComponentsTreePageTest.java @@ -29,7 +29,7 @@ import org.eclipse.gef.commands.Command; import org.eclipse.jface.action.IAction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/ContentDescriberTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/ContentDescriberTest.java index b02876cee..e91a66272 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/ContentDescriberTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/ContentDescriberTest.java @@ -22,9 +22,9 @@ import org.eclipse.core.runtime.content.IContentType; import org.eclipse.ui.ide.IDE; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Test for {@link JavaSourceUiDescriber}. @@ -38,7 +38,7 @@ public class ContentDescriberTest extends AbstractJavaTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); DesignerPlugin.getPreferences().setValue(IPreferenceConstants.P_EDITOR_RECOGNIZE_GUI, true); @@ -48,7 +48,7 @@ public void setUp() throws Exception { } @Override - @After + @AfterEach public void tearDown() throws Exception { DesignerPlugin.getPreferences().setToDefault(IPreferenceConstants.P_EDITOR_RECOGNIZE_GUI); super.tearDown(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/DesignerEditorTestCase.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/DesignerEditorTestCase.java index 997466dff..0392e7e09 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/DesignerEditorTestCase.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/DesignerEditorTestCase.java @@ -61,18 +61,16 @@ import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.ide.IDE; -import junit.framework.TestCase; - import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import java.util.List; /** - * {@link TestCase} for {@link DesignPage} and its usage. + * test case for {@link DesignPage} and its usage. * * @author scheglov_ke */ @@ -83,7 +81,7 @@ public abstract class DesignerEditorTestCase extends AbstractJavaInfoRelatedTest // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); waitEventLoop(1); @@ -92,7 +90,7 @@ public void setUp() throws Exception { } @Override - @After + @AfterEach public void tearDown() throws Exception { try { System.clearProperty(DesignerPalette.FLAG_NO_PALETTE); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/EditorTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/EditorTests.java index fdd55b15c..ac40773db 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/EditorTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/EditorTests.java @@ -15,15 +15,14 @@ import org.eclipse.wb.tests.designer.editor.actions.DesignerEditorTests; import org.eclipse.wb.tests.designer.editor.validator.LayoutRequestValidatorTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ //basic policy TopSelectionEditPolicyTest.class, // basic features diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/JavaPropertiesToolBarContributorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/JavaPropertiesToolBarContributorTest.java index 8c0d91562..3944d1304 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/JavaPropertiesToolBarContributorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/JavaPropertiesToolBarContributorTest.java @@ -22,8 +22,8 @@ import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarButton; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * Test for {@link JavaPropertiesToolBarContributor}. @@ -91,7 +91,7 @@ public Test() { /** * Test for "Local to field" action. */ - @Ignore + @Disabled @Test public void test_convertLocalToField() throws Exception { openContainer(""" diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/ReparseOnModificationTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/ReparseOnModificationTest.java index d6c356dd8..7a88887ff 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/ReparseOnModificationTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/ReparseOnModificationTest.java @@ -23,7 +23,7 @@ import org.eclipse.jdt.ui.JavaUI; import org.eclipse.ui.IEditorPart; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for reparsing on dependency modification, for example modification of used component (it diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/SelectSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/SelectSupportTest.java index b4f44b785..9235b0b2b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/SelectSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/SelectSupportTest.java @@ -22,7 +22,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Control; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link SelectSupport}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/SplitModeTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/SplitModeTest.java index d5442befe..fbdf4eb5d 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/SplitModeTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/SplitModeTest.java @@ -20,9 +20,9 @@ import org.eclipse.jdt.core.IBuffer; import org.eclipse.jface.preference.IPreferenceStore; -import org.junit.After; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.awt.Component; @@ -38,7 +38,7 @@ public class SplitModeTest extends SwingGefTest { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { super.tearDown(); { @@ -63,7 +63,7 @@ public void _test_exit() throws Exception { // //////////////////////////////////////////////////////////////////////////// @Test - @Ignore + @Disabled public void test_reparse_afterDelay() throws Exception { IPreferenceStore preferences = DesignerPlugin.getPreferences(); preferences.setValue( diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/TopSelectionEditPolicyTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/TopSelectionEditPolicyTest.java index d155b4d17..3d45029e2 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/TopSelectionEditPolicyTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/TopSelectionEditPolicyTest.java @@ -20,7 +20,7 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link TopSelectionEditPolicy}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/UndoManagerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/UndoManagerTest.java index 77a193fb1..a92a0e0ed 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/UndoManagerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/UndoManagerTest.java @@ -50,9 +50,9 @@ import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; -import org.junit.After; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; @@ -73,7 +73,7 @@ public class UndoManagerTest extends SwingGefTest { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { super.tearDown(); { @@ -274,7 +274,7 @@ public Test() { /** * Sometimes expansion paths are remembered for wrong dump, so this causes later exception. */ - @Ignore + @Disabled @Test public void test_expandRemembered_bug_0() throws Exception { ContainerInfo frame = openContainer(""" @@ -597,7 +597,7 @@ public Test() { * exceptions. */ @DisposeProjectAfter - @Ignore + @Disabled @Test public void test_showDesign_rename() throws Exception { openContainer(""" diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/ActionsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/ActionsTest.java index 4a6f8459d..159d0b068 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/ActionsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/ActionsTest.java @@ -22,7 +22,7 @@ import org.eclipse.ui.ide.IDE; import org.eclipse.ui.texteditor.ITextEditor; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link IAction} management in {@link DesignerEditor}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/CopyActionTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/CopyActionTest.java index b5213e32f..d349dff57 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/CopyActionTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/CopyActionTest.java @@ -21,7 +21,7 @@ import org.eclipse.gef.EditPart; import org.eclipse.jface.action.IAction; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link CopyAction} and {@link PasteAction}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/CutActionTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/CutActionTest.java index af06c4e4d..08b106639 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/CutActionTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/CutActionTest.java @@ -19,8 +19,8 @@ import org.eclipse.jface.action.IAction; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * Test for {@link CutAction}. @@ -72,7 +72,7 @@ public Test() { /** * Test for cut/paste single component. */ - @Ignore + @Disabled @Test public void test_cutSingle() throws Exception { ContainerInfo panel = openContainer(""" diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/DeleteActionTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/DeleteActionTest.java index 620063620..f2fe76470 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/DeleteActionTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/DeleteActionTest.java @@ -24,7 +24,7 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.preference.IPreferenceStore; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link DeleteAction}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/DesignerEditorTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/DesignerEditorTests.java index ab2d1bae2..bddb21773 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/DesignerEditorTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/DesignerEditorTests.java @@ -12,15 +12,14 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.editor.actions; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ ActionsTest.class, DeleteActionTest.class, CopyActionTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/RefreshActionTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/RefreshActionTest.java index a221014b5..962978dc2 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/RefreshActionTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/RefreshActionTest.java @@ -18,7 +18,7 @@ import org.eclipse.jface.action.IAction; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link RefreshAction}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/SwitchActionTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/SwitchActionTest.java index 3eaa6ac0a..210d2b812 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/SwitchActionTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/actions/SwitchActionTest.java @@ -16,8 +16,8 @@ import org.eclipse.wb.internal.core.editor.multi.MultiMode; import org.eclipse.wb.tests.designer.swing.SwingGefTest; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * Test for {@link SwitchAction}. @@ -33,7 +33,7 @@ public class SwitchActionTest extends SwingGefTest { /** * Test for switching to source and back to design. */ - @Ignore + @Disabled @Test public void test_1() throws Exception { openContainer(""" diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/BorderOfChildLayoutRequestValidatorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/BorderOfChildLayoutRequestValidatorTest.java index 2236c3469..3b75df87d 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/BorderOfChildLayoutRequestValidatorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/BorderOfChildLayoutRequestValidatorTest.java @@ -21,7 +21,7 @@ import org.eclipse.draw2d.PositionConstants; import org.eclipse.jface.action.IAction; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test {@link BorderOfChildLayoutRequestValidator}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/CompatibleLayoutRequestValidatorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/CompatibleLayoutRequestValidatorTest.java index 0ee4eebc8..ee2e9cea4 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/CompatibleLayoutRequestValidatorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/CompatibleLayoutRequestValidatorTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.wb.internal.swing.model.component.ContainerInfo; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test {@link CompatibleLayoutRequestValidator}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/ComponentClassLayoutRequestValidatorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/ComponentClassLayoutRequestValidatorTest.java index a8cde65c7..f63a88d23 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/ComponentClassLayoutRequestValidatorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/ComponentClassLayoutRequestValidatorTest.java @@ -16,7 +16,7 @@ import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator; import org.eclipse.wb.internal.swing.model.component.ContainerInfo; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test {@link ComponentClassLayoutRequestValidator}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/LayoutRequestValidatorTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/LayoutRequestValidatorTests.java index 23da09ff5..88ec8e307 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/LayoutRequestValidatorTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/LayoutRequestValidatorTests.java @@ -14,17 +14,16 @@ import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for {@link ILayoutRequestValidator}. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ ModelClassLayoutRequestValidatorTest.class, ComponentClassLayoutRequestValidatorTest.class, CompatibleLayoutRequestValidatorTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/LayoutRequestValidatorsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/LayoutRequestValidatorsTest.java index 71a55c4a6..6425436c9 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/LayoutRequestValidatorsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/LayoutRequestValidatorsTest.java @@ -23,7 +23,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Objects; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/ModelClassLayoutRequestValidatorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/ModelClassLayoutRequestValidatorTest.java index 1a7e94bea..44947f2f8 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/ModelClassLayoutRequestValidatorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/ModelClassLayoutRequestValidatorTest.java @@ -17,7 +17,7 @@ import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.wb.internal.swing.model.component.ContainerInfo; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test {@link ModelClassLayoutRequestValidator}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/example/SwingExampleTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/example/SwingExampleTest.java index 561364a8c..7219ed0c0 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/example/SwingExampleTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/example/SwingExampleTest.java @@ -17,9 +17,9 @@ import org.eclipse.jdt.core.ICompilationUnit; import org.apache.commons.lang3.StringUtils; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.nio.file.Files; import java.nio.file.Path; @@ -33,14 +33,14 @@ public class SwingExampleTest extends DesignerEditorTestCase { private static final String PATH_PREFIX = "../examples/swing"; - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); do_projectCreate(); } - @After + @AfterEach @Override public void tearDown() throws Exception { do_projectDispose(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/RcpGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/RcpGefTest.java index a1dc25106..8b8734e58 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/RcpGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/RcpGefTest.java @@ -24,7 +24,7 @@ import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.swt.widgets.Button; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; /** * Abstract test for RCP in editor. @@ -38,7 +38,7 @@ public abstract class RcpGefTest extends DesignerEditorTestCase { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); configureDefaults(org.eclipse.wb.internal.rcp.ToolkitProvider.DESCRIPTION); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/RcpModelTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/RcpModelTest.java index fb8c55276..ab51d1efa 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/RcpModelTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/RcpModelTest.java @@ -22,8 +22,8 @@ import org.eclipse.jface.preference.IPreferenceStore; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; /** * Abstract super class for RCP tests. @@ -39,7 +39,7 @@ public abstract class RcpModelTest extends AbstractJavaInfoTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject == null) { @@ -56,7 +56,7 @@ protected void configureToolkits() { } @Override - @After + @AfterEach public void tearDown() throws Exception { configureDefaultPreferences(RcpToolkitDescription.INSTANCE.getPreferences()); super.tearDown(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/RcpTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/RcpTests.java index 2624bb545..f4bd0dffb 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/RcpTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/RcpTests.java @@ -20,17 +20,16 @@ import org.eclipse.wb.tests.designer.rcp.resource.ResourceTests; import org.eclipse.wb.tests.designer.rcp.swing2swt.Swing2SwtTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * All RCP tests. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ ModelTests.class, DescriptionTests.class, ResourceTests.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/description/DescriptionTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/description/DescriptionTests.java index 64f788a0b..08ef5321c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/description/DescriptionTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/description/DescriptionTests.java @@ -12,9 +12,8 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.rcp.description; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for component descriptions. @@ -22,8 +21,8 @@ * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ RcpDescriptionVersionsProviderFactoryTest.class }) public class DescriptionTests { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/description/RcpDescriptionVersionsProviderFactoryTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/description/RcpDescriptionVersionsProviderFactoryTest.java index 436a38f3a..5c9e87fbb 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/description/RcpDescriptionVersionsProviderFactoryTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/description/RcpDescriptionVersionsProviderFactoryTest.java @@ -21,8 +21,8 @@ import static org.assertj.core.data.MapEntry.entry; import org.assertj.core.api.Assertions; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.List; @@ -71,7 +71,7 @@ public void test_notRCP() throws Exception { Assertions.assertThat(providerFactory.getVersions(m_javaProject, m_lastLoader)).isEmpty(); } - @Ignore + @Disabled @Test public void test_37() throws Exception { parseComposite( diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/gef/ChangeLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/gef/ChangeLayoutTest.java index 97f3576b7..4e1f5b88b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/gef/ChangeLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/gef/ChangeLayoutTest.java @@ -20,7 +20,7 @@ import org.eclipse.gef.EditPolicy; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for changing layout and GEF. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/gef/GefTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/gef/GefTests.java index e9b98b0df..82bc3b126 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/gef/GefTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/gef/GefTests.java @@ -12,9 +12,8 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.rcp.gef; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for RCP GEF. @@ -22,8 +21,8 @@ * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ ChangeLayoutTest.class, ViewerColumnGefTest.class }) diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/gef/ViewerColumnGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/gef/ViewerColumnGefTest.java index 1c43e7eec..85a25da52 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/gef/ViewerColumnGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/gef/ViewerColumnGefTest.java @@ -16,7 +16,7 @@ import org.eclipse.wb.internal.swt.model.widgets.TableInfo; import org.eclipse.wb.tests.designer.rcp.RcpGefTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for changing layout and GEF. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/ModelTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/ModelTests.java index 0f5d35d65..a1519c2f3 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/ModelTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/ModelTests.java @@ -21,9 +21,8 @@ import org.eclipse.wb.tests.designer.rcp.model.util.UtilTests; import org.eclipse.wb.tests.designer.rcp.model.widgets.WidgetTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * RCP model tests. @@ -31,8 +30,8 @@ * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ WidgetTests.class, UtilTests.class, LayoutTests.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/e4/E4PartTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/e4/E4PartTest.java index 3357de0be..3030a5eab 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/e4/E4PartTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/e4/E4PartTest.java @@ -15,8 +15,8 @@ import org.eclipse.wb.internal.rcp.model.e4.E4PartInfo; import org.eclipse.wb.tests.designer.rcp.RcpModelTest; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Test for {@link E4PartInfo}. @@ -34,7 +34,7 @@ public void _test_exit() throws Exception { } @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); m_testProject.addPlugin("jakarta.annotation-api"); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/e4/E4Tests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/e4/E4Tests.java index 44b669d94..cd98a6b7b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/e4/E4Tests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/e4/E4Tests.java @@ -12,16 +12,15 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.rcp.model.e4; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for E4 models. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ E4PartTest.class }) +@Suite +@SelectClasses({ E4PartTest.class }) public class E4Tests { } \ No newline at end of file diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/AbstractFormsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/AbstractFormsTest.java index d943fdbdb..880793e9e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/AbstractFormsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/AbstractFormsTest.java @@ -16,10 +16,8 @@ import org.eclipse.wb.internal.core.model.creation.factory.InstanceFactoryInfo; import org.eclipse.wb.tests.designer.rcp.RcpModelTest; -import junit.framework.TestCase; - /** - * Abstract {@link TestCase} for all "Forms API" tests. + * Abstract test case for all "Forms API" tests. * * @author scheglov_ke */ diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/ColumnLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/ColumnLayoutTest.java index c5c808e27..a42db2fa7 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/ColumnLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/ColumnLayoutTest.java @@ -26,7 +26,7 @@ import org.eclipse.ui.forms.widgets.ColumnLayout; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/DetailsPageTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/DetailsPageTest.java index 3473c88eb..53905b1e3 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/DetailsPageTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/DetailsPageTest.java @@ -17,7 +17,7 @@ import org.eclipse.ui.forms.IDetailsPage; import org.eclipse.ui.forms.IManagedForm; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link DetailsPageInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/ExpandableCompositeTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/ExpandableCompositeTest.java index 653d1708a..f1f16c902 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/ExpandableCompositeTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/ExpandableCompositeTest.java @@ -17,7 +17,7 @@ import org.eclipse.wb.internal.swt.model.widgets.ControlInfo; import org.eclipse.wb.tests.designer.rcp.BTestUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link ExpandableCompositeInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/FormPageTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/FormPageTest.java index 39577a85d..54f27047e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/FormPageTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/FormPageTest.java @@ -19,7 +19,7 @@ import org.eclipse.ui.forms.editor.FormEditor; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link FormPageInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/FormTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/FormTest.java index 1734d1af5..5ebe94944 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/FormTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/FormTest.java @@ -30,7 +30,7 @@ import org.eclipse.ui.forms.widgets.FormToolkit; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/FormTextTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/FormTextTest.java index d4c3c6bec..22685a8d4 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/FormTextTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/FormTextTest.java @@ -19,7 +19,7 @@ import org.eclipse.ui.forms.widgets.FormText; import org.eclipse.ui.forms.widgets.FormToolkit; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link FormText}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/FormToolkitAccessTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/FormToolkitAccessTest.java index 31bfdb2c7..54f95066b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/FormToolkitAccessTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/FormToolkitAccessTest.java @@ -34,7 +34,7 @@ import org.eclipse.jdt.core.dom.Statement; import org.eclipse.jdt.core.dom.TypeDeclaration; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link FormToolkitAccess}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/FormToolkitTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/FormToolkitTest.java index 1431be35a..9722ab321 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/FormToolkitTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/FormToolkitTest.java @@ -27,7 +27,7 @@ import org.eclipse.ui.forms.widgets.FormToolkit; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/FormsTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/FormsTests.java index f791eab8b..9ba24ca15 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/FormsTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/FormsTests.java @@ -14,17 +14,16 @@ import org.eclipse.wb.tests.designer.rcp.model.forms.table.TableWrapLayoutTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for "Forms API" widgets. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ FormToolkitTest.class, FormTextTest.class, ExpandableCompositeTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/MasterDetailsBlockTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/MasterDetailsBlockTest.java index e88f175f7..fec4c5d6e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/MasterDetailsBlockTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/MasterDetailsBlockTest.java @@ -14,7 +14,7 @@ import org.eclipse.wb.internal.rcp.model.forms.MasterDetailsBlockInfo; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link MasterDetailsBlockInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/ScrolledFormTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/ScrolledFormTest.java index 570c763a2..6bed77116 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/ScrolledFormTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/ScrolledFormTest.java @@ -17,7 +17,7 @@ import org.eclipse.wb.internal.swt.model.widgets.ControlInfo; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/SectionPartTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/SectionPartTest.java index 85ccaddbf..ac00bb1db 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/SectionPartTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/SectionPartTest.java @@ -20,7 +20,7 @@ import org.eclipse.swt.graphics.Font; import org.eclipse.ui.forms.widgets.Section; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link SectionPartInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/SectionTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/SectionTest.java index eb4fffa2f..fb6044f38 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/SectionTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/SectionTest.java @@ -19,7 +19,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Section; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link SectionInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TabelWrapLayoutParametersTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TabelWrapLayoutParametersTest.java index 03275bca2..241a02cb3 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TabelWrapLayoutParametersTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TabelWrapLayoutParametersTest.java @@ -27,7 +27,7 @@ import org.eclipse.ui.forms.widgets.TableWrapData; import org.eclipse.ui.forms.widgets.TableWrapLayout; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link TableWrapLayout} and special parameters for grab/alignment. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapDataTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapDataTest.java index 7497e19bb..40bf47338 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapDataTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapDataTest.java @@ -29,7 +29,7 @@ import org.eclipse.ui.forms.widgets.TableWrapData; import org.eclipse.ui.forms.widgets.TableWrapLayout; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link TableWrapDataInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapLayoutClipboardTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapLayoutClipboardTest.java index f25d11c1b..d64df7bd9 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapLayoutClipboardTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapLayoutClipboardTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.internal.swt.model.widgets.CompositeInfo; import org.eclipse.wb.tests.designer.rcp.model.forms.AbstractFormsTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link TableWrapLayoutInfo} and copy/paste. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapLayoutExposedTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapLayoutExposedTest.java index 362436e9e..b61dbdac5 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapLayoutExposedTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapLayoutExposedTest.java @@ -24,7 +24,7 @@ import org.eclipse.wb.internal.swt.model.widgets.ControlInfo; import org.eclipse.wb.tests.designer.rcp.model.forms.AbstractFormsTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link TableWrapLayoutInfo} and exposed {@link ControlInfo}'s. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapLayoutGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapLayoutGefTest.java index b7099a330..36a32a5d6 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapLayoutGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapLayoutGefTest.java @@ -24,7 +24,7 @@ import org.eclipse.jface.action.IAction; import org.eclipse.ui.forms.widgets.TableWrapLayout; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link TableWrapLayout} in GEF. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapLayoutSelectionActionsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapLayoutSelectionActionsTest.java index 08175ad2c..9c7474522 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapLayoutSelectionActionsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapLayoutSelectionActionsTest.java @@ -21,7 +21,7 @@ import org.eclipse.jface.action.IAction; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapLayoutTest.java index 64e6d6ef6..afe7ef792 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapLayoutTest.java @@ -40,7 +40,7 @@ import org.eclipse.ui.forms.widgets.TableWrapData; import org.eclipse.ui.forms.widgets.TableWrapLayout; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapLayoutTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapLayoutTests.java index b4dd3c5cd..40133d4fe 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapLayoutTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/forms/table/TableWrapLayoutTests.java @@ -14,17 +14,16 @@ import org.eclipse.wb.internal.rcp.model.forms.layout.table.TableWrapLayoutInfo; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for {@link TableWrapLayoutInfo}. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ TableWrapDataTest.class, TableWrapLayoutSelectionActionsTest.class, TableWrapLayoutTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/AbstractColumnLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/AbstractColumnLayoutTest.java index 8e995f2c7..5d47ecaf1 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/AbstractColumnLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/AbstractColumnLayoutTest.java @@ -50,7 +50,7 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.Tree; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link AbstractColumnLayoutInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/ActionTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/ActionTest.java index 65d88a6f1..c7af924e2 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/ActionTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/ActionTest.java @@ -63,7 +63,7 @@ import org.eclipse.jface.window.ApplicationWindow; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/ApplicationWindowGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/ApplicationWindowGefTest.java index e5bcbaac2..6bc628dc5 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/ApplicationWindowGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/ApplicationWindowGefTest.java @@ -28,7 +28,7 @@ import org.eclipse.jface.window.Window; import org.eclipse.swt.widgets.Shell; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link ApplicationWindowInfo} in GEF. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/ApplicationWindowTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/ApplicationWindowTest.java index 16e3552cc..3283bdf18 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/ApplicationWindowTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/ApplicationWindowTest.java @@ -24,8 +24,8 @@ import org.eclipse.swt.widgets.Shell; import org.assertj.core.api.Assertions; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * Test for {@link ApplicationWindowInfo}. @@ -127,7 +127,7 @@ public void test_ignoreMethod_close() throws Exception { /** * Test for {@link IToolBarManager}. */ - @Ignore + @Disabled @Test public void test_managers_ToolBarManager() throws Exception { ApplicationWindowInfo window = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/CellEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/CellEditorTest.java index 7967e1c4b..345cdd523 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/CellEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/CellEditorTest.java @@ -20,7 +20,7 @@ import org.eclipse.jface.viewers.ComboBoxCellEditor; import org.eclipse.swt.widgets.Control; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link CellEditor} support. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/ComboViewerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/ComboViewerTest.java index 0f6297b52..fad67b2a0 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/ComboViewerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/ComboViewerTest.java @@ -18,7 +18,7 @@ import org.eclipse.swt.custom.CCombo; import org.eclipse.swt.widgets.Combo; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link ComboViewer}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/ControlDecorationTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/ControlDecorationTest.java index de888550a..31da87510 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/ControlDecorationTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/ControlDecorationTest.java @@ -26,8 +26,8 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.jface.fieldassist.ControlDecoration; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * Test for {@link ControlDecorationInfo}. @@ -80,7 +80,7 @@ public void test_parse() throws Exception { /** * Set real image for {@link ControlDecoration}, so it is used in UI and in presentation. */ - @Ignore + @Disabled @Test public void test_existingImage() throws Exception { CompositeInfo shell = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/CoolBarManagerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/CoolBarManagerTest.java index f6ee5ec45..ca06febad 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/CoolBarManagerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/CoolBarManagerTest.java @@ -28,8 +28,8 @@ import org.eclipse.jface.action.ToolBarManager; import org.assertj.core.api.Assertions; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * Test for {@link CoolBarManagerInfo}. @@ -209,7 +209,7 @@ public void test_addToolBarManager_notEmpty() throws Exception { /** * Test for using {@link ToolBarContributionItem}. */ - @Ignore + @Disabled @Test public void test_addToolBarManager_usingToolBarContributionItem() throws Exception { ApplicationWindowInfo window = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/DialogPageTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/DialogPageTest.java index 7a2399638..c0fd6761d 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/DialogPageTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/DialogPageTest.java @@ -20,7 +20,7 @@ import org.eclipse.jface.dialogs.DialogPage; import org.eclipse.swt.layout.FillLayout; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link DialogPageInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/DialogTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/DialogTest.java index edfbfb140..2176665fb 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/DialogTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/DialogTest.java @@ -50,8 +50,8 @@ import org.eclipse.swt.widgets.Shell; import org.assertj.core.api.Assertions; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -80,7 +80,7 @@ public void _test_exit() throws Exception { * {@link Dialog} with {@link Dialog#createDialogArea(Composite)} method.
* Parameter "parent" in createDialogArea() should not have layout. */ - @Ignore + @Disabled @Test public void test_0() throws Exception { DialogInfo dialog = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/DoubleFieldEditorEntryInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/DoubleFieldEditorEntryInfoTest.java index 7dc34450b..a684865fc 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/DoubleFieldEditorEntryInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/DoubleFieldEditorEntryInfoTest.java @@ -20,7 +20,7 @@ import org.eclipse.wb.internal.rcp.palette.DoubleFieldEditorEntryInfo; import org.eclipse.wb.tests.designer.rcp.RcpModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link DoubleFieldEditorEntryInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/FieldEditorLabelsConstantsPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/FieldEditorLabelsConstantsPropertyEditorTest.java index 795d87668..c2eee520a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/FieldEditorLabelsConstantsPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/FieldEditorLabelsConstantsPropertyEditorTest.java @@ -25,9 +25,9 @@ import org.apache.commons.lang3.StringUtils; import org.assertj.core.api.Assertions; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -44,7 +44,7 @@ public class FieldEditorLabelsConstantsPropertyEditorTest extends SwingModelTest // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // prepare JDT elements @@ -77,7 +77,7 @@ public void setUp() throws Exception { } @Override - @After + @AfterEach public void tearDown() throws Exception { super.tearDown(); // clean-up fields diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/FieldEditorPreferencePageGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/FieldEditorPreferencePageGefTest.java index b165d97ea..459fa7867 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/FieldEditorPreferencePageGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/FieldEditorPreferencePageGefTest.java @@ -18,7 +18,7 @@ import org.eclipse.jface.preference.FieldEditorPreferencePage; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link FieldEditorPreferencePage} in GEF. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/FieldEditorPreferencePageTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/FieldEditorPreferencePageTest.java index 712dbe187..367853200 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/FieldEditorPreferencePageTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/FieldEditorPreferencePageTest.java @@ -47,8 +47,8 @@ import org.assertj.core.api.Assertions; import org.assertj.core.util.Lists; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import java.io.ByteArrayOutputStream; import java.io.ObjectOutputStream; @@ -69,7 +69,7 @@ public class FieldEditorPreferencePageTest extends RcpModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { super.tearDown(); preferences.setToDefault(IPreferenceConstants.PREF_FIELD_USUAL_CODE); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/FieldLayoutPreferencePageTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/FieldLayoutPreferencePageTest.java index 2c88bce6d..b538b5e5d 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/FieldLayoutPreferencePageTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/FieldLayoutPreferencePageTest.java @@ -30,7 +30,7 @@ import org.assertj.core.api.Assertions; import org.assertj.core.util.Lists; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/GridLayoutFactoryTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/GridLayoutFactoryTest.java index 0684b518c..d03637055 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/GridLayoutFactoryTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/GridLayoutFactoryTest.java @@ -21,7 +21,7 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link GridLayoutFactory}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/JFaceTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/JFaceTests.java index f9412beb0..3c3f5dd2d 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/JFaceTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/JFaceTests.java @@ -12,17 +12,16 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.rcp.model.jface; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for RCP JFace models. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ TableViewerTest.class, TableViewerColumnTest.class, TreeViewerColumnTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/MenuManagerGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/MenuManagerGefTest.java index e1470d3a8..ef5cc009f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/MenuManagerGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/MenuManagerGefTest.java @@ -28,8 +28,8 @@ import org.eclipse.wb.tests.gef.GraphicalRobot; import org.assertj.core.api.Assertions; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; /** * Test for {@link MenuManagerInfo} in GEF. @@ -60,7 +60,7 @@ protected void fetchContentFields() { } @Override - @After + @AfterEach public void tearDown() throws Exception { menuTester = null; super.tearDown(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/MenuManagerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/MenuManagerTest.java index 8eb673e22..3a7ad221b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/MenuManagerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/MenuManagerTest.java @@ -36,7 +36,7 @@ import org.eclipse.swt.widgets.Menu; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/NoJFaceInClasspathTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/NoJFaceInClasspathTest.java index 9e79d04ba..837672aa0 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/NoJFaceInClasspathTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/NoJFaceInClasspathTest.java @@ -25,8 +25,8 @@ import org.eclipse.jdt.core.IJavaProject; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * If no JFace in classpath, in {@link IJavaProject}, then corresponding entries should no be @@ -50,7 +50,7 @@ public void _test_exit() throws Exception { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject == null) { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/PopupDialogTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/PopupDialogTest.java index c98217e99..1cab49776 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/PopupDialogTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/PopupDialogTest.java @@ -17,7 +17,7 @@ import org.eclipse.jface.dialogs.PopupDialog; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link PopupDialogInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/PreferencePageTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/PreferencePageTest.java index 1af456d4b..563c83f94 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/PreferencePageTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/PreferencePageTest.java @@ -17,7 +17,7 @@ import org.eclipse.wb.tests.designer.rcp.RcpModelTest; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link PreferencePageInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/TableViewerColumnTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/TableViewerColumnTest.java index 9e817c52c..2f3eafb95 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/TableViewerColumnTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/TableViewerColumnTest.java @@ -46,7 +46,7 @@ import static org.mockito.Mockito.verify; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/TableViewerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/TableViewerTest.java index 0525703d9..cf4574578 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/TableViewerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/TableViewerTest.java @@ -24,7 +24,7 @@ import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.widgets.Composite; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link TableViewer}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/TitleAreaDialogTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/TitleAreaDialogTest.java index 4a4b31446..0a67a5a9c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/TitleAreaDialogTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/TitleAreaDialogTest.java @@ -21,7 +21,7 @@ import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.swt.widgets.Composite; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link TitleAreaDialogInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/TreeViewerColumnTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/TreeViewerColumnTest.java index 4a3c7d1e0..66aa7b16d 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/TreeViewerColumnTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/TreeViewerColumnTest.java @@ -15,7 +15,7 @@ import org.eclipse.wb.internal.rcp.model.jface.viewers.ViewerColumnInfo; import org.eclipse.wb.tests.designer.rcp.RcpModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link ViewerColumnInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/WindowTopBoundsSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/WindowTopBoundsSupportTest.java index f12b09e9f..ea7767d79 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/WindowTopBoundsSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/WindowTopBoundsSupportTest.java @@ -19,7 +19,7 @@ import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.jface.window.Window; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link WindowTopBoundsSupport}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/WizardPageTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/WizardPageTest.java index 52eb4514d..9d2faf2c8 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/WizardPageTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/WizardPageTest.java @@ -29,7 +29,7 @@ import org.eclipse.swt.widgets.Shell; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/WizardTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/WizardTest.java index 5822442d8..b20edfb6c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/WizardTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/jface/WizardTest.java @@ -19,7 +19,7 @@ import org.eclipse.jface.wizard.Wizard; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link Wizard} support (rather not support). diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/AbsoluteLayoutGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/AbsoluteLayoutGefTest.java index 52908269e..cdc2ad522 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/AbsoluteLayoutGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/AbsoluteLayoutGefTest.java @@ -20,7 +20,7 @@ import org.eclipse.draw2d.PositionConstants; import org.eclipse.jface.action.IAction; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link AbsoluteLayoutInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/ControlSelectionPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/ControlSelectionPropertyEditorTest.java index a1053d441..dfaa50e9c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/ControlSelectionPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/ControlSelectionPropertyEditorTest.java @@ -15,8 +15,8 @@ import org.eclipse.wb.internal.swt.model.layout.form.ControlSelectionPropertyEditor; import org.eclipse.wb.tests.designer.rcp.RcpModelTest; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link ControlSelectionPropertyEditor}. @@ -30,7 +30,7 @@ public class ControlSelectionPropertyEditorTest extends RcpModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // prepare testing object diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/GridLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/GridLayoutTest.java index 3d1bdcdc1..421850d1b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/GridLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/GridLayoutTest.java @@ -29,7 +29,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.TableWrapLayout; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link GridLayoutInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/LayoutTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/LayoutTests.java index 6114d494f..902dbceab 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/LayoutTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/LayoutTests.java @@ -15,9 +15,8 @@ import org.eclipse.wb.internal.swt.model.layout.LayoutInfo; import org.eclipse.wb.tests.designer.rcp.model.layout.form.FormLayoutTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for RCP {@link LayoutInfo}'s. @@ -25,8 +24,8 @@ * @author scheglov_ke * @author mitin_aa */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ ControlSelectionPropertyEditorTest.class, FormLayoutTests.class, GridLayoutTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/StackLayoutGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/StackLayoutGefTest.java index 483cd6ba5..0cde6d79e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/StackLayoutGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/StackLayoutGefTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.internal.swt.model.widgets.ControlInfo; import org.eclipse.wb.tests.designer.rcp.RcpGefTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link StackLayoutInfo} in GEF. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/StackLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/StackLayoutTest.java index 920b41127..5dac9d516 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/StackLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/StackLayoutTest.java @@ -26,7 +26,7 @@ import org.eclipse.swt.custom.StackLayout; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/FormLayoutAlignmentDetectionTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/FormLayoutAlignmentDetectionTest.java index cf010d1d3..6beb092fe 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/FormLayoutAlignmentDetectionTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/FormLayoutAlignmentDetectionTest.java @@ -19,7 +19,7 @@ import org.eclipse.wb.internal.swt.model.widgets.ControlInfo; import org.eclipse.wb.tests.designer.rcp.RcpModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link FormLayoutInfoImplAutomatic}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/FormLayoutModelsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/FormLayoutModelsTest.java index 97b3d35c8..d2a9ec6e0 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/FormLayoutModelsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/FormLayoutModelsTest.java @@ -32,7 +32,7 @@ import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.layout.GridLayout; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link FormLayoutInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/FormLayoutMoveSingleResizableTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/FormLayoutMoveSingleResizableTest.java index 6dad188d6..19cb7ee5e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/FormLayoutMoveSingleResizableTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/FormLayoutMoveSingleResizableTest.java @@ -23,8 +23,8 @@ import org.eclipse.draw2d.geometry.Rectangle; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.List; @@ -47,7 +47,7 @@ public void _test_exit() throws Exception { * Freely moving single resizable component with attachment into different target sides, attached * to component. */ - @Ignore + @Disabled @Test public void test_move_to_leading_1_2component() throws Exception { prepareComponent(); @@ -178,7 +178,7 @@ public void test_move_to_leading_2_2component() throws Exception { /** * Freely moving single resizable component with attachment into different target sides. */ - @Ignore + @Disabled @Test public void test_move_to_leading_1() throws Exception { prepareComponent(); @@ -223,7 +223,7 @@ public void test_move_to_leading_1() throws Exception { /** * Freely moving single resizable component with attachment into reverse-different target sides. */ - @Ignore + @Disabled @Test public void test_move_to_leading_2() throws Exception { prepareComponent(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/FormLayoutMoveSingleWithBothSidesTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/FormLayoutMoveSingleWithBothSidesTest.java index 07cd5e520..bca57dc90 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/FormLayoutMoveSingleWithBothSidesTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/FormLayoutMoveSingleWithBothSidesTest.java @@ -21,8 +21,8 @@ import org.eclipse.draw2d.geometry.Rectangle; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.List; @@ -306,7 +306,7 @@ public void test_move_to_leading_keep_alignment_2component() throws Exception { /** * Freely moving single component in trailing with changing alignment. */ - @Ignore + @Disabled @Test public void test_move_to_trailing_change_alignment() throws Exception { prepareComponent(); @@ -395,7 +395,7 @@ public void test_move_to_leading_change_alignment() throws Exception { /** * Freely moving single component in trailing without changing alignment. */ - @Ignore + @Disabled @Test public void test_move_to_trailing_keep_alignment() throws Exception { prepareComponent(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/FormLayoutMoveSingleWithSingleSideTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/FormLayoutMoveSingleWithSingleSideTest.java index fd3e57b4e..b271350d7 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/FormLayoutMoveSingleWithSingleSideTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/FormLayoutMoveSingleWithSingleSideTest.java @@ -21,8 +21,8 @@ import org.eclipse.draw2d.geometry.Rectangle; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.List; @@ -395,7 +395,7 @@ public void test_move_to_trailing_no_constraints() throws Exception { /** * Freely moving single component in trailing with changing alignment. */ - @Ignore + @Disabled @Test public void test_move_to_trailing_change_alignment() throws Exception { prepareComponent(); @@ -480,7 +480,7 @@ public void test_move_to_leading_change_alignment() throws Exception { /** * Freely moving single component in trailing without changing alignment. */ - @Ignore + @Disabled @Test public void test_move_to_trailing_keep_alignment() throws Exception { prepareComponent(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/FormLayoutTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/FormLayoutTests.java index cf32b60db..836ab295a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/FormLayoutTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/FormLayoutTests.java @@ -17,9 +17,8 @@ import org.eclipse.swt.layout.FormLayout; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for {@link FormLayout}. @@ -27,8 +26,8 @@ * @author scheglov_ke * @author mitin_aa */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ FormLayoutMoveSingleResizableTest.class, FormLayoutMoveSingleWithSingleSideTest.class, FormLayoutMoveSingleWithBothSidesTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/gef/FormLayoutAlignmentTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/gef/FormLayoutAlignmentTest.java index 9d1574a4c..ee57e777d 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/gef/FormLayoutAlignmentTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/gef/FormLayoutAlignmentTest.java @@ -23,8 +23,8 @@ import org.eclipse.swt.widgets.Shell; import org.apache.commons.lang3.ArrayUtils; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -194,7 +194,7 @@ public void test_replicateWidth_leftRightAttached() throws Exception { } @Test - @Ignore + @Disabled public void test_replicateWidth_leftRightAttached_reverse() throws Exception { parse_twoButtons_typical(new String[]{ "left = new FormAttachment(0, 50);", diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/gef/FormLayoutMoveTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/gef/FormLayoutMoveTest.java index 0c3911abb..5ca73adac 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/gef/FormLayoutMoveTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/gef/FormLayoutMoveTest.java @@ -25,8 +25,8 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.assertj.core.api.Assertions; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * GEF tests for FormLayout support moving. @@ -49,7 +49,7 @@ public void _test_exit() throws Exception { // //////////////////////////////////////////////////////////////////////////// @Test - @Ignore + @Disabled public void test_move_with_both_sides_attached() throws Exception { CompositeInfo shell = openComposite( @@ -83,7 +83,7 @@ public void test_move_with_both_sides_attached() throws Exception { } @Test - @Ignore + @Disabled public void test_move_with_both_sides_attached_left_control_attached() throws Exception { prepareComponent(); CompositeInfo shell = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/property/AcceleratorPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/property/AcceleratorPropertyEditorTest.java index dec191512..6dbac5633 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/property/AcceleratorPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/property/AcceleratorPropertyEditorTest.java @@ -20,8 +20,8 @@ import org.eclipse.swt.SWT; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link AcceleratorPropertyEditor}. @@ -35,7 +35,7 @@ public class AcceleratorPropertyEditorTest extends RcpModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // prepare Control with "accelerator" property diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/property/CursorPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/property/CursorPropertyEditorTest.java index a1f2e77f6..2517dfd5a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/property/CursorPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/property/CursorPropertyEditorTest.java @@ -23,8 +23,8 @@ import org.eclipse.swt.graphics.Cursor; import org.eclipse.swt.widgets.Shell; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; /** * Tests for {@link CursorPropertyEditor}. @@ -40,7 +40,7 @@ public abstract class CursorPropertyEditorTest extends RcpModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_shell == null) { @@ -49,7 +49,7 @@ public void setUp() throws Exception { } @Override - @After + @AfterEach public void tearDown() throws Exception { super.tearDown(); ToolkitProvider.DESCRIPTION.getPreferences().setToDefault( diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/property/CursorPropertyEditorWithManagerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/property/CursorPropertyEditorWithManagerTest.java index be3d72ef7..e3ba87236 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/property/CursorPropertyEditorWithManagerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/property/CursorPropertyEditorWithManagerTest.java @@ -22,9 +22,9 @@ import org.eclipse.jface.resource.LocalResourceManager; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.List; @@ -40,7 +40,7 @@ public class CursorPropertyEditorWithManagerTest extends CursorPropertyEditorTes // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); ToolkitProvider.DESCRIPTION.getPreferences().setValue( @@ -49,7 +49,7 @@ public void setUp() throws Exception { } @Override - @After + @AfterEach public void tearDown() throws Exception { super.tearDown(); do_projectDispose(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/property/ImagePropertyEditorTestPlugin.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/property/ImagePropertyEditorTestPlugin.java index d3f1825f9..be589c0f8 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/property/ImagePropertyEditorTestPlugin.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/property/ImagePropertyEditorTestPlugin.java @@ -36,9 +36,9 @@ import org.eclipse.pde.core.plugin.IPluginModelBase; import org.eclipse.pde.core.plugin.PluginRegistry; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * Tests for {@link ImagePropertyEditor} with plugin images. @@ -52,7 +52,7 @@ public class ImagePropertyEditorTestPlugin extends ImagePropertyEditorTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject != null) { @@ -167,7 +167,7 @@ private void ensureResourceManagers() throws Exception { // PluginImagesRoot // //////////////////////////////////////////////////////////////////////////// - @Ignore + @Disabled @Test public void test_PluginImagesRoot() throws Exception { FilterConfigurer filterConfigurer = new FilterConfigurer(false, false, false, false); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/property/PropertyTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/property/PropertyTests.java index 9a2e23202..76f45d71d 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/property/PropertyTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/property/PropertyTests.java @@ -14,17 +14,16 @@ import org.eclipse.wb.internal.core.model.property.editor.PropertyEditor; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for RCP {@link PropertyEditor}'s. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ AcceleratorPropertyEditorTest.class, ImagePropertyEditorTestPlugin.class, CursorPropertyEditorWithManagerTest.class diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/AbstractPdeTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/AbstractPdeTest.java index 94ddbf71e..57511d957 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/AbstractPdeTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/AbstractPdeTest.java @@ -23,15 +23,13 @@ import org.eclipse.core.resources.IProject; import org.eclipse.pde.core.plugin.IPluginElement; -import junit.framework.TestCase; - -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import java.io.ByteArrayInputStream; /** - * Abstract {@link TestCase} for PDE related tests. + * Abstract test case for PDE related tests. * * @author scheglov_ke */ @@ -44,7 +42,7 @@ public abstract class AbstractPdeTest extends RcpModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); PdeProjectConversionUtils.convertToPDE(m_testProject.getProject(), null, "testplugin.Activator"); @@ -67,7 +65,7 @@ public void setUp() throws Exception { } @Override - @After + @AfterEach public void tearDown() throws Exception { m_project = null; m_utils = null; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/AbstractSplashHandlerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/AbstractSplashHandlerTest.java index ace3ae0c5..4572c671b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/AbstractSplashHandlerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/AbstractSplashHandlerTest.java @@ -17,7 +17,7 @@ import org.eclipse.wb.tests.designer.rcp.RcpModelTest; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link AbstractSplashHandlerInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/ActionBarAdvisorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/ActionBarAdvisorTest.java index f8bf83cb5..c0208cd43 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/ActionBarAdvisorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/ActionBarAdvisorTest.java @@ -31,7 +31,7 @@ import org.eclipse.ui.application.IWorkbenchWindowConfigurer; import org.apache.commons.lang3.NotImplementedException; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link ActionBarAdvisorInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/ActionFactoryTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/ActionFactoryTest.java index c3e1d1dcc..e81b67eba 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/ActionFactoryTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/ActionFactoryTest.java @@ -28,7 +28,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.actions.ActionFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link Action}'s from {@link ActionFactory}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/EditorPartTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/EditorPartTest.java index a085c0c4c..15bcd352c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/EditorPartTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/EditorPartTest.java @@ -31,7 +31,7 @@ import org.apache.commons.lang3.NotImplementedException; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link EditorPartInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/ExtensionElementPropertyTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/ExtensionElementPropertyTest.java index 0169bc138..d8200b901 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/ExtensionElementPropertyTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/ExtensionElementPropertyTest.java @@ -19,7 +19,7 @@ import org.eclipse.wb.internal.rcp.model.rcp.PdeUtils; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link ExtensionElementProperty}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/FilteredItemsSelectionDialogTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/FilteredItemsSelectionDialogTest.java index 90fb6adef..6986eb820 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/FilteredItemsSelectionDialogTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/FilteredItemsSelectionDialogTest.java @@ -15,7 +15,7 @@ import org.eclipse.wb.internal.rcp.model.jface.DialogInfo; import org.eclipse.wb.tests.designer.rcp.RcpModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for FilteredItemsSelectionDialog. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/MultiPageEditorPartTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/MultiPageEditorPartTest.java index 49649c722..64752485e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/MultiPageEditorPartTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/MultiPageEditorPartTest.java @@ -17,7 +17,7 @@ import org.eclipse.wb.internal.rcp.IExceptionConstants; import org.eclipse.wb.tests.designer.rcp.RcpModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for MultiPageEditorPart support (rather not support). diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/PageLayoutGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/PageLayoutGefTest.java index 31e3bef6a..96838bbb6 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/PageLayoutGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/PageLayoutGefTest.java @@ -16,7 +16,7 @@ import org.eclipse.wb.internal.rcp.model.rcp.perspective.PageLayoutInfo; import org.eclipse.wb.tests.designer.rcp.RcpGefTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link PageLayoutInfo} in GEF. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/PageLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/PageLayoutTest.java index 7bfa11435..726584d47 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/PageLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/PageLayoutTest.java @@ -55,7 +55,7 @@ import org.eclipse.ui.IPageLayout; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -2698,7 +2698,7 @@ public void test_palette() throws Exception { assertEquals("Other", category.getName()); } } - assertTrue("No 'Other' category", hasOther); + assertTrue(hasOther, "No 'Other' category"); } // check for "standard" Eclipse categories { @@ -2716,8 +2716,8 @@ public void test_palette() throws Exception { Assertions.assertThat(category.getEntries().size()).isGreaterThan(5); } } - assertTrue("No 'General' category", hasGeneral); - assertTrue("No 'Java' category", hasJava); + assertTrue(hasGeneral, "No 'General' category"); + assertTrue(hasJava, "No 'Java' category"); } } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/PageTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/PageTest.java index 5d21aff48..c63efc38d 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/PageTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/PageTest.java @@ -20,8 +20,8 @@ import org.eclipse.wb.tests.designer.rcp.RcpModelTest; import org.assertj.core.api.Assertions; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * Test for {@link PageInfo}. @@ -46,7 +46,7 @@ public void _test_exit() throws Exception { /** * Test for many elements of {@link PageInfo}. */ - @Ignore + @Disabled @Test public void test_Page() throws Exception { PageInfo page = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/PdeUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/PdeUtilsTest.java index 85a6c9d4c..46d0a6b24 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/PdeUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/PdeUtilsTest.java @@ -32,7 +32,7 @@ import org.apache.commons.io.FilenameUtils; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.util.HashMap; @@ -191,7 +191,7 @@ public void test_readOnly() throws Exception { IPluginElement element = m_utils.getExtensionElementById("org.eclipse.ui.views", "view", "id_1"); assertNull(PdeUtils.getAttribute(null, "nullElement")); - assertNull("id_1", PdeUtils.getAttribute(element, "noSuchAttribute")); + assertNull(PdeUtils.getAttribute(element, "noSuchAttribute"), "id_1"); assertEquals("id_1", PdeUtils.getAttribute(element, "id")); assertEquals("name 1", PdeUtils.getAttribute(element, "name")); assertEquals("C_1", PdeUtils.getAttribute(element, "class")); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/PropertyPageTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/PropertyPageTest.java index 6eb54c2fe..cb84aadde 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/PropertyPageTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/PropertyPageTest.java @@ -17,7 +17,7 @@ import org.eclipse.wb.tests.designer.rcp.RcpModelTest; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link PropertyPageInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/RcpWizardsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/RcpWizardsTest.java index cacc6bda3..21f54700a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/RcpWizardsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/RcpWizardsTest.java @@ -30,9 +30,9 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; import org.assertj.core.api.Assertions; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for RCP wizards, such as {@link ViewPart}. @@ -48,14 +48,14 @@ public class RcpWizardsTest extends RcpModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); m_packageFragment = m_testProject.getPackage("test"); } @Override - @After + @AfterEach public void tearDown() throws Exception { waitEventLoop(10); super.tearDown(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/TheRcpTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/TheRcpTests.java index 8c76eccf5..9b5881a09 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/TheRcpTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/TheRcpTests.java @@ -14,17 +14,16 @@ import org.eclipse.wb.tests.designer.WaitForMemoryProfilerTest; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for RCP models. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ PropertyPageTest.class, PdeUtilsTest.class, ExtensionElementPropertyTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/ViewCategoryPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/ViewCategoryPropertyEditorTest.java index ba3c8337a..ff070ce0f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/ViewCategoryPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/ViewCategoryPropertyEditorTest.java @@ -18,8 +18,8 @@ import org.eclipse.wb.tests.designer.core.PdeProjectConversionUtils; import org.eclipse.wb.tests.designer.rcp.RcpModelTest; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; /** * Test for {@link ViewCategoryPropertyEditor}. @@ -33,7 +33,7 @@ public class ViewCategoryPropertyEditorTest extends RcpModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { do_projectDispose(); super.tearDown(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/ViewPartGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/ViewPartGefTest.java index 00c6c7b50..b29cff5b2 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/ViewPartGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/ViewPartGefTest.java @@ -18,8 +18,8 @@ import org.eclipse.jface.action.IMenuManager; import org.eclipse.ui.part.ViewPart; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * Test for {@link ViewPartInfo} in GEF. @@ -38,7 +38,7 @@ public class ViewPartGefTest extends RcpGefTest { * popup should be on separate layer. So, this caused problems with count of children on content * figure. */ - @Ignore + @Disabled @Test public void test_withMenuManager() throws Exception { openJavaInfo( diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/ViewPartTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/ViewPartTest.java index cdc3ea1ff..a689b22ec 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/ViewPartTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/rcp/ViewPartTest.java @@ -34,8 +34,8 @@ import org.apache.commons.lang3.NotImplementedException; import org.assertj.core.api.Assertions; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * Test for {@link ViewPartInfo}. @@ -60,7 +60,7 @@ public void _test_exit() throws Exception { /** * Test for many elements of {@link ViewPartInfo}. */ - @Ignore + @Disabled @Test public void test_0() throws Exception { ViewPartInfo part = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/util/ActivatorImagesTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/util/ActivatorImagesTest.java index fee46e60a..54b2ac72a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/util/ActivatorImagesTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/util/ActivatorImagesTest.java @@ -22,7 +22,7 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Shell; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link Activator_getImages_ByteCodeProcessor}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/util/SurroundSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/util/SurroundSupportTest.java index 88fc5adeb..7062f40f4 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/util/SurroundSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/util/SurroundSupportTest.java @@ -41,8 +41,8 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Group; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; @@ -280,7 +280,7 @@ public void test_absolute_singleControl() throws Exception { /** * Single {@link ControlInfo} on {@link Group} with {@link AbsoluteLayoutInfo}. */ - @Ignore + @Disabled @Test public void test_absolute_singleControl_onGroup() throws Exception { CompositeInfo shell = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/util/UtilTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/util/UtilTests.java index 046d5e173..ee5e8d2c5 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/util/UtilTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/util/UtilTests.java @@ -12,17 +12,16 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.rcp.model.util; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * RCP utils tests. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ SurroundSupportTest.class, ActivatorImagesTest.class }) diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/AsyncMessagesSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/AsyncMessagesSupportTest.java index eded030d0..0c35f95e8 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/AsyncMessagesSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/AsyncMessagesSupportTest.java @@ -19,7 +19,7 @@ import org.eclipse.wb.internal.swt.utils.AsyncMessagesSupport; import org.eclipse.wb.tests.designer.rcp.RcpModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link AsyncMessagesSupport}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/CBannerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/CBannerTest.java index 8ee3bb909..3c14c4595 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/CBannerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/CBannerTest.java @@ -16,7 +16,7 @@ import org.eclipse.wb.internal.swt.model.widgets.CompositeInfo; import org.eclipse.wb.tests.designer.rcp.RcpModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link CBannerInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/CTabFolderTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/CTabFolderTest.java index cc282b3de..ca8983ecd 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/CTabFolderTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/CTabFolderTest.java @@ -28,7 +28,7 @@ import org.eclipse.swt.custom.CTabItem; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ControlTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ControlTest.java index 80b9697b4..d3841fb9c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ControlTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ControlTest.java @@ -12,7 +12,6 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.rcp.model.widgets; -import org.eclipse.wb.internal.core.EnvironmentUtils; import org.eclipse.wb.internal.core.model.description.ComponentDescription; import org.eclipse.wb.internal.core.model.property.Property; import org.eclipse.wb.internal.core.model.property.editor.string.StringPropertyEditor; @@ -45,11 +44,9 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.TabFolder; -import static org.junit.Assume.assumeTrue; - import org.assertj.core.api.Assertions; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.List; @@ -75,11 +72,11 @@ public void _test_exit() throws Exception { //////////////////////////////////////////////////////////////////////////// @Test public void test_parse() throws Exception { - assumeTrue(EnvironmentUtils.IS_WINDOWS); CompositeInfo shell = parseComposite( "public class Test extends Shell {", " public Test() {", + " super(SWT.NONE);", " setSize(450, 300);", " Button button = new Button(this, SWT.NONE);", " button.setBounds(10, 20, 50, 30);", @@ -342,7 +339,7 @@ public void test_parseSeparate_ClassInstanceCreation() throws Exception { /** * Test for {@link CompositeInfo#getClientAreaInsets2()}. */ - @Ignore + @Disabled @Test public void test_insetsWithGroup() throws Exception { CompositeInfo shell = @@ -694,7 +691,7 @@ public void test_inAbsoluteLayout_tabFolder() throws Exception { * We should correctly handle bounds for {@link Control}s on {@link Composite} with * {@link SWT#RIGHT_TO_LEFT} style. */ - @Ignore + @Disabled @Test public void test_RTL() throws Exception { CompositeInfo composite = @@ -742,7 +739,7 @@ public void test_RTL() throws Exception { /** * Two levels of {@link Composite} with {@link SWT#RIGHT_TO_LEFT} style. */ - @Ignore + @Disabled @Test public void test_RTL_withInnerComposite() throws Exception { CompositeInfo composite = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/CoolBarGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/CoolBarGefTest.java index ef492d436..b1e601aea 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/CoolBarGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/CoolBarGefTest.java @@ -16,7 +16,7 @@ import org.eclipse.wb.internal.rcp.model.widgets.CoolBarInfo; import org.eclipse.wb.tests.designer.rcp.RcpGefTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link CoolBarInfo} in GEF. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/CoolBarTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/CoolBarTest.java index ed605d41c..2e103202e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/CoolBarTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/CoolBarTest.java @@ -27,7 +27,7 @@ import org.eclipse.swt.widgets.CoolItem; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/DialogTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/DialogTest.java index f14a95fd8..4cadf264f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/DialogTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/DialogTest.java @@ -28,7 +28,7 @@ import org.eclipse.swt.widgets.Dialog; import org.eclipse.swt.widgets.Shell; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link DialogInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/DialogTopBoundsSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/DialogTopBoundsSupportTest.java index 36b1763e0..08e4d7cad 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/DialogTopBoundsSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/DialogTopBoundsSupportTest.java @@ -19,7 +19,7 @@ import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.swt.widgets.Dialog; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link DialogTopBoundsSupport}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/DragSourceTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/DragSourceTest.java index 80f86f390..58390d09b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/DragSourceTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/DragSourceTest.java @@ -17,7 +17,7 @@ import org.eclipse.wb.tests.designer.rcp.RcpModelTest; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link DragSourceInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/DropTargetTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/DropTargetTest.java index 9402a844c..b3f4809be 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/DropTargetTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/DropTargetTest.java @@ -17,7 +17,7 @@ import org.eclipse.wb.tests.designer.rcp.RcpModelTest; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link DropTargetInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ExpandBarTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ExpandBarTest.java index 59e7b80cd..4765a7e85 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ExpandBarTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ExpandBarTest.java @@ -24,8 +24,8 @@ import org.eclipse.swt.widgets.ExpandItem; import org.assertj.core.api.Assertions; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.List; @@ -53,7 +53,7 @@ public void _test_exit() throws Exception { * {@link ExpandBar} with {@link ExpandItem}'s. */ // Disabled because of https://github.com/eclipse-windowbuilder/windowbuilder/issues/389 - @Ignore + @Disabled @Test public void test_parseItems() throws Exception { CompositeInfo shell = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/LabelTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/LabelTest.java index 75280ad62..eaf9dd389 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/LabelTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/LabelTest.java @@ -21,7 +21,7 @@ import org.eclipse.swt.widgets.Label; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link Label}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/MorphingSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/MorphingSupportTest.java index c89f510e9..18be9163a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/MorphingSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/MorphingSupportTest.java @@ -21,7 +21,7 @@ import org.eclipse.jdt.core.dom.Expression; import org.eclipse.swt.widgets.Group; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link MorphingSupport} and RCP. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/SashFormTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/SashFormTest.java index 2ae47f119..c6e839022 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/SashFormTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/SashFormTest.java @@ -23,8 +23,8 @@ import org.eclipse.swt.custom.SashForm; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * Test for {@link SashFormInfo}. @@ -399,7 +399,7 @@ public void test_DELETE() throws Exception { /** * Test for {@link SashFormInfo#command_RESIZE(ControlInfo, int)}. */ - @Ignore + @Disabled @Test public void test_RESIZE() throws Exception { CompositeInfo shell = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ScrolledCompositeTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ScrolledCompositeTest.java index d81795de6..e1f78328e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ScrolledCompositeTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ScrolledCompositeTest.java @@ -21,7 +21,7 @@ import org.eclipse.wb.tests.designer.rcp.RcpModelTest; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link ScrolledCompositeInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/SwtAwtTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/SwtAwtTest.java index f17b2a50b..6d5d2115f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/SwtAwtTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/SwtAwtTest.java @@ -25,8 +25,8 @@ import org.eclipse.swt.awt.SWT_AWT; import org.eclipse.swt.widgets.Composite; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.awt.Component; @@ -61,7 +61,7 @@ protected void configureToolkits() { // Parse // //////////////////////////////////////////////////////////////////////////// - @Ignore + @Disabled @Test public void test_parse() throws Exception { CompositeInfo shell = @@ -103,7 +103,7 @@ public void test_parse() throws Exception { } } - @Ignore + @Disabled @Test public void test_parseWithBorder() throws Exception { CompositeInfo shell = @@ -136,7 +136,7 @@ public void test_parseWithBorder() throws Exception { * https://bugs.eclipse.org/bugs/show_bug.cgi?id=355351 */ // Test gets stuck during the Linux build... - @Ignore + @Disabled @Test public void test_parseWhenZeroSize() throws Exception { CompositeInfo shell = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TabFolderGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TabFolderGefTest.java index 96fe39f5f..55360bf69 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TabFolderGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TabFolderGefTest.java @@ -21,7 +21,7 @@ import org.eclipse.draw2d.PositionConstants; import org.eclipse.swt.widgets.TabItem; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link TabFolderInfo} in GEF. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TabFolderTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TabFolderTest.java index e330fc603..464977c17 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TabFolderTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TabFolderTest.java @@ -29,7 +29,7 @@ import org.eclipse.swt.widgets.TabItem; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TabOrderPropertyTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TabOrderPropertyTest.java index 25d215e50..781be20ac 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TabOrderPropertyTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TabOrderPropertyTest.java @@ -17,7 +17,7 @@ import org.eclipse.wb.internal.swt.model.widgets.CompositeInfo; import org.eclipse.wb.tests.designer.rcp.RcpModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link TabOrderProperty}, RCP variant. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TableGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TableGefTest.java index 67d3bee12..b149e7a95 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TableGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TableGefTest.java @@ -18,8 +18,8 @@ import org.eclipse.draw2d.PositionConstants; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * Test for {@link TableInfo} in GEF. @@ -42,7 +42,7 @@ public void _test_exit() throws Exception { // //////////////////////////////////////////////////////////////////////////// // Disabled because of https://github.com/eclipse-windowbuilder/windowbuilder/issues/389 - @Ignore + @Disabled @Test public void test_canvas_CREATE_column() throws Exception { openJavaInfo( @@ -83,7 +83,7 @@ public void test_canvas_CREATE_column() throws Exception { } // Test get stuck during the Linux build... - @Ignore + @Disabled @Test public void test_canvas_MOVE_column() throws Exception { openJavaInfo( @@ -128,7 +128,7 @@ public void test_canvas_MOVE_column() throws Exception { } // Disabled because of https://github.com/eclipse-windowbuilder/windowbuilder/issues/389 - @Ignore + @Disabled @Test public void test_canvas_RESIZE_column() throws Exception { openJavaInfo( diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TableTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TableTest.java index 8fa7511e1..281eb2f1f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TableTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TableTest.java @@ -20,7 +20,7 @@ import org.eclipse.swt.widgets.Table; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for "big" SWT {@link Table}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ToolBarGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ToolBarGefTest.java index bc60952e5..836d6a61b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ToolBarGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ToolBarGefTest.java @@ -16,7 +16,7 @@ import org.eclipse.wb.internal.rcp.model.widgets.ToolBarInfo; import org.eclipse.wb.tests.designer.rcp.RcpGefTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link ToolBarInfo} in GEF. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ToolBarTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ToolBarTest.java index d11ab5a68..acd9e6332 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ToolBarTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ToolBarTest.java @@ -27,7 +27,7 @@ import org.eclipse.swt.widgets.ToolItem; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TrayItemTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TrayItemTest.java index 48a9923f4..c2e58ffae 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TrayItemTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TrayItemTest.java @@ -19,7 +19,7 @@ import org.eclipse.swt.widgets.TrayItem; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test {@link TrayItemInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TreeGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TreeGefTest.java index 68fc274fb..5fece2ac0 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TreeGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TreeGefTest.java @@ -18,7 +18,7 @@ import org.eclipse.draw2d.PositionConstants; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link TreeInfo} in GEF. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TreeTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TreeTest.java index 32a07dbd0..79099478e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TreeTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/TreeTest.java @@ -25,8 +25,8 @@ import org.eclipse.swt.widgets.TreeColumn; import org.assertj.core.api.Assertions; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.List; @@ -55,7 +55,7 @@ public void _test_exit() throws Exception { /** * Test for parsing {@link TreeColumn} and bounds of {@link TreeColumnInfo}. */ - @Ignore + @Disabled @Test public void test_TreeColumn() throws Exception { CompositeInfo shell = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ViewFormGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ViewFormGefTest.java index 3200cc19a..2b61aff56 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ViewFormGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ViewFormGefTest.java @@ -17,7 +17,7 @@ import org.eclipse.wb.internal.swt.model.widgets.ControlInfo; import org.eclipse.wb.tests.designer.rcp.RcpGefTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link ViewFormInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ViewFormTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ViewFormTest.java index 0d973fa8d..aa1878194 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ViewFormTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/ViewFormTest.java @@ -30,7 +30,7 @@ import org.eclipse.swt.widgets.Control; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/WidgetTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/WidgetTests.java index ad5fa984d..77cf81720 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/WidgetTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/widgets/WidgetTests.java @@ -12,17 +12,16 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.rcp.model.widgets; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for RCP widgets models. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ ControlTest.class, AsyncMessagesSupportTest.class, TabOrderPropertyTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/nebula/CollapsibleButtonsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/nebula/CollapsibleButtonsTest.java index 29b65d089..6ae8463bf 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/nebula/CollapsibleButtonsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/nebula/CollapsibleButtonsTest.java @@ -21,7 +21,7 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link CollapsibleButtonsInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/nebula/GalleryTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/nebula/GalleryTest.java index c1b80fa50..0ec56a45f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/nebula/GalleryTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/nebula/GalleryTest.java @@ -19,7 +19,7 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link GalleryInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/nebula/GanttChartTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/nebula/GanttChartTest.java index a861a9ca4..bbb975ddb 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/nebula/GanttChartTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/nebula/GanttChartTest.java @@ -18,7 +18,7 @@ import org.eclipse.nebula.widgets.ganttchart.GanttChart; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link GanttChart} items models. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/nebula/GridTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/nebula/GridTest.java index daee33128..dd1bf6188 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/nebula/GridTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/nebula/GridTest.java @@ -27,7 +27,7 @@ import net.miginfocom.layout.Grid; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link Grid} items models. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/nebula/NebulaTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/nebula/NebulaTests.java index 42b63ac3d..72e792dd4 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/nebula/NebulaTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/nebula/NebulaTests.java @@ -12,17 +12,16 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.rcp.nebula; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for Nebula widgets models. * * @author sablin_aa */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ CollapsibleButtonsTest.class, GalleryTest.class, GanttChartTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/nebula/PShelfTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/nebula/PShelfTest.java index fea996a7f..71aef0e85 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/nebula/PShelfTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/nebula/PShelfTest.java @@ -21,7 +21,7 @@ import org.eclipse.nebula.widgets.pshelf.PShelf; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link PShelfInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/resource/ResourceManagerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/resource/ResourceManagerTest.java index 4dde51edc..53d610957 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/resource/ResourceManagerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/resource/ResourceManagerTest.java @@ -25,7 +25,7 @@ import org.eclipse.swt.graphics.Image; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/resource/ResourceTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/resource/ResourceTests.java index abcb4a59d..80eb0c937 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/resource/ResourceTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/resource/ResourceTests.java @@ -12,16 +12,15 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.rcp.resource; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for RCP resource managers. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ ResourceManagerTest.class }) +@Suite +@SelectClasses({ ResourceManagerTest.class }) public class ResourceTests { } \ No newline at end of file diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/swing2swt/BorderLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/swing2swt/BorderLayoutTest.java index 65defa66e..8bfdafb36 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/swing2swt/BorderLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/swing2swt/BorderLayoutTest.java @@ -23,7 +23,7 @@ import org.eclipse.swt.widgets.Control; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test {@link BorderLayoutInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/swing2swt/BoxLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/swing2swt/BoxLayoutTest.java index 1795f655f..5ffdc0b9d 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/swing2swt/BoxLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/swing2swt/BoxLayoutTest.java @@ -17,7 +17,7 @@ import org.eclipse.wb.internal.swt.model.widgets.CompositeInfo; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.BoxLayout; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/swing2swt/FlowLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/swing2swt/FlowLayoutTest.java index efd2dc1dc..e776f17e3 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/swing2swt/FlowLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/swing2swt/FlowLayoutTest.java @@ -17,7 +17,7 @@ import org.eclipse.wb.internal.swt.model.widgets.CompositeInfo; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test {@link FlowLayoutInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/swing2swt/Swing2SwtTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/swing2swt/Swing2SwtTests.java index 330e34661..38b73388c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/swing2swt/Swing2SwtTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/swing2swt/Swing2SwtTests.java @@ -12,9 +12,8 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.rcp.swing2swt; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for Swing2SWT. @@ -22,8 +21,8 @@ * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ BoxLayoutTest.class, FlowLayoutTest.class, BorderLayoutTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/ConvertersTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/ConvertersTest.java index cd552d771..1a5f0c54b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/ConvertersTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/ConvertersTest.java @@ -23,7 +23,7 @@ import org.eclipse.wb.tests.designer.Expectations.StrValue; import org.eclipse.wb.tests.designer.tests.DesignerTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.EventQueue; import java.awt.SystemColor; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/CustomizeTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/CustomizeTest.java index 06cfd4e41..411fab0f9 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/CustomizeTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/CustomizeTest.java @@ -24,7 +24,7 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Support "Customize" tests. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/SwingGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/SwingGefTest.java index 2b68e5762..31f530c19 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/SwingGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/SwingGefTest.java @@ -26,8 +26,8 @@ import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jface.preference.IPreferenceStore; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import javax.swing.JButton; @@ -43,7 +43,7 @@ public abstract class SwingGefTest extends DesignerEditorTestCase { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); configureDefaults(org.eclipse.wb.internal.swing.ToolkitProvider.DESCRIPTION); @@ -61,7 +61,7 @@ protected void configureNewProject() throws Exception { } @Override - @After + @AfterEach public void tearDown() throws Exception { configureDefaults(); super.tearDown(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/SwingModelTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/SwingModelTest.java index 3e116fcb3..781161a7a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/SwingModelTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/SwingModelTest.java @@ -21,7 +21,7 @@ import org.eclipse.wb.tests.designer.core.model.parser.AbstractJavaInfoTest; import org.apache.commons.lang3.ArrayUtils; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import javax.swing.JButton; @@ -39,7 +39,7 @@ public abstract class SwingModelTest extends AbstractJavaInfoTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject == null) { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/SwingTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/SwingTests.java index 77d0f2e62..1ef596315 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/SwingTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/SwingTests.java @@ -17,15 +17,14 @@ import org.eclipse.wb.tests.designer.swing.model.ModelTests; import org.eclipse.wb.tests.designer.swing.swingx.SwingXTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ LookAndFeelTest.class, ConvertersTest.class, CustomizeTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/ams/AmsTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/ams/AmsTests.java index 07019bda4..bbab4fc63 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/ams/AmsTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/ams/AmsTests.java @@ -12,17 +12,16 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.swing.ams; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * All AMS tests. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ PropertyTweaksTest.class, VarmenuLayoutTest.class }) diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/ams/PropertyTweaksTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/ams/PropertyTweaksTest.java index e418463a6..f68454879 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/ams/PropertyTweaksTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/ams/PropertyTweaksTest.java @@ -22,8 +22,8 @@ import org.eclipse.wb.tests.designer.core.annotations.DisposeProjectAfter; import org.eclipse.wb.tests.designer.swing.SwingGefTest; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * We should tweak properties for AMS components: group them and change {@link PropertyCategory}. @@ -45,7 +45,7 @@ public void _test_exit() throws Exception { // Tests // //////////////////////////////////////////////////////////////////////////// - @Ignore + @Disabled @Test public void test_Groups_fromBundle() throws Exception { prepareParse_MyButton(); @@ -67,7 +67,7 @@ public void test_Groups_fromBundle() throws Exception { } @DisposeProjectAfter - @Ignore + @Disabled @Test public void test_Groups_fromJar() throws Exception { // add JAR @@ -95,7 +95,7 @@ public void test_Groups_fromJar() throws Exception { } } - @Ignore + @Disabled @Test public void test_categories() throws Exception { prepareParse_MyButton(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/ams/VarmenuLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/ams/VarmenuLayoutTest.java index 2e3c5489a..5ac9dec3b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/ams/VarmenuLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/ams/VarmenuLayoutTest.java @@ -19,9 +19,9 @@ import org.eclipse.draw2d.PositionConstants; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * Test for VarmenuLayout support. @@ -35,7 +35,7 @@ public class VarmenuLayoutTest extends SwingGefTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); setFileContentSrc( @@ -61,7 +61,7 @@ public void _test_exit() throws Exception { // Tests // //////////////////////////////////////////////////////////////////////////// - @Ignore + @Disabled @Test public void test_CREATE() throws Exception { ContainerInfo panel = openContainer(""" @@ -90,7 +90,7 @@ public Test() { }"""); } - @Ignore + @Disabled @Test public void test_RESIZE_width() throws Exception { ContainerInfo panel = openContainer(""" @@ -134,7 +134,7 @@ public Test() { }"""); } - @Ignore + @Disabled @Test public void test_RESIZE_height() throws Exception { ContainerInfo panel = openContainer(""" diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/laf/LookAndFeelTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/laf/LookAndFeelTest.java index 4dcf0451a..859306d50 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/laf/LookAndFeelTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/laf/LookAndFeelTest.java @@ -27,8 +27,8 @@ import org.eclipse.jdt.core.dom.MethodDeclaration; import org.eclipse.jdt.core.dom.MethodInvocation; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import java.util.List; @@ -48,7 +48,7 @@ public class LookAndFeelTest extends SwingModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName()); if (m_lastParseInfo != null) { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/ClipboardTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/ClipboardTest.java index 6c8395b5f..856cf9b72 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/ClipboardTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/ClipboardTest.java @@ -28,7 +28,7 @@ import org.eclipse.swt.dnd.Transfer; import org.eclipse.swt.widgets.Display; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.JButton; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/CoordinateUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/CoordinateUtilsTest.java index ebeb97a44..0ae520bbd 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/CoordinateUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/CoordinateUtilsTest.java @@ -15,7 +15,7 @@ import org.eclipse.wb.internal.swing.model.CoordinateUtils; import org.eclipse.wb.tests.designer.tests.DesignerTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link CoordinateUtils}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/ModelTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/ModelTests.java index 7d4c952f3..6a9ca7385 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/ModelTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/ModelTests.java @@ -19,17 +19,16 @@ import org.eclipse.wb.tests.designer.swing.model.top.TopLevelTests; import org.eclipse.wb.tests.designer.swing.model.util.UtilTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for Swing objects models. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ CoordinateUtilsTest.class, LayoutTests.class, ComponentTests.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/bean/ActionGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/bean/ActionGefTest.java index 4ddbb1329..ec76c324b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/bean/ActionGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/bean/ActionGefTest.java @@ -31,8 +31,8 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import javax.swing.JButton; import javax.swing.JMenu; @@ -232,7 +232,7 @@ public Test() { /** * Test for {@link ActionExternalEntryInfo}. */ - @Ignore + @Disabled @Test public void test_JToolBar_ActionExternalEntryInfo() throws Exception { createExternalAction(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/bean/ActionTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/bean/ActionTest.java index 8ea041021..4d527434e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/bean/ActionTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/bean/ActionTest.java @@ -55,8 +55,8 @@ import org.assertj.core.api.Assertions; import org.assertj.core.util.Lists; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -1594,7 +1594,7 @@ public void test_anonymous_properties_inConstructorArgument() throws Exception { /** * Test for {@link ActionInfo#getPresentation()}. */ - @Ignore + @Disabled @Test public void test_presentation() throws Exception { m_waitForAutoBuild = true; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/bean/BeanTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/bean/BeanTests.java index 1fa6906a3..52b5d0d2e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/bean/BeanTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/bean/BeanTests.java @@ -12,17 +12,16 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.swing.model.bean; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for Swing beans. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ ButtonGroupTest.class, ActionTest.class, ActionGefTest.class diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/bean/ButtonGroupTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/bean/ButtonGroupTest.java index 4aed30f14..ec2cbb959 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/bean/ButtonGroupTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/bean/ButtonGroupTest.java @@ -28,7 +28,7 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/AbstractButtonTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/AbstractButtonTest.java index c22afcf12..2959bd979 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/AbstractButtonTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/AbstractButtonTest.java @@ -20,7 +20,7 @@ import org.eclipse.wb.tests.designer.swing.SwingModelTest; import org.apache.commons.lang3.ArrayUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.lang.reflect.Field; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/AppletTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/AppletTest.java index a3867e4db..a6b6a294f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/AppletTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/AppletTest.java @@ -21,7 +21,7 @@ import org.eclipse.swt.graphics.RGB; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.applet.Applet; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/BeanInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/BeanInfoTest.java index 9eb6488aa..08e7e80de 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/BeanInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/BeanInfoTest.java @@ -15,7 +15,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.beans.BeanInfo; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/ComponentTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/ComponentTest.java index 92c269fbe..4a5e230ee 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/ComponentTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/ComponentTest.java @@ -31,8 +31,8 @@ import org.eclipse.swt.graphics.ImageData; import org.eclipse.swt.graphics.RGB; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.awt.Component; import java.awt.Container; @@ -88,7 +88,7 @@ public void test_clearSwingTree_removeAll_NPE() throws Exception { /** * We can not create {@link java.awt.Image} with zero size, so we should check this. */ - @Ignore + @Disabled @Test public void test_zeroSize() throws Exception { ContainerInfo panel = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/ComponentTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/ComponentTests.java index ca387cedf..0c12e0398 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/ComponentTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/ComponentTests.java @@ -14,17 +14,16 @@ import org.eclipse.wb.tests.designer.swing.model.component.menu.MenuTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for Swing components models. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ ComponentTest.class, ContainerTest.class, SwingLiveManagerTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/ContainerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/ContainerTest.java index 5c079c897..b17278397 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/ContainerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/ContainerTest.java @@ -40,7 +40,7 @@ import com.jgoodies.forms.layout.FormLayout; import org.apache.commons.lang3.StringUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.Component; import java.awt.Container; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JComboBoxTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JComboBoxTest.java index 99ee08842..3d83fa612 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JComboBoxTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JComboBoxTest.java @@ -15,7 +15,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.JComboBox; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JDialogTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JDialogTest.java index 8136611a5..f5211408c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JDialogTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JDialogTest.java @@ -19,7 +19,7 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.JDialog; import javax.swing.JPanel; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JInternalFrameTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JInternalFrameTest.java index 02f5152a6..1266b6585 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JInternalFrameTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JInternalFrameTest.java @@ -20,7 +20,7 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.JInternalFrame; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JLabelTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JLabelTest.java index 90c0855e2..45dec78cd 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JLabelTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JLabelTest.java @@ -22,7 +22,7 @@ import org.eclipse.wb.internal.swing.model.property.editor.DisplayedMnemonicKeyPropertyEditor; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.JLabel; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JLayeredPaneTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JLayeredPaneTest.java index 430337965..da510c70c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JLayeredPaneTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JLayeredPaneTest.java @@ -20,7 +20,7 @@ import org.eclipse.wb.internal.swing.model.component.JLayeredPaneInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.Container; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JListTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JListTest.java index b8bd8cc40..d20f35a98 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JListTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JListTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.tests.designer.swing.SwingModelTest; import org.apache.commons.lang3.ArrayUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.JList; import javax.swing.ListModel; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JScrollPaneTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JScrollPaneTest.java index f8a9b24c4..5ffac6932 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JScrollPaneTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JScrollPaneTest.java @@ -20,7 +20,7 @@ import org.eclipse.wb.internal.swing.model.layout.FlowLayoutInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.JScrollPane; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JSliderTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JSliderTest.java index 5aa22b220..d59f4fb72 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JSliderTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JSliderTest.java @@ -15,7 +15,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Dictionary; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JSpinnerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JSpinnerTest.java index eaf103981..b96fbbc64 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JSpinnerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JSpinnerTest.java @@ -23,8 +23,8 @@ import org.eclipse.wb.tests.designer.Expectations.StrValue; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -142,7 +142,7 @@ public void test_dateModel_getDateStep() throws Exception { 0xDEADBEEF)); } - @Ignore + @Disabled @Test public void test_dateModel() throws Exception { String source = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JSplitPaneTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JSplitPaneTest.java index c00f3f943..4127178a9 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JSplitPaneTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JSplitPaneTest.java @@ -22,7 +22,7 @@ import org.eclipse.draw2d.geometry.Insets; import org.eclipse.draw2d.geometry.Rectangle; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.JSplitPane; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JTabbedPaneGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JTabbedPaneGefTest.java index d0f262a8d..e169f8bad 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JTabbedPaneGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JTabbedPaneGefTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.internal.swing.model.component.JTabbedPaneTabInfo; import org.eclipse.wb.tests.designer.swing.SwingGefTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JTabbedPaneTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JTabbedPaneTest.java index 6b65e0b99..09858b51e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JTabbedPaneTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JTabbedPaneTest.java @@ -36,7 +36,7 @@ import org.apache.commons.lang3.StringUtils; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.Color; import java.awt.Component; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JTableTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JTableTest.java index 94d055b21..5a50337f7 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JTableTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JTableTest.java @@ -21,7 +21,7 @@ import org.eclipse.wb.tests.designer.swing.SwingModelTest; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JTextFieldTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JTextFieldTest.java index 6eab4a87a..5b100eeb6 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JTextFieldTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JTextFieldTest.java @@ -14,7 +14,7 @@ import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.JTextField; import javax.swing.text.Document; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JToolBarTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JToolBarTest.java index 2274c4722..abdda36f1 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JToolBarTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JToolBarTest.java @@ -38,7 +38,7 @@ import org.eclipse.jdt.core.dom.Statement; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.Action; import javax.swing.JButton; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JTreeTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JTreeTest.java index ad4d0f41b..5aaeade07 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JTreeTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JTreeTest.java @@ -22,7 +22,7 @@ import org.eclipse.wb.tests.designer.swing.SwingModelTest; import org.apache.commons.lang3.StringUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.JTree; import javax.swing.tree.DefaultMutableTreeNode; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/SomeComponentsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/SomeComponentsTest.java index fde7d8607..bb446c5da 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/SomeComponentsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/SomeComponentsTest.java @@ -16,7 +16,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.Canvas; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/SwingLiveManagerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/SwingLiveManagerTest.java index 282de8d09..31ea9f317 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/SwingLiveManagerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/SwingLiveManagerTest.java @@ -29,7 +29,7 @@ import org.eclipse.swt.graphics.Image; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.Component; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/menu/JMenuBarTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/menu/JMenuBarTest.java index 804d8a990..85540a27b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/menu/JMenuBarTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/menu/JMenuBarTest.java @@ -31,7 +31,7 @@ import org.eclipse.swt.graphics.ImageData; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/menu/JMenuGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/menu/JMenuGefTest.java index ea3008391..556400537 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/menu/JMenuGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/menu/JMenuGefTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.internal.swing.model.component.menu.JMenuInfo; import org.eclipse.wb.tests.designer.swing.SwingGefTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.JMenu; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/menu/JMenuItemTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/menu/JMenuItemTest.java index 7fcd73c6e..57b75aded 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/menu/JMenuItemTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/menu/JMenuItemTest.java @@ -21,7 +21,7 @@ import org.eclipse.wb.internal.swing.model.component.menu.JMenuItemInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/menu/JMenuTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/menu/JMenuTest.java index f34c6f78a..d46ee44fb 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/menu/JMenuTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/menu/JMenuTest.java @@ -44,7 +44,7 @@ import org.eclipse.swt.graphics.Image; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.Component; import java.awt.Container; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/menu/JPopupMenuTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/menu/JPopupMenuTest.java index 2f7f16d1d..5dcacc845 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/menu/JPopupMenuTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/menu/JPopupMenuTest.java @@ -37,7 +37,7 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.event.MouseListener; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/menu/MenuTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/menu/MenuTests.java index 00b1e22d6..2c2f47b33 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/menu/MenuTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/menu/MenuTests.java @@ -12,17 +12,16 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.swing.model.component.menu; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for Swing menu. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ JMenuBarTest.class, JPopupMenuTest.class, JMenuTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/AbsoluteLayoutGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/AbsoluteLayoutGefTest.java index 2caa318c9..982af28bf 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/AbsoluteLayoutGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/AbsoluteLayoutGefTest.java @@ -19,7 +19,7 @@ import org.eclipse.jface.action.IAction; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link AbsoluteLayoutInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/AbsoluteLayoutSelectionActionsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/AbsoluteLayoutSelectionActionsTest.java index 5b02a6b5f..d8c085e23 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/AbsoluteLayoutSelectionActionsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/AbsoluteLayoutSelectionActionsTest.java @@ -23,7 +23,7 @@ import org.eclipse.wb.tests.designer.core.model.TestObjectInfo; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/AbsoluteLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/AbsoluteLayoutTest.java index 3b13ef338..52f3d887e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/AbsoluteLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/AbsoluteLayoutTest.java @@ -51,8 +51,8 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.assertj.core.api.Assertions; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import java.awt.BorderLayout; import java.util.Collections; @@ -74,7 +74,7 @@ public class AbsoluteLayoutTest extends AbstractLayoutTest { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { super.tearDown(); preferences.setValue(IPreferenceConstants.P_CREATION_FLOW, false); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/AbstractLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/AbstractLayoutTest.java index 1c7c47ea1..38119389c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/AbstractLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/AbstractLayoutTest.java @@ -23,8 +23,8 @@ import org.eclipse.jface.preference.IPreferenceStore; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import java.awt.LayoutManager; @@ -35,14 +35,14 @@ public abstract class AbstractLayoutTest extends SwingModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); configureForTest(); } @Override - @After + @AfterEach public void tearDown() throws Exception { configureDefaults(); super.tearDown(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/ConstraintsAbsoluteLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/ConstraintsAbsoluteLayoutTest.java index 088ef5a15..2ce588c80 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/ConstraintsAbsoluteLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/ConstraintsAbsoluteLayoutTest.java @@ -23,7 +23,7 @@ import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Point; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link ConstraintsAbsoluteLayoutInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/AbstractFormLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/AbstractFormLayoutTest.java index 2ee3deac7..13cd19867 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/AbstractFormLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/AbstractFormLayoutTest.java @@ -18,7 +18,7 @@ import com.jgoodies.forms.layout.FormLayout; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; /** * Abstract test for {@link FormLayout}. @@ -34,7 +34,7 @@ public abstract class AbstractFormLayoutTest extends AbstractLayoutTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); LafSupport.applySelectedLAF(LafSupport.getDefaultLAF()); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/CellConstraintsSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/CellConstraintsSupportTest.java index bbab8ab86..f8f9a8ea8 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/CellConstraintsSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/CellConstraintsSupportTest.java @@ -28,9 +28,9 @@ import com.jgoodies.forms.layout.CellConstraints.Alignment; import org.apache.commons.lang3.StringUtils; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Test for {@link CellConstraintsSupport}. @@ -49,7 +49,7 @@ public class CellConstraintsSupportTest extends AbstractFormLayoutTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // @@ -84,7 +84,7 @@ public void setUp() throws Exception { } @Override - @After + @AfterEach public void tearDown() throws Exception { if (m_panel != null) { m_panel.refresh_dispose(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/DefaultComponentFactoryTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/DefaultComponentFactoryTest.java index ac608acc5..eec99a00d 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/DefaultComponentFactoryTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/DefaultComponentFactoryTest.java @@ -29,8 +29,8 @@ import com.jgoodies.forms.factories.DefaultComponentFactory; import org.assertj.core.api.Assertions; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * Tests for components from {@link DefaultComponentFactory}. @@ -109,7 +109,7 @@ public void test_createLabel() throws Exception { * Test for {@link DefaultComponentFactoryCreateLabelEntryInfo}. */ @DisposeProjectAfter - @Ignore + @Disabled @Test public void test_createLabel_tool() throws Exception { do_projectDispose(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormColumnInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormColumnInfoTest.java index d192856ea..e3dc1cf46 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormColumnInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormColumnInfoTest.java @@ -16,7 +16,7 @@ import org.eclipse.wb.internal.swing.FormLayout.model.FormLayoutInfo; import org.eclipse.wb.internal.swing.model.component.ContainerInfo; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link FormColumnInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormDimensionInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormDimensionInfoTest.java index f331917a9..3e9aca944 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormDimensionInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormDimensionInfoTest.java @@ -26,8 +26,8 @@ import com.jgoodies.forms.layout.Size; import com.jgoodies.forms.layout.Sizes; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.lang.reflect.Method; @@ -266,7 +266,7 @@ public void test_rowTemplates() throws Exception { // Convert to GAP template // //////////////////////////////////////////////////////////////////////////// - @Ignore + @Disabled @Test public void test_convertToNearestGap_columns() throws Exception { check_convertToNearestGap_column("4px", 5, "LABEL_COMPONENT_GAP_COLSPEC"); @@ -284,7 +284,7 @@ public void test_convertToNearestGap_columns() throws Exception { check_convertToNearestGap_column("20px", 5, null); } - @Ignore + @Disabled @Test public void test_convertToNearestGap_rows() throws Exception { check_convertToNearestGap_row("4px", 5, "LABEL_COMPONENT_GAP_ROWSPEC"); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutConverterTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutConverterTest.java index f0a74340a..0d2a2648f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutConverterTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutConverterTest.java @@ -18,8 +18,8 @@ import com.jgoodies.forms.layout.FormLayout; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * Test for {@link FormLayoutConverter}. @@ -60,7 +60,7 @@ public void test_empty() throws Exception { "}"); } - @Ignore + @Disabled @Test public void test_oneRow() throws Exception { ContainerInfo panel = @@ -118,7 +118,7 @@ public void test_oneRow() throws Exception { } } - @Ignore + @Disabled @Test public void test_twoRows_spanColumns() throws Exception { ContainerInfo panel = @@ -181,7 +181,7 @@ public void test_twoRows_spanColumns() throws Exception { "}"); } - @Ignore + @Disabled @Test public void test_Switching_fromGridBagLayout() throws Exception { ContainerInfo panel = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutGefTest.java index 6ba654562..2ee67f0aa 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutGefTest.java @@ -26,9 +26,9 @@ import com.jgoodies.forms.layout.FormLayout; import org.assertj.core.api.Assertions; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.awt.GridBagLayout; import java.util.List; @@ -63,14 +63,14 @@ public void _test_exit() throws Exception { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); AbstractLayoutTest.configureForTest(); } @Override - @After + @AfterEach public void tearDown() throws Exception { AbstractLayoutTest.configureDefaults(); super.tearDown(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutGroupsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutGroupsTest.java index 2e3e095c3..7b0789efa 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutGroupsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutGroupsTest.java @@ -17,7 +17,7 @@ import org.eclipse.wb.internal.swing.FormLayout.model.FormRowInfo; import org.eclipse.wb.internal.swing.model.component.ContainerInfo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutParametersTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutParametersTest.java index 4846361fa..1728c669e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutParametersTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutParametersTest.java @@ -23,8 +23,8 @@ import org.eclipse.jface.preference.IPreferenceStore; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import javax.swing.JLabel; import javax.swing.JTable; @@ -42,7 +42,7 @@ public class FormLayoutParametersTest extends AbstractFormLayoutTest { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { IPreferenceStore preferences = Activator.getDefault().getPreferenceStore(); preferences.setToDefault(IPreferenceConstants.P_ENABLE_GRAB); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutSelectionActionsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutSelectionActionsTest.java index 8d6b98353..f49330f72 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutSelectionActionsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutSelectionActionsTest.java @@ -19,7 +19,7 @@ import org.eclipse.jface.action.IAction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutTest.java index b25f2378f..bbcf79216 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutTest.java @@ -41,7 +41,7 @@ import org.apache.commons.lang3.ArrayUtils; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -188,8 +188,8 @@ public void test_withJTable() throws Exception { frame.refresh(); ContainerInfo contentPane = (ContainerInfo) frame.getChildrenComponents().get(0); ComponentInfo table = contentPane.getChildrenComponents().get(0); - assertTrue("Actual size: " + table.getBounds().getSize(), table.getBounds().width > 300); - assertTrue("Actual size: " + table.getBounds().getSize(), table.getBounds().height > 200); + assertTrue(table.getBounds().width > 300, "Actual size: " + table.getBounds().getSize()); + assertTrue(table.getBounds().height > 200, "Actual size: " + table.getBounds().getSize()); } /** diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutTests.java index 981710610..7eed7f033 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutTests.java @@ -14,17 +14,16 @@ import org.eclipse.wb.internal.swing.FormLayout.model.FormLayoutInfo; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests {@link FormLayoutInfo}. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ FormSizeInfoTest.class, FormDimensionInfoTest.class, FormLayoutTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormRowInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormRowInfoTest.java index d7eafe33f..93fdc2dd1 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormRowInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormRowInfoTest.java @@ -16,7 +16,7 @@ import org.eclipse.wb.internal.swing.FormLayout.model.FormRowInfo; import org.eclipse.wb.internal.swing.model.component.ContainerInfo; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link FormRowInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormSizeInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormSizeInfoTest.java index 4ac75b833..c3b895986 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormSizeInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormSizeInfoTest.java @@ -25,9 +25,9 @@ import com.jgoodies.forms.layout.Size; import com.jgoodies.forms.layout.Sizes; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * Test for {@link FormSizeInfo}. @@ -41,7 +41,7 @@ public class FormSizeInfoTest extends AbstractFormLayoutTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); LafSupport.applySelectedLAF(LafSupport.getDefaultLAF()); @@ -64,7 +64,7 @@ public void _test_exit() throws Exception { /** * Test for {@link FormSizeConstantInfo}. */ - @Ignore + @Disabled @Test public void test_FormSizeConstantInfo() throws Exception { FormSizeConstantInfo size = new FormSizeConstantInfo(25, ConstantSize.PIXEL); @@ -139,7 +139,7 @@ public void test_FormSizeConstantInfo_convertSpecial() throws Exception { /** * Test for {@link FormSizeConstantInfo#convertFromPixels(int, Unit)} */ - @Ignore + @Disabled @Test public void test_FormSizeConstantInfo_convertFromPixels() throws Exception { { @@ -197,7 +197,7 @@ private void check_convertFromPixels(int pixels, Unit unit, double expected) thr /** * Test for {@link FormSizeConstantInfo#convertToPixels(double, Unit)} */ - @Ignore + @Disabled @Test public void test_FormSizeConstantInfo_convertToPixels() throws Exception { { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/ImplicitLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/ImplicitLayoutTest.java index 3964377ce..53be0482c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/ImplicitLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/ImplicitLayoutTest.java @@ -30,7 +30,7 @@ import org.eclipse.jdt.core.dom.ClassInstanceCreation; import org.eclipse.jdt.core.dom.Statement; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.FlowLayout; import java.awt.LayoutManager; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/LayoutGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/LayoutGefTest.java index 27570b10f..229963247 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/LayoutGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/LayoutGefTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.tests.designer.swing.SwingGefTest; import org.eclipse.wb.tests.designer.swing.model.component.ContainerTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.LayoutManager; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/LayoutManagersTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/LayoutManagersTest.java index b9a83c4ef..a8573ccdc 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/LayoutManagersTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/LayoutManagersTest.java @@ -39,8 +39,8 @@ import org.eclipse.wb.tests.designer.swing.SwingTestUtils; import org.assertj.core.api.Assertions; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.awt.BorderLayout; import java.awt.Component; @@ -605,7 +605,7 @@ public void test_delete() throws Exception { /** * Delete using "Layout" property. */ - @Ignore + @Disabled @Test public void test_delete2() throws Exception { ContainerInfo panel = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/LayoutTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/LayoutTests.java index 1638f4956..4bbd2761a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/LayoutTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/LayoutTests.java @@ -26,17 +26,16 @@ import org.eclipse.wb.tests.designer.swing.model.layout.model.GridLayoutTest; import org.eclipse.wb.tests.designer.swing.model.layout.spring.SpringLayoutTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for Swing layouts. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ LayoutManagersTest.class, ImplicitLayoutTest.class, AbsoluteLayoutTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/AbstractMigLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/AbstractMigLayoutTest.java index 84be3b26c..64a0cef85 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/AbstractMigLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/AbstractMigLayoutTest.java @@ -19,7 +19,7 @@ import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.wb.tests.designer.swing.model.layout.AbstractLayoutTest; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; /** * Test for {@link MigLayoutInfo}. @@ -44,7 +44,7 @@ static void do_configureNewProject() throws Exception { } @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // create IConstants with C_* constants diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigColumnTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigColumnTest.java index e60c63a3c..91e7022aa 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigColumnTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigColumnTest.java @@ -16,7 +16,7 @@ import org.apache.commons.lang3.ArrayUtils; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link MigColumnInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutAutoAlignmentTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutAutoAlignmentTest.java index 037031c3e..292c039a8 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutAutoAlignmentTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutAutoAlignmentTest.java @@ -20,8 +20,8 @@ import org.eclipse.jface.preference.IPreferenceStore; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import javax.swing.JLabel; import javax.swing.JTable; @@ -39,7 +39,7 @@ public class MigLayoutAutoAlignmentTest extends AbstractMigLayoutTest { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { IPreferenceStore preferences = Activator.getDefault().getPreferenceStore(); preferences.setToDefault(IPreferenceConstants.P_ENABLE_GRAB); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutConstraintsPropertiesTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutConstraintsPropertiesTest.java index 3b6e676d9..41603661d 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutConstraintsPropertiesTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutConstraintsPropertiesTest.java @@ -22,9 +22,9 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.apache.commons.lang3.StringUtils; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Test for "Constraints" property contributed by {@link CellConstraintsSupport}. @@ -51,7 +51,7 @@ public void _test_exit() throws Exception { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); ContainerInfo panel = @@ -76,7 +76,7 @@ public void setUp() throws Exception { } @Override - @After + @AfterEach public void tearDown() throws Exception { { m_constraints = null; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutConstraintsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutConstraintsTest.java index 86fac0e14..58bcb143a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutConstraintsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutConstraintsTest.java @@ -40,7 +40,7 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.Container; import java.util.List; @@ -1134,7 +1134,7 @@ private void check_contextMenu_alignment(String managerText, } // set alignment IAction alignmentAction = findChildAction(alignmentManager, actionText); - assertNotNull(actionText, alignmentAction); + assertNotNull(alignmentAction, actionText); alignmentAction.setChecked(true); alignmentAction.run(); // check result diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutConverterTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutConverterTest.java index de73c6ddc..8f3e40b30 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutConverterTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutConverterTest.java @@ -18,8 +18,8 @@ import net.miginfocom.swing.MigLayout; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import javax.swing.JTable; @@ -388,7 +388,7 @@ public void test_oneRow_bottom() throws Exception { "}"); } - @Ignore + @Disabled @Test public void test_oneRow_fill() throws Exception { ContainerInfo panel = @@ -483,7 +483,7 @@ public void test_twoRows_spanColumns() throws Exception { "}"); } - @Ignore + @Disabled @Test public void test_Switching_fromGridBagLayout() throws Exception { ContainerInfo panel = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutGefTest.java index 81b15f2fc..bf3301067 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutGefTest.java @@ -26,9 +26,9 @@ import net.miginfocom.swing.MigLayout; import org.assertj.core.api.Assertions; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.awt.GridBagLayout; import java.util.List; @@ -65,14 +65,14 @@ public void _test_exit() throws Exception { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); AbstractLayoutTest.configureForTest(); } @Override - @After + @AfterEach public void tearDown() throws Exception { AbstractLayoutTest.configureDefaults(); super.tearDown(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutSelectionActionsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutSelectionActionsTest.java index 4c5237a3a..0ccd6caa5 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutSelectionActionsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutSelectionActionsTest.java @@ -20,7 +20,7 @@ import org.eclipse.jface.action.IAction; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutSurroundSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutSurroundSupportTest.java index cf0270ffa..d21753d98 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutSurroundSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutSurroundSupportTest.java @@ -23,7 +23,7 @@ import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutTest.java index b9461cb21..1b3d48c19 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutTest.java @@ -42,8 +42,8 @@ import net.miginfocom.swing.MigLayout; import org.assertj.core.api.Assertions; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.List; @@ -234,7 +234,7 @@ public void test_writeDimensions_LC() throws Exception { /** * Test for {@link IGridInfo}. */ - @Ignore + @Disabled @Test public void test_IGridInfo() throws Exception { ContainerInfo panel = @@ -1341,7 +1341,7 @@ public void test_dimensionSize_setCheck() throws Exception { /** * Test for {@link MigDimensionInfo#toUnitString(int, String)}. */ - @Ignore + @Disabled @Test public void test_dimensionSize_toUnitString() throws Exception { ContainerInfo panel = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutTests.java index 268e973b8..5271895f9 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutTests.java @@ -14,17 +14,16 @@ import org.eclipse.wb.internal.swing.MigLayout.model.MigLayoutInfo; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests {@link MigLayoutInfo}. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ MigColumnTest.class, MigRowTest.class, MigLayoutConstraintsTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigRowTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigRowTest.java index fe28e9eb6..2dfec3ecc 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigRowTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigRowTest.java @@ -16,7 +16,7 @@ import org.apache.commons.lang3.ArrayUtils; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link MigRowInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/AbstractGridBagLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/AbstractGridBagLayoutTest.java index 8a325435d..aff0178a8 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/AbstractGridBagLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/AbstractGridBagLayoutTest.java @@ -19,8 +19,8 @@ import org.eclipse.jface.preference.IPreferenceStore; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import java.awt.GridBagLayout; @@ -36,14 +36,14 @@ abstract class AbstractGridBagLayoutTest extends AbstractLayoutTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); configureForTest(); } @Override - @After + @AfterEach public void tearDown() throws Exception { configureDefaults(); super.tearDown(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagColumnTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagColumnTest.java index 5c818213f..9e187f808 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagColumnTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagColumnTest.java @@ -23,7 +23,7 @@ import org.eclipse.draw2d.geometry.Rectangle; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.GridBagConstraints; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagConstraintsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagConstraintsTest.java index 080d2837d..093720b27 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagConstraintsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagConstraintsTest.java @@ -47,8 +47,8 @@ import org.eclipse.jface.action.MenuManager; import org.apache.commons.lang3.StringUtils; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; @@ -1131,13 +1131,13 @@ public void test_contextMenu_verticalFill() throws Exception { check_contextMenu_alignmentVertical("&Fill", RowInfo.Alignment.FILL, "CENTER", "VERTICAL"); } - @Ignore + @Disabled @Test public void test_contextMenu_verticalBaseline() throws Exception { check_contextMenu_alignmentVertical("Baseline", RowInfo.Alignment.BASELINE, "BASELINE", "NONE"); } - @Ignore + @Disabled @Test public void test_contextMenu_verticalBaselineAbove() throws Exception { check_contextMenu_alignmentVertical( @@ -1147,7 +1147,7 @@ public void test_contextMenu_verticalBaselineAbove() throws Exception { "NONE"); } - @Ignore + @Disabled @Test public void test_contextMenu_verticalBaselineBelow() throws Exception { check_contextMenu_alignmentVertical( diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagDimensionTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagDimensionTest.java index 95bba2479..bd2618c4c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagDimensionTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagDimensionTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.internal.swing.model.layout.gbl.GridBagLayoutInfo; import org.eclipse.wb.internal.swing.model.layout.gbl.RowInfo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.GridBagLayout; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutConverterTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutConverterTest.java index ef9922274..47d7b5f57 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutConverterTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutConverterTest.java @@ -16,7 +16,7 @@ import org.eclipse.wb.internal.swing.model.layout.gbl.GridBagLayoutConverter; import org.eclipse.wb.internal.swing.model.layout.gbl.GridBagLayoutInfo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.GridBagLayout; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutGefTest.java index 12e414501..5eb973a35 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutGefTest.java @@ -26,9 +26,9 @@ import org.eclipse.swt.graphics.Image; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Test {@link GridBagLayoutInfo} in GEF. @@ -51,14 +51,14 @@ public void _test_exit() throws Exception { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); AbstractGridBagLayoutTest.configureForTest(); } @Override - @After + @AfterEach public void tearDown() throws Exception { AbstractGridBagLayoutTest.configureDefaults(); super.tearDown(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutParametersTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutParametersTest.java index 379131fa3..c5b761305 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutParametersTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutParametersTest.java @@ -23,8 +23,8 @@ import org.eclipse.jface.preference.IPreferenceStore; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import javax.swing.JLabel; import javax.swing.JTable; @@ -42,7 +42,7 @@ public class GridBagLayoutParametersTest extends AbstractGridBagLayoutTest { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { IPreferenceStore preferences = Activator.getDefault().getPreferenceStore(); preferences.setToDefault(IPreferenceConstants.P_ENABLE_GRAB); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutSelectionActionsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutSelectionActionsTest.java index b53acae81..0fbbdcfad 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutSelectionActionsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutSelectionActionsTest.java @@ -19,8 +19,8 @@ import org.eclipse.jface.action.IAction; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -36,7 +36,7 @@ public class GridBagLayoutSelectionActionsTest extends AbstractGridBagLayoutTest // Tests // //////////////////////////////////////////////////////////////////////////// - @Ignore + @Disabled @Test public void test_selectionActions() throws Exception { ContainerInfo panel = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutSurroundSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutSurroundSupportTest.java index 74773dfeb..a4c4ab9fe 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutSurroundSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutSurroundSupportTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.internal.swing.model.layout.gbl.GridBagLayoutInfo; import org.eclipse.wb.tests.designer.swing.model.util.SurroundSupportTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutTest.java index 11b3decb3..39fc4f0ae 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutTest.java @@ -40,9 +40,9 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.assertj.core.api.Assertions; -import org.junit.After; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.awt.Component; import java.awt.Container; @@ -66,7 +66,7 @@ public class GridBagLayoutTest extends AbstractGridBagLayoutTest { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { { IPreferenceStore preferences = Activator.getDefault().getPreferenceStore(); @@ -2487,7 +2487,7 @@ public void test_clipboard() throws Exception { /** * We should not change alignments when paste existing panel. */ - @Ignore + @Disabled @Test public void test_clipboard_disableAutoAlignment() throws Exception { ContainerInfo panel = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutTests.java index c3a5fbd6b..66dbc5ba4 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagLayoutTests.java @@ -14,17 +14,16 @@ import org.eclipse.wb.internal.swing.model.layout.gbl.GridBagLayoutInfo; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for {@link GridBagLayoutInfo}. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ GridBagLayoutTest.class, GridBagDimensionTest.class, GridBagColumnTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagRowTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagRowTest.java index 7668cfc7e..855a86f4a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagRowTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gbl/GridBagRowTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.internal.swing.model.layout.gbl.GridBagLayoutInfo; import org.eclipse.wb.internal.swing.model.layout.gbl.RowInfo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.GridBagConstraints; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gef/BorderLayoutPolicyTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gef/BorderLayoutPolicyTest.java index e04dd4acb..63393323b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gef/BorderLayoutPolicyTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gef/BorderLayoutPolicyTest.java @@ -16,7 +16,7 @@ import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.wb.internal.swing.model.component.ContainerInfo; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link BorderLayoutEditPolicy}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gef/GefLayoutTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gef/GefLayoutTests.java index 08914991c..c432f7830 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gef/GefLayoutTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gef/GefLayoutTests.java @@ -12,15 +12,14 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.swing.model.layout.gef; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ BorderLayoutPolicyTest.class, GridLayoutPolicyTest.class }) diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gef/GridLayoutPolicyTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gef/GridLayoutPolicyTest.java index 34abfdeac..3b1e401e6 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gef/GridLayoutPolicyTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/gef/GridLayoutPolicyTest.java @@ -16,7 +16,7 @@ import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.wb.internal.swing.model.component.ContainerInfo; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link GridLayoutEditPolicy}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/group/GroupLayoutGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/group/GroupLayoutGefTest.java index ba4ed3b1c..e00c370b4 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/group/GroupLayoutGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/group/GroupLayoutGefTest.java @@ -16,7 +16,7 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingGefTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.GroupLayout; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/group/GroupLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/group/GroupLayoutTest.java index 44013a691..9770271d2 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/group/GroupLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/group/GroupLayoutTest.java @@ -19,7 +19,7 @@ import org.eclipse.wb.internal.swing.model.layout.LayoutInfo; import org.eclipse.wb.tests.designer.swing.model.layout.AbstractLayoutTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.FlowLayout; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/group/GroupLayoutTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/group/GroupLayoutTests.java index 480ef37af..fef84ea38 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/group/GroupLayoutTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/group/GroupLayoutTests.java @@ -12,9 +12,8 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.swing.model.layout.group; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; import javax.swing.GroupLayout; @@ -23,8 +22,8 @@ * * @author mitin_aa */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ GroupLayoutTest.class, GroupLayoutGefTest.class }) diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/BorderLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/BorderLayoutTest.java index 977498f59..46978e684 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/BorderLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/BorderLayoutTest.java @@ -24,7 +24,7 @@ import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jdt.core.dom.Statement; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.BorderLayout; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/BoxLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/BoxLayoutTest.java index c4abbaa8e..2b85eae92 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/BoxLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/BoxLayoutTest.java @@ -23,7 +23,7 @@ import org.eclipse.wb.internal.swing.model.property.editor.alignment.AlignmentYPropertyEditor; import org.eclipse.wb.tests.designer.swing.model.layout.AbstractLayoutTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.Box; import javax.swing.BoxLayout; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/CardLayoutGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/CardLayoutGefTest.java index 44fdef7a9..a75bf8b48 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/CardLayoutGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/CardLayoutGefTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.internal.swing.model.layout.CardLayoutInfo; import org.eclipse.wb.tests.designer.swing.model.layout.gef.AbstractLayoutPolicyTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link CardLayoutInfo} in GEF. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/CardLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/CardLayoutTest.java index 1ec7d094e..0c9091c38 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/CardLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/CardLayoutTest.java @@ -28,7 +28,7 @@ import org.eclipse.jdt.core.dom.StringLiteral; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.CardLayout; import java.awt.Component; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/FlowLayoutGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/FlowLayoutGefTest.java index 17d5a601f..474e01454 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/FlowLayoutGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/FlowLayoutGefTest.java @@ -17,7 +17,7 @@ import org.eclipse.wb.internal.swing.model.layout.FlowLayoutInfo; import org.eclipse.wb.tests.designer.swing.model.layout.gef.AbstractLayoutPolicyTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.BorderLayout; import java.awt.FlowLayout; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/FlowLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/FlowLayoutTest.java index f42033c6a..f465f5a83 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/FlowLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/FlowLayoutTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.internal.swing.model.layout.FlowLayoutInfo; import org.eclipse.wb.tests.designer.swing.model.layout.AbstractLayoutTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.FlowLayout; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/GridLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/GridLayoutTest.java index e51c02239..d7fcf84a8 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/GridLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/model/GridLayoutTest.java @@ -16,7 +16,7 @@ import org.eclipse.wb.internal.swing.model.layout.GridLayoutInfo; import org.eclipse.wb.tests.designer.swing.model.layout.AbstractLayoutTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.GridLayout; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/spring/SpringAttachmentTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/spring/SpringAttachmentTest.java index a9c31a6bc..0289a6dae 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/spring/SpringAttachmentTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/spring/SpringAttachmentTest.java @@ -24,7 +24,7 @@ import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Rectangle; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.SpringLayout; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/spring/SpringLayoutGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/spring/SpringLayoutGefTest.java index 3fa9ba395..a8b5bb022 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/spring/SpringLayoutGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/spring/SpringLayoutGefTest.java @@ -24,9 +24,9 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.apache.commons.lang3.StringUtils; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.lang.reflect.Field; import java.util.List; @@ -52,7 +52,7 @@ public class SpringLayoutGefTest extends SwingGefTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject == null) { @@ -69,7 +69,7 @@ public void setUp() throws Exception { } @Override - @After + @AfterEach public void tearDown() throws Exception { for (Field field : getClass().getDeclaredFields()) { field.set(this, null); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/spring/SpringLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/spring/SpringLayoutTest.java index ec2d20791..121fb168a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/spring/SpringLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/spring/SpringLayoutTest.java @@ -27,7 +27,7 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.awt.Component; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/spring/SpringLayoutTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/spring/SpringLayoutTests.java index 0986880a2..38f2cf655 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/spring/SpringLayoutTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/spring/SpringLayoutTests.java @@ -12,9 +12,8 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.swing.model.layout.spring; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; import javax.swing.SpringLayout; @@ -23,8 +22,8 @@ * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ SpringAttachmentTest.class, SpringLayoutTest.class, SpringLayoutGefTest.class diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/BeanPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/BeanPropertyEditorTest.java index 81a27b4b4..dd7fa6924 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/BeanPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/BeanPropertyEditorTest.java @@ -26,7 +26,7 @@ import org.eclipse.wb.internal.swing.model.property.editor.color.ColorPropertyEditor; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.beans.PropertyEditorSupport; import java.lang.reflect.Constructor; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/BorderPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/BorderPropertyEditorTest.java index b4c5b10e4..9e924d9e9 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/BorderPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/BorderPropertyEditorTest.java @@ -30,7 +30,7 @@ import org.eclipse.swtbot.swt.finder.SWTBot; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/FontPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/FontPropertyEditorTest.java index 9eb088729..677654557 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/FontPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/FontPropertyEditorTest.java @@ -29,9 +29,9 @@ import org.apache.commons.lang3.StringUtils; import org.assertj.core.api.Assertions; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.awt.Font; @@ -49,7 +49,7 @@ public class FontPropertyEditorTest extends SwingModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName()); @@ -709,7 +709,7 @@ public void test_copyPaste_null() throws Exception { check_copyPaste(originalSource, expectedSource); } - @Ignore + @Disabled @Test public void test_copyPaste_explicit() throws Exception { String originalSource = "new Font(\"Arial\", Font.BOLD | Font.ITALIC, 15)"; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/IconPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/IconPropertyEditorTest.java index 58be3e085..5d2e2a6b7 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/IconPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/IconPropertyEditorTest.java @@ -21,7 +21,7 @@ import org.eclipse.core.resources.IFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link IconPropertyEditor}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/ImagePropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/ImagePropertyEditorTest.java index ac262da82..27031964d 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/ImagePropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/ImagePropertyEditorTest.java @@ -20,8 +20,8 @@ import org.eclipse.core.resources.IFile; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * Test for {@link ImagePropertyEditor}. @@ -69,7 +69,7 @@ public void test_getText_fromFile() throws Exception { } } - @Ignore + @Disabled @Test public void test_getText_Class_getResource_1() throws Exception { assertImagePropertyText( @@ -82,7 +82,7 @@ public void test_getText_Class_getResource_1() throws Exception { "}"}); } - @Ignore + @Disabled @Test public void test_getText_Class_getResource_2() throws Exception { assertImagePropertyText( @@ -96,7 +96,7 @@ public void test_getText_Class_getResource_2() throws Exception { "}"}); } - @Ignore + @Disabled @Test public void test_getText_Class_getResource_3() throws Exception { assertImagePropertyText( diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/PropertiesTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/PropertiesTests.java index 0c549b8ff..a62a22f8a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/PropertiesTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/PropertiesTests.java @@ -12,9 +12,8 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.swing.model.property; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for Swing properties. @@ -22,8 +21,8 @@ * @author lobas_av * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ FontPropertyEditorTest.class, IconPropertyEditorTest.class, ImagePropertyEditorTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/TabOrderPropertyTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/TabOrderPropertyTest.java index be594f2e6..de90464e4 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/TabOrderPropertyTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/TabOrderPropertyTest.java @@ -25,8 +25,8 @@ import org.eclipse.wb.internal.swing.model.property.TabOrderProperty; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.awt.Container; import java.awt.FocusTraversalPolicy; @@ -44,7 +44,7 @@ public class TabOrderPropertyTest extends SwingModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_testProject != null) { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/TabOrderPropertyValueTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/TabOrderPropertyValueTest.java index dea09caab..4a80e6cf8 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/TabOrderPropertyValueTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/property/TabOrderPropertyValueTest.java @@ -22,9 +22,9 @@ import org.eclipse.jdt.core.IJavaProject; -import org.junit.After; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.List; @@ -42,7 +42,7 @@ public class TabOrderPropertyValueTest extends SwingModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { super.tearDown(); do_projectDispose(); @@ -97,7 +97,7 @@ public void test_getValue_1() throws Exception { assertSame(components.get(1), tabOrderInfo.getOrderedInfos().get(1)); } - @Ignore + @Disabled @Test public void test_getValue_2() throws Exception { ProjectUtils.ensureResourceType( @@ -138,7 +138,7 @@ public void test_getValue_2() throws Exception { assertSame(components.get(1), tabOrderInfo.getOrderedInfos().get(0)); } - @Ignore + @Disabled @Test public void test_setValue() throws Exception { // create panel diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/top/JFrameTopBoundsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/top/JFrameTopBoundsTest.java index f203afd96..e4b1f3da6 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/top/JFrameTopBoundsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/top/JFrameTopBoundsTest.java @@ -24,8 +24,8 @@ import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.jdt.core.ICompilationUnit; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.awt.Window; @@ -162,7 +162,7 @@ public MyBigFrame() { /** * Using {@link JFrame#pack()}. */ - @Ignore + @Disabled @Test public void test_resize_pack() throws Exception { Dimension packSize = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/top/JPanelTopBoundsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/top/JPanelTopBoundsTest.java index c619ee3dd..177070d79 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/top/JPanelTopBoundsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/top/JPanelTopBoundsTest.java @@ -22,7 +22,7 @@ import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.jdt.core.ICompilationUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.swing.JPanel; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/top/TopLevelTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/top/TopLevelTests.java index 1f57340ff..61783c039 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/top/TopLevelTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/top/TopLevelTests.java @@ -12,15 +12,14 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.swing.model.top; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ JPanelTopBoundsTest.class, JFrameTopBoundsTest.class }) diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/util/SurroundSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/util/SurroundSupportTest.java index c68fbac32..0c87f53f6 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/util/SurroundSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/util/SurroundSupportTest.java @@ -29,8 +29,8 @@ import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; @@ -327,7 +327,7 @@ public void test_absolute_singleControl() throws Exception { /** * Single {@link ComponentInfo} on {@link AbsoluteLayoutInfo}. */ - @Ignore + @Disabled @Test public void test_absolute_singleControl_onTitledJPanel() throws Exception { ContainerInfo panel = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/util/UtilTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/util/UtilTests.java index da244d60c..6a6f1a762 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/util/UtilTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/util/UtilTests.java @@ -12,16 +12,15 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.swing.model.util; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Swing utils tests. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ SurroundSupportTest.class }) +@Suite +@SelectClasses({ SurroundSupportTest.class }) public class UtilTests { } \ No newline at end of file diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/swingx/JXTaskPaneTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/swingx/JXTaskPaneTest.java index 5a08d8906..66d772a9d 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/swingx/JXTaskPaneTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/swingx/JXTaskPaneTest.java @@ -21,8 +21,8 @@ import org.eclipse.jdt.core.dom.CompilationUnit; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.awt.Component; import java.util.List; @@ -36,7 +36,7 @@ * * @author sablin_aa */ -@Ignore +@Disabled public class JXTaskPaneTest extends SwingxModelTest { //////////////////////////////////////////////////////////////////////////// // diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/swingx/SwingXTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/swingx/SwingXTests.java index 7c58dbf4a..7b5c39807 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/swingx/SwingXTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/swingx/SwingXTests.java @@ -12,16 +12,15 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.swing.swingx; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * All SwingX tests. * * @author sablin_aa */ -@RunWith(Suite.class) -@SuiteClasses({ JXTaskPaneTest.class }) +@Suite +@SelectClasses({ JXTaskPaneTest.class }) public class SwingXTests { } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/ManagerUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/ManagerUtilsTest.java index d35530c01..77efcd2cc 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/ManagerUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/ManagerUtilsTest.java @@ -22,8 +22,8 @@ import org.eclipse.jdt.core.IJavaProject; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link ManagerUtils}. @@ -39,7 +39,7 @@ public class ManagerUtilsTest extends RcpModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { shell = null; super.tearDown(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/SwtTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/SwtTests.java index 519e8328e..250cb5910 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/SwtTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/SwtTests.java @@ -15,18 +15,16 @@ import org.eclipse.wb.tests.designer.swt.model.ModelTests; import org.eclipse.wb.tests.designer.swt.support.CoordinateUtilsTest; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * All SWT tests. * * @author sablin_aa */ - -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ ManagerUtilsTest.class, ModelTests.class, CoordinateUtilsTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/ClipboardTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/ClipboardTest.java index aa1161f3a..7a06d9efb 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/ClipboardTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/ClipboardTest.java @@ -28,8 +28,8 @@ import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Rectangle; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Test for {@link JavaInfoMemento} and other clipboard related operations. @@ -53,7 +53,7 @@ public void _test_exit() throws Exception { //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); ToolkitProvider.DESCRIPTION.getPreferences().setValue(IPreferenceConstants.P_USE_RESOURCE_MANAGER, false); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/ModelTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/ModelTests.java index ccc7ad201..67fd21431 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/ModelTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/ModelTests.java @@ -18,17 +18,16 @@ import org.eclipse.wb.tests.designer.swt.model.property.PropertiesTests; import org.eclipse.wb.tests.designer.swt.model.widgets.WidgetTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * SWT model tests. * * @author sablin_aa */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ WidgetTests.class, PropertiesTests.class, LayoutTests.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/jface/JFaceTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/jface/JFaceTests.java index e1ae6f6b4..e9d7089b8 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/jface/JFaceTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/jface/JFaceTests.java @@ -12,16 +12,15 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.swt.model.jface; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for SWT JFace models. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ ViewerTest.class }) +@Suite +@SelectClasses({ ViewerTest.class }) public class JFaceTests { } \ No newline at end of file diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/jface/ViewerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/jface/ViewerTest.java index 4b73b4728..6e22b720c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/jface/ViewerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/jface/ViewerTest.java @@ -54,7 +54,7 @@ import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link ViewerInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/AbsoluteLayoutOrderingTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/AbsoluteLayoutOrderingTest.java index 23db1fe9a..aa8f3c3fe 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/AbsoluteLayoutOrderingTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/AbsoluteLayoutOrderingTest.java @@ -22,7 +22,7 @@ import org.eclipse.jface.action.IMenuManager; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; @@ -244,7 +244,7 @@ private static IAction getOrderAction(IMenuManager orderManager, String text) { */ private static void checkOrderAction(IMenuManager orderManager, String text, boolean enabled) { IAction action = getOrderAction(orderManager, text); - assertNotNull("Can not find action: " + text, action); + assertNotNull(action, "Can not find action: " + text); assertEquals(enabled, action.isEnabled()); } } \ No newline at end of file diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/AbsoluteLayoutSelectionActionsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/AbsoluteLayoutSelectionActionsTest.java index 626ca3196..6f0ada8a0 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/AbsoluteLayoutSelectionActionsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/AbsoluteLayoutSelectionActionsTest.java @@ -23,8 +23,8 @@ import org.eclipse.wb.tests.designer.core.model.TestObjectInfo; import org.eclipse.wb.tests.designer.rcp.RcpModelTest; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -1043,7 +1043,7 @@ public void test_align_space_equally_2() throws Exception { // Center in window // //////////////////////////////////////////////////////////////////////////// - @Ignore + @Disabled @Test public void test_align_center_in_window() throws Exception { CompositeInfo shell = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/AbsoluteLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/AbsoluteLayoutTest.java index b328d777d..d6e03224d 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/AbsoluteLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/AbsoluteLayoutTest.java @@ -51,8 +51,8 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableRunnable; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import java.util.Collections; @@ -71,7 +71,7 @@ public class AbsoluteLayoutTest extends RcpModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { super.tearDown(); preferences.setValue(IPreferenceConstants.P_CREATION_FLOW, false); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/FillLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/FillLayoutTest.java index c4bf478b7..7e9f9c2cd 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/FillLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/FillLayoutTest.java @@ -28,7 +28,7 @@ import org.eclipse.swt.SWT; import org.apache.commons.lang3.NotImplementedException; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link FillLayoutInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/ImplicitLayoutDataTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/ImplicitLayoutDataTest.java index 5b5d9cb28..edfbbd428 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/ImplicitLayoutDataTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/ImplicitLayoutDataTest.java @@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.Control; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author lobas_av diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/LayoutDataTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/LayoutDataTest.java index 9349379eb..75eb56922 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/LayoutDataTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/LayoutDataTest.java @@ -29,7 +29,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Layout; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link LayoutDataInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/LayoutLayoutDataCompatibilityTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/LayoutLayoutDataCompatibilityTest.java index 74792035f..856942b64 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/LayoutLayoutDataCompatibilityTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/LayoutLayoutDataCompatibilityTest.java @@ -24,7 +24,7 @@ import org.eclipse.swt.layout.RowData; import org.eclipse.swt.widgets.Layout; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test that LayoutData corresponds to {@link Layout}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/LayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/LayoutTest.java index 7d63e14ea..81c8a188a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/LayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/LayoutTest.java @@ -36,7 +36,7 @@ import org.eclipse.swt.widgets.Layout; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author lobas_av diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/LayoutTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/LayoutTests.java index a2e005b6c..2f7cb8735 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/LayoutTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/LayoutTests.java @@ -14,17 +14,16 @@ import org.eclipse.wb.tests.designer.swt.model.layouts.grid.GridLayoutTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for SWT layouts models. * * @author lobas_av */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ LayoutTest.class, LayoutDataTest.class, VirtualLayoutDataTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/RowLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/RowLayoutTest.java index 5aaaaf491..8f3eaeea2 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/RowLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/RowLayoutTest.java @@ -28,7 +28,7 @@ import org.eclipse.swt.SWT; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link RowLayoutInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/VirtualLayoutDataTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/VirtualLayoutDataTest.java index 5535f88e0..af8b8ce05 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/VirtualLayoutDataTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/VirtualLayoutDataTest.java @@ -34,7 +34,7 @@ import org.eclipse.wb.tests.designer.rcp.BTestUtils; import org.eclipse.wb.tests.designer.rcp.RcpModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author lobas_av diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridDataTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridDataTest.java index c25564606..dfc5c4862 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridDataTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridDataTest.java @@ -32,7 +32,7 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link GridDataInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutConverterTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutConverterTest.java index 484873ff4..48b67ce90 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutConverterTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutConverterTest.java @@ -23,7 +23,7 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.swt.layout.GridLayout; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link GridLayoutConverter}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutExposedTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutExposedTest.java index dd56b05f5..89bf143c3 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutExposedTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutExposedTest.java @@ -24,7 +24,7 @@ import org.eclipse.wb.internal.swt.model.widgets.ControlInfo; import org.eclipse.wb.tests.designer.rcp.RcpModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link GridLayoutInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutGefTest.java index 1e04595e8..b5c8d244d 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutGefTest.java @@ -34,7 +34,7 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Control; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutParametersTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutParametersTest.java index bd8e855ea..5c3904f37 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutParametersTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutParametersTest.java @@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.Text; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link GridLayoutInfo} and special parameters for grab/alignment. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutSelectionActionsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutSelectionActionsTest.java index b6f3382e2..ab0a52d15 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutSelectionActionsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutSelectionActionsTest.java @@ -21,7 +21,7 @@ import org.eclipse.swt.widgets.Control; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutTest.java index 564d583d6..bf2a81c35 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutTest.java @@ -44,7 +44,7 @@ import org.eclipse.swt.widgets.Shell; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutTests.java index eb9dc8f3b..879285b63 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutTests.java @@ -14,17 +14,16 @@ import org.eclipse.wb.internal.swt.model.layout.grid.GridLayoutInfo; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for {@link GridLayoutInfo}. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ GridDataTest.class, GridLayoutSelectionActionsTest.class, GridLayoutTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/AbstractMenuObjectTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/AbstractMenuObjectTest.java index f632bf6d5..f9c3889f7 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/AbstractMenuObjectTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/AbstractMenuObjectTest.java @@ -28,8 +28,8 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import org.apache.commons.lang3.NotImplementedException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link AbstractMenuObject}. @@ -46,7 +46,7 @@ public class AbstractMenuObjectTest extends DesignerTestCase { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); m_menuObject = new AbstractMenuObject(null) { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuBarPopupTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuBarPopupTest.java index fa3fb654b..ba5fe7fb1 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuBarPopupTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuBarPopupTest.java @@ -20,7 +20,7 @@ import org.eclipse.wb.internal.swt.model.widgets.menu.MenuInfo; import org.eclipse.wb.tests.designer.rcp.RcpGefTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuComplexTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuComplexTest.java index d2ceeabf6..8aae56af1 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuComplexTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuComplexTest.java @@ -26,8 +26,8 @@ import org.eclipse.draw2d.PositionConstants; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import java.util.List; @@ -60,7 +60,7 @@ protected void fetchContentFields() { } @Override - @After + @AfterEach public void tearDown() throws Exception { menuTester = null; super.tearDown(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuItemTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuItemTest.java index 11f094b52..ee2920cad 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuItemTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuItemTest.java @@ -32,8 +32,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import java.util.List; @@ -487,7 +487,7 @@ public void test_setStyle_fromCascade_toSeparator() throws Exception { /** * Test adding a selection listener to menu item. */ - @Ignore + @Disabled @Test public void test_addSelectionListener() throws Exception { CompositeInfo shell = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuObjectInfoUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuObjectInfoUtilsTest.java index b8bf481c2..bfbbf3efd 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuObjectInfoUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuObjectInfoUtilsTest.java @@ -29,7 +29,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuPopupSimpleTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuPopupSimpleTest.java index ac2ab7c24..f813361d7 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuPopupSimpleTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuPopupSimpleTest.java @@ -30,9 +30,9 @@ import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Rectangle; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.List; @@ -55,7 +55,7 @@ public class MenuPopupSimpleTest extends RcpGefTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // open editor @@ -87,7 +87,7 @@ protected void fetchContentFields() { } @Override - @After + @AfterEach public void tearDown() throws Exception { // clean models shellInfo = null; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuProblemsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuProblemsTest.java index b4f8f8120..99824281b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuProblemsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuProblemsTest.java @@ -20,7 +20,7 @@ import org.eclipse.wb.internal.swt.model.widgets.menu.MenuInfo; import org.eclipse.wb.tests.designer.rcp.RcpGefTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests found bugs with menu. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuTest.java index ffc75caae..c0648e732 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuTest.java @@ -42,7 +42,7 @@ import org.eclipse.swt.widgets.MenuItem; import org.eclipse.swt.widgets.Shell; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuTests.java index df6b28787..74d7357f6 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuTests.java @@ -14,17 +14,16 @@ import org.eclipse.swt.widgets.Menu; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for {@link Menu}. * * @author mitin_aa */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ AbstractMenuObjectTest.class, MenuItemTest.class, MenuTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ColorPropertyEditorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ColorPropertyEditorTest.java index b328ad3f1..e2d187acf 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ColorPropertyEditorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ColorPropertyEditorTest.java @@ -19,7 +19,7 @@ import org.eclipse.wb.internal.swt.preferences.IPreferenceConstants; import org.eclipse.wb.tests.designer.rcp.RcpModelTest; -import org.junit.After; +import org.junit.jupiter.api.AfterEach; /** * Tests for {@link ColorPropertyEditor}. @@ -33,7 +33,7 @@ public abstract class ColorPropertyEditorTest extends RcpModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @After + @AfterEach public void tearDown() throws Exception { super.tearDown(); ToolkitProvider.DESCRIPTION.getPreferences().setToDefault( diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ColorPropertyEditorTestNoManager.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ColorPropertyEditorTestNoManager.java index f63af10c9..e773c4197 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ColorPropertyEditorTestNoManager.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ColorPropertyEditorTestNoManager.java @@ -20,8 +20,8 @@ import org.eclipse.jface.resource.LocalResourceManager; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link ColorPropertyEditor} without {@link LocalResourceManager}. @@ -35,7 +35,7 @@ public class ColorPropertyEditorTestNoManager extends ColorPropertyEditorTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); ToolkitProvider.DESCRIPTION.getPreferences().setValue( diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ColorPropertyEditorTestRegistry.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ColorPropertyEditorTestRegistry.java index fe444c82f..4d67b9e5e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ColorPropertyEditorTestRegistry.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ColorPropertyEditorTestRegistry.java @@ -21,7 +21,7 @@ import org.eclipse.wb.internal.swt.model.widgets.CompositeInfo; import org.eclipse.wb.internal.swt.preferences.IPreferenceConstants; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ColorPropertyEditorTestWithManager.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ColorPropertyEditorTestWithManager.java index 8de219b01..158af1605 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ColorPropertyEditorTestWithManager.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ColorPropertyEditorTestWithManager.java @@ -22,8 +22,8 @@ import org.eclipse.jface.resource.LocalResourceManager; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link ColorPropertyEditor} with {@link LocalResourceManager}. @@ -37,7 +37,7 @@ public class ColorPropertyEditorTestWithManager extends ColorPropertyEditorTest // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); ToolkitProvider.DESCRIPTION.getPreferences().setValue( diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ConvertersTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ConvertersTest.java index d1032034a..595c594ff 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ConvertersTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ConvertersTest.java @@ -21,9 +21,9 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.swt.graphics.Point; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for SWT converters. @@ -39,7 +39,7 @@ public class ConvertersTest extends RcpModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); shell = @@ -52,7 +52,7 @@ public void setUp() throws Exception { } @Override - @After + @AfterEach public void tearDown() throws Exception { shell = null; super.tearDown(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/FontPropertyEditorTestNoManager.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/FontPropertyEditorTestNoManager.java index 05bd91ea3..d67ac0e3d 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/FontPropertyEditorTestNoManager.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/FontPropertyEditorTestNoManager.java @@ -20,8 +20,8 @@ import org.eclipse.jface.resource.LocalResourceManager; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link FontPropertyEditor} without {@link LocalResourceManager}. @@ -35,7 +35,7 @@ public class FontPropertyEditorTestNoManager extends FontPropertyEditorTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); ToolkitProvider.DESCRIPTION.getPreferences().setValue( diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/FontPropertyEditorTestRegistry.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/FontPropertyEditorTestRegistry.java index b2eadf42d..b6c85f925 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/FontPropertyEditorTestRegistry.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/FontPropertyEditorTestRegistry.java @@ -21,7 +21,7 @@ import org.eclipse.wb.internal.swt.model.widgets.CompositeInfo; import org.eclipse.wb.internal.swt.preferences.IPreferenceConstants; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/FontPropertyEditorTestWithManager.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/FontPropertyEditorTestWithManager.java index f6543c206..47862eaf1 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/FontPropertyEditorTestWithManager.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/FontPropertyEditorTestWithManager.java @@ -21,8 +21,8 @@ import org.eclipse.jface.resource.LocalResourceManager; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link FontPropertyEditor} with {@link LocalResourceManager}. @@ -36,7 +36,7 @@ public class FontPropertyEditorTestWithManager extends FontPropertyEditorTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); ToolkitProvider.DESCRIPTION.getPreferences().setValue( diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImageDescriptorPropertyEditorTestNoManager.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImageDescriptorPropertyEditorTestNoManager.java index c5bfb1562..45abf1d93 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImageDescriptorPropertyEditorTestNoManager.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImageDescriptorPropertyEditorTestNoManager.java @@ -23,8 +23,8 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.apache.commons.io.FilenameUtils; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.File; @@ -41,7 +41,7 @@ public class ImageDescriptorPropertyEditorTestNoManager extends ImageDescriptorP // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); ToolkitProvider.DESCRIPTION.getPreferences().setValue( diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImageDescriptorPropertyEditorTestPlugin.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImageDescriptorPropertyEditorTestPlugin.java index e82b36720..665d2ae9b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImageDescriptorPropertyEditorTestPlugin.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImageDescriptorPropertyEditorTestPlugin.java @@ -21,7 +21,7 @@ import org.eclipse.core.resources.IFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link ImageDescriptorPropertyEditor} with plugin images. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImageDescriptorPropertyEditorTestWithManager.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImageDescriptorPropertyEditorTestWithManager.java index d506bdfd7..18b7abfda 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImageDescriptorPropertyEditorTestWithManager.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImageDescriptorPropertyEditorTestWithManager.java @@ -23,8 +23,8 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.apache.commons.io.FilenameUtils; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.File; @@ -41,7 +41,7 @@ public class ImageDescriptorPropertyEditorTestWithManager extends ImageDescripto // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); ToolkitProvider.DESCRIPTION.getPreferences().setValue( diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImagePropertyEditorTestNoManager.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImagePropertyEditorTestNoManager.java index d5d807076..9c6bab830 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImagePropertyEditorTestNoManager.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImagePropertyEditorTestNoManager.java @@ -21,9 +21,9 @@ import org.eclipse.jface.resource.LocalResourceManager; import org.apache.commons.io.FilenameUtils; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.io.File; @@ -39,7 +39,7 @@ public class ImagePropertyEditorTestNoManager extends ImagePropertyEditorTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); ToolkitProvider.DESCRIPTION.getPreferences().setValue( @@ -97,7 +97,7 @@ public void test_textSource_absolutePath() throws Exception { /** * Image creation using constructor with input stream (over class resource). */ - @Ignore + @Disabled @Test public void test_textSource_image_over_classpath() throws Exception { assert_getText_getClipboardSource_forSource( @@ -109,7 +109,7 @@ public void test_textSource_image_over_classpath() throws Exception { /** * Image creation using constructor with input stream (over class resource). */ - @Ignore + @Disabled @Test public void test_textSource_image_over_classpath_OtherClass() throws Exception { assert_getText_getClipboardSource_forSource( diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImagePropertyEditorTestPlugin.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImagePropertyEditorTestPlugin.java index 580c8e288..52d9045aa 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImagePropertyEditorTestPlugin.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImagePropertyEditorTestPlugin.java @@ -21,7 +21,7 @@ import org.eclipse.core.resources.IFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link ImagePropertyEditor} with plugin images. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImagePropertyEditorTestWithManager.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImagePropertyEditorTestWithManager.java index 6a2b1ed84..6e7e1d67a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImagePropertyEditorTestWithManager.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImagePropertyEditorTestWithManager.java @@ -25,9 +25,9 @@ import org.eclipse.jface.resource.LocalResourceManager; import org.apache.commons.io.FilenameUtils; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.io.File; @@ -43,7 +43,7 @@ public class ImagePropertyEditorTestWithManager extends ImagePropertyEditorTest // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); ToolkitProvider.DESCRIPTION.getPreferences().setValue( @@ -103,7 +103,7 @@ public void test_textSource_absolutePath() throws Exception { /** * Image creation using constructor with input stream (over class resource). */ - @Ignore + @Disabled @Test public void test_textSource_image_over_classpath() throws Exception { assert_getText_getClipboardSource_forSource( @@ -115,7 +115,7 @@ public void test_textSource_image_over_classpath() throws Exception { /** * Image creation using constructor with input stream (over class resource). */ - @Ignore + @Disabled @Test public void test_textSource_image_over_classpath_OtherClass() throws Exception { assert_getText_getClipboardSource_forSource( diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/LocalResourceManagerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/LocalResourceManagerTest.java index 20900407b..57804055a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/LocalResourceManagerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/LocalResourceManagerTest.java @@ -18,7 +18,7 @@ import org.eclipse.wb.internal.swt.model.widgets.CompositeInfo; import org.eclipse.wb.tests.designer.rcp.RcpModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/PropertiesTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/PropertiesTests.java index 337f1d6f8..ed9413a02 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/PropertiesTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/PropertiesTests.java @@ -12,9 +12,8 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.swt.model.property; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for SWT properties. @@ -22,8 +21,8 @@ * @author lobas_av * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ ConvertersTest.class, ColorPropertyEditorTestNoManager.class, ColorPropertyEditorTestWithManager.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ResourceManagerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ResourceManagerTest.java index c7712514a..cfd9f1a51 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ResourceManagerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ResourceManagerTest.java @@ -19,9 +19,9 @@ import org.eclipse.swt.SWT; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.lang.reflect.Constructor; import java.net.URL; @@ -45,7 +45,7 @@ public class ResourceManagerTest extends RcpModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); CompositeInfo shell = @@ -66,7 +66,7 @@ public void setUp() throws Exception { } @Override - @After + @AfterEach public void tearDown() throws Exception { if (m_testProject != null && ManagerClass != null) { ReflectionUtils.invokeMethod(ManagerClass, "dispose()"); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ResourceRegistryTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ResourceRegistryTest.java index facabe813..74bff2053 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ResourceRegistryTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ResourceRegistryTest.java @@ -22,8 +22,8 @@ import org.eclipse.swt.widgets.Display; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.lang.reflect.Array; import java.util.List; @@ -45,7 +45,7 @@ public class ResourceRegistryTest extends RcpModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); m_initialDisplayRunnables = getDisplayRunnablesCount(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/SWTResourceManagerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/SWTResourceManagerTest.java index 40d9b0f37..aa9a5727b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/SWTResourceManagerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/SWTResourceManagerTest.java @@ -21,10 +21,10 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.ImageData; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.io.File; import java.lang.reflect.Array; @@ -47,7 +47,7 @@ public class SWTResourceManagerTest extends RcpModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); CompositeInfo shell = @@ -67,7 +67,7 @@ public void setUp() throws Exception { } @Override - @After + @AfterEach public void tearDown() throws Exception { if (m_testProject != null && SWTManagerClass != null) { ReflectionUtils.invokeMethod(SWTManagerClass, "dispose()"); @@ -212,7 +212,7 @@ public void test_getImage_absolute() throws Exception { } } - @Ignore + @Disabled @Test public void test_getImage_classpath() throws Exception { // create image over SWTResourceManager diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/TabOrderPropertyTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/TabOrderPropertyTest.java index a64af2b9a..c5bc7f03a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/TabOrderPropertyTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/TabOrderPropertyTest.java @@ -24,7 +24,7 @@ import org.eclipse.wb.internal.swt.model.widgets.ControlInfo; import org.eclipse.wb.tests.designer.rcp.RcpModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/ButtonsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/ButtonsTest.java index 7c1979e57..e334d5b5a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/ButtonsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/ButtonsTest.java @@ -21,7 +21,7 @@ import org.eclipse.swt.widgets.Button; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link ButtonInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/CompositeTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/CompositeTest.java index a44bd3348..5cee9487a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/CompositeTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/CompositeTest.java @@ -64,7 +64,7 @@ import org.apache.commons.lang3.StringUtils; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/CompositeTopBoundsSupportTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/CompositeTopBoundsSupportTest.java index 9145a0c41..c60e0ed64 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/CompositeTopBoundsSupportTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/CompositeTopBoundsSupportTest.java @@ -18,7 +18,7 @@ import org.eclipse.draw2d.geometry.Dimension; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link CompositeTopBoundsSupport}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/CompositeTopBoundsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/CompositeTopBoundsTest.java index 48e7b6979..51288a5ec 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/CompositeTopBoundsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/CompositeTopBoundsTest.java @@ -23,7 +23,7 @@ import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.jdt.core.ICompilationUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Basic tests for {@link CompositeTopBoundsSupport}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/ControlTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/ControlTest.java index b9bcd77ef..7a7f14f05 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/ControlTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/ControlTest.java @@ -13,7 +13,6 @@ package org.eclipse.wb.tests.designer.swt.model.widgets; import org.eclipse.wb.core.model.association.RootAssociation; -import org.eclipse.wb.internal.core.EnvironmentUtils; import org.eclipse.wb.internal.core.model.property.Property; import org.eclipse.wb.internal.core.model.property.editor.string.StringPropertyEditor; import org.eclipse.wb.internal.core.model.util.PlaceholderUtils; @@ -41,10 +40,8 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; -import static org.junit.Assume.assumeTrue; - import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.List; @@ -70,12 +67,11 @@ public void _test_exit() throws Exception { //////////////////////////////////////////////////////////////////////////// @Test public void test_MethodMain() throws Exception { - assumeTrue(EnvironmentUtils.IS_WINDOWS); CompositeInfo shellInfo = parseComposite( "class Test {", " public static void main(String[] args) {", - " Shell shell = new Shell();", + " Shell shell = new Shell(SWT.NONE);", " shell.setSize(320, 240);", " shell.setText('SWT');", " Button button = new Button(shell, SWT.NONE);", @@ -306,7 +302,7 @@ public void test_preferredBounds_usualBounds() throws Exception { CompositeInfo composite = (CompositeInfo) shell.getChildrenControls().get(0); GridLayoutInfo gridLayout = (GridLayoutInfo) composite.getLayout(); int columnWidth = gridLayout.getGridInfo().getColumnIntervals()[0].length(); - assertTrue("More than 400 expected, but " + columnWidth + " found", columnWidth > 400); + assertTrue(columnWidth > 400, "More than 400 expected, but " + columnWidth + " found"); } /** diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/DescriptionProcessorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/DescriptionProcessorTest.java index 10c3e33cc..12e6ba489 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/DescriptionProcessorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/DescriptionProcessorTest.java @@ -28,7 +28,7 @@ import org.eclipse.swt.widgets.Composite; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link DescriptionProcessor} for SWT. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/InstanceFactoryTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/InstanceFactoryTest.java index ac22b3e6e..551e2c6fd 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/InstanceFactoryTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/InstanceFactoryTest.java @@ -19,7 +19,7 @@ import org.eclipse.wb.internal.swt.model.widgets.ControlInfo; import org.eclipse.wb.tests.designer.rcp.RcpModelTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/LiveComponentsManagerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/LiveComponentsManagerTest.java index 423734041..2b5fdee8e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/LiveComponentsManagerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/LiveComponentsManagerTest.java @@ -38,7 +38,7 @@ import org.eclipse.swt.graphics.Image; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link SwtLiveManager}, style access. @@ -327,32 +327,32 @@ public void test_liveStyle_standardControl() throws Exception { ControlInfo button = createJavaInfo("org.eclipse.swt.widgets.Button", null); int actualStyle = button.getStyle(); assertTrue( - "SWT.PUSH bit expected, but " + Integer.toHexString(actualStyle) + " found.", - (actualStyle & SWT.PUSH) == SWT.PUSH); + (actualStyle & SWT.PUSH) == SWT.PUSH, + "SWT.PUSH bit expected, but " + Integer.toHexString(actualStyle) + " found."); } // CHECK { ControlInfo button = createJavaInfo("org.eclipse.swt.widgets.Button", "check"); int actualStyle = button.getStyle(); assertTrue( - "SWT.CHECK bit expected, but " + Integer.toHexString(actualStyle) + " found.", - (actualStyle & SWT.CHECK) == SWT.CHECK); + (actualStyle & SWT.CHECK) == SWT.CHECK, + "SWT.CHECK bit expected, but " + Integer.toHexString(actualStyle) + " found."); } // RADIO { ControlInfo button = createJavaInfo("org.eclipse.swt.widgets.Button", "radio"); int actualStyle = button.getStyle(); assertTrue( - "SWT.RADIO bit expected, but " + Integer.toHexString(actualStyle) + " found.", - (actualStyle & SWT.RADIO) == SWT.RADIO); + (actualStyle & SWT.RADIO) == SWT.RADIO, + "SWT.RADIO bit expected, but " + Integer.toHexString(actualStyle) + " found."); } // Text: BORDER { ControlInfo text = BTestUtils.createControl("org.eclipse.swt.widgets.Text"); int actualStyle = text.getStyle(); assertTrue( - "SWT.BORDER bit expected, but " + Integer.toHexString(actualStyle) + " found.", - (actualStyle & SWT.BORDER) == SWT.BORDER); + (actualStyle & SWT.BORDER) == SWT.BORDER, + "SWT.BORDER bit expected, but " + Integer.toHexString(actualStyle) + " found."); } } @@ -378,11 +378,12 @@ public void test_liveStyle_customControl() throws Exception { ControlInfo myComposite = BTestUtils.createControl("test.MyComposite"); int actualStyle = myComposite.getStyle(); assertTrue( - "SWT.BORDER bit expected, but " + Integer.toHexString(actualStyle) + " found.", - (actualStyle & SWT.BORDER) == SWT.BORDER); - assertTrue("SWT.NO_RADIO_GROUP bit expected, but " + (actualStyle & SWT.BORDER) == SWT.BORDER, + "SWT.BORDER bit expected, but " + Integer.toHexString(actualStyle) + " found."); + assertTrue((actualStyle & SWT.NO_RADIO_GROUP) == SWT.NO_RADIO_GROUP, + "SWT.NO_RADIO_GROUP bit expected, but " + Integer.toHexString(actualStyle) - + " found.", (actualStyle & SWT.NO_RADIO_GROUP) == SWT.NO_RADIO_GROUP); + + " found."); } @Test @@ -398,16 +399,16 @@ public void test_liveStyle_forMenu() throws Exception { WidgetInfo menu = createJavaInfo("org.eclipse.swt.widgets.Menu", "bar"); int actualStyle = menu.getStyle(); assertTrue( - "SWT.BAR bit expected, but " + Integer.toHexString(actualStyle) + " found.", - (actualStyle & SWT.BAR) == SWT.BAR); + (actualStyle & SWT.BAR) == SWT.BAR, + "SWT.BAR bit expected, but " + Integer.toHexString(actualStyle) + " found."); } // POPUP { WidgetInfo menu = createJavaInfo("org.eclipse.swt.widgets.Menu", null); int actualStyle = menu.getStyle(); assertTrue( - "SWT.POP_UP bit expected, but " + Integer.toHexString(actualStyle) + " found.", - (actualStyle & SWT.POP_UP) == SWT.POP_UP); + (actualStyle & SWT.POP_UP) == SWT.POP_UP, + "SWT.POP_UP bit expected, but " + Integer.toHexString(actualStyle) + " found."); } } @@ -424,35 +425,37 @@ public void test_liveStyle_forMenuItem() throws Exception { WidgetInfo menuItem = createJavaInfo("org.eclipse.swt.widgets.MenuItem"); int actualStyle = menuItem.getStyle(); assertTrue( - "SWT.PUSH bit expected, but " + Integer.toHexString(actualStyle) + " found.", - (actualStyle & SWT.PUSH) == SWT.PUSH); - assertFalse("Not SWT.CASCADE bit expected, but " + (actualStyle & SWT.PUSH) == SWT.PUSH, + "SWT.PUSH bit expected, but " + Integer.toHexString(actualStyle) + " found."); + assertFalse( + (actualStyle & SWT.CASCADE) == SWT.CASCADE, + "Not SWT.CASCADE bit expected, but " + Integer.toHexString(actualStyle) - + " found.", (actualStyle & SWT.CASCADE) == SWT.CASCADE); + + " found."); } // CHECK { WidgetInfo menuItem = createJavaInfo("org.eclipse.swt.widgets.MenuItem", "check"); int actualStyle = menuItem.getStyle(); assertTrue( - "SWT.CHECK bit expected, but " + Integer.toHexString(actualStyle) + " found.", - (actualStyle & SWT.CHECK) == SWT.CHECK); + (actualStyle & SWT.CHECK) == SWT.CHECK, + "SWT.CHECK bit expected, but " + Integer.toHexString(actualStyle) + " found."); } // RADIO { WidgetInfo menuItem = createJavaInfo("org.eclipse.swt.widgets.MenuItem", "radio"); int actualStyle = menuItem.getStyle(); assertTrue( - "SWT.RADIO bit expected, but " + Integer.toHexString(actualStyle) + " found.", - (actualStyle & SWT.RADIO) == SWT.RADIO); + (actualStyle & SWT.RADIO) == SWT.RADIO, + "SWT.RADIO bit expected, but " + Integer.toHexString(actualStyle) + " found."); } // CASCADE { WidgetInfo menuItem = createJavaInfo("org.eclipse.swt.widgets.MenuItem", "cascade"); int actualStyle = menuItem.getStyle(); assertTrue( - "SWT.CASCADE bit expected, but " + Integer.toHexString(actualStyle) + " found.", - (actualStyle & SWT.CASCADE) == SWT.CASCADE); + (actualStyle & SWT.CASCADE) == SWT.CASCADE, + "SWT.CASCADE bit expected, but " + Integer.toHexString(actualStyle) + " found."); } } @@ -490,8 +493,8 @@ public void test_liveStyle_forStaticFactory() throws Exception { // check style int actualStyle = button.getStyle(); assertTrue( - "SWT.PUSH bit expected, but " + Integer.toHexString(actualStyle) + " found.", - (actualStyle & SWT.PUSH) == SWT.PUSH); + (actualStyle & SWT.PUSH) == SWT.PUSH, + "SWT.PUSH bit expected, but " + Integer.toHexString(actualStyle) + " found."); } @Test @@ -518,8 +521,8 @@ public void test_liveStyle_copyPaste() throws Exception { { int actualStyle = pasteButton.getStyle(); assertTrue( - "SWT.PUSH bit expected, but " + Integer.toHexString(actualStyle) + " found.", - (actualStyle & SWT.PUSH) == SWT.PUSH); + (actualStyle & SWT.PUSH) == SWT.PUSH, + "SWT.PUSH bit expected, but " + Integer.toHexString(actualStyle) + " found."); } // we still can paste RowLayoutInfo rowLayout = (RowLayoutInfo) shell.getLayout(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/LiveImagesManagerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/LiveImagesManagerTest.java index 326b2e3ae..bf4f6c9ce 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/LiveImagesManagerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/LiveImagesManagerTest.java @@ -33,7 +33,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link LiveImagesManager}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/ScrollableTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/ScrollableTest.java index 03ae0f84f..c3ebdbdd8 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/ScrollableTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/ScrollableTest.java @@ -18,7 +18,7 @@ import org.eclipse.draw2d.geometry.Rectangle; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link ScrollableInfo}. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/StaticFactoryTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/StaticFactoryTest.java index 015d1e4d4..e91663b1f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/StaticFactoryTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/StaticFactoryTest.java @@ -29,8 +29,8 @@ import org.eclipse.swt.graphics.Image; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Test for static factory and eSWT. @@ -44,7 +44,7 @@ public class StaticFactoryTest extends RcpModelTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); setFileContentSrc( diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/TableTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/TableTest.java index 69033fb1e..a14d53d2c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/TableTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/TableTest.java @@ -32,8 +32,8 @@ import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.List; @@ -187,7 +187,7 @@ public void test_add_TableItem() throws Exception { * area, hence why we have to adjust them for the tests. */ // Disabled because of https://github.com/eclipse-windowbuilder/windowbuilder/issues/389 - @Ignore + @Disabled @Test public void test_TableColumn() throws Exception { CompositeInfo shell = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/ThisCompositeTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/ThisCompositeTest.java index 1ab505299..debd78bbb 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/ThisCompositeTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/ThisCompositeTest.java @@ -22,7 +22,7 @@ import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.swt.widgets.Shell; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/TreeTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/TreeTest.java index d37324a5d..54bc08033 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/TreeTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/TreeTest.java @@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.TreeItem; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/WidgetTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/WidgetTest.java index feb4fe197..60e9eaea6 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/WidgetTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/WidgetTest.java @@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Widget; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link WidgetInfo}. @@ -70,16 +70,16 @@ public void test_getStyle() throws Exception { WidgetInfo text = shell.getChildrenControls().get(0); int actualStyle = text.getStyle(); assertTrue( - "SWT.BORDER bit expected, but " + Integer.toHexString(actualStyle) + " found.", - (actualStyle & SWT.BORDER) == SWT.BORDER); + (actualStyle & SWT.BORDER) == SWT.BORDER, + "SWT.BORDER bit expected, but " + Integer.toHexString(actualStyle) + " found."); } // Button: CHECK { ControlInfo checkButton = createJavaInfo("org.eclipse.swt.widgets.Button", "check"); int actualStyle = checkButton.getStyle(); assertTrue( - "SWT.CHECK bit expected, but " + Integer.toHexString(actualStyle) + " found.", - (actualStyle & SWT.CHECK) == SWT.CHECK); + (actualStyle & SWT.CHECK) == SWT.CHECK, + "SWT.CHECK bit expected, but " + Integer.toHexString(actualStyle) + " found."); } } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/WidgetTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/WidgetTests.java index 25969de84..a50082ce0 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/WidgetTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/WidgetTests.java @@ -12,17 +12,16 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.swt.model.widgets; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for SWT widgets models. * * @author lobas_av */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ WidgetTest.class, LiveComponentsManagerTest.class, DescriptionProcessorTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/support/CoordinateUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/support/CoordinateUtilsTest.java index abf8b085d..3ed157682 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/support/CoordinateUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/support/CoordinateUtilsTest.java @@ -28,8 +28,8 @@ import org.eclipse.swt.widgets.Shell; import org.assertj.core.api.Assertions; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * Tests for SWT {@link CoordinateUtils}. @@ -52,7 +52,7 @@ public void _test_exit() throws Exception { // //////////////////////////////////////////////////////////////////////////// // Disabled because of https://github.com/eclipse-windowbuilder/windowbuilder/issues/389 - @Ignore + @Disabled @Test public void test_1() throws Exception { ShellInfo shell = (ShellInfo) parseComposite( @@ -100,7 +100,7 @@ public void test_1() throws Exception { /** * Test for {@link CoordinateUtils#getClientAreaInsets2(Object)} for {@link Group}. */ - @Ignore + @Disabled @Test public void test_withGroup() throws Exception { CompositeInfo shell = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/tests/DesignerTestCase.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/tests/DesignerTestCase.java index 27c144e7d..fd2ddda25 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/tests/DesignerTestCase.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/tests/DesignerTestCase.java @@ -22,8 +22,6 @@ import org.eclipse.wb.internal.core.utils.reflect.ReflectionUtils; import org.eclipse.wb.tests.designer.TestUtils; -import static org.eclipse.swtbot.swt.finder.waits.Conditions.shellCloses; - import org.eclipse.core.runtime.ILog; import org.eclipse.core.runtime.ILogListener; import org.eclipse.core.runtime.IStatus; @@ -43,7 +41,6 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.swtbot.swt.finder.SWTBot; -import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable; import org.eclipse.swtbot.swt.finder.waits.DefaultCondition; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; @@ -56,13 +53,12 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.BeforeTestExecutionCallback; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.RegisterExtension; import java.io.FileInputStream; import java.io.InputStream; @@ -80,7 +76,7 @@ * * @author scheglov_ke */ -public abstract class DesignerTestCase extends Assert { +public abstract class DesignerTestCase extends Assertions { private static boolean m_firstDesignerTest = true; private final Logger logger = Logger.getLogger(getClass().getName()); @@ -91,27 +87,27 @@ public abstract class DesignerTestCase extends Assert { // //////////////////////////////////////////////////////////////////////////// - @Rule - public TestRule loggerRule = new TestRule() { + @RegisterExtension + private LoggerExtension extension = new LoggerExtension(); + + public class LoggerExtension implements BeforeTestExecutionCallback { @Override - public Statement apply(Statement base, Description description) { - logger.info(description.getClassName() + ':' + description.getMethodName()); - return base; + public void beforeTestExecution(ExtensionContext context) throws Exception { + logger.info(context.getRequiredTestClass().getSimpleName() + ':' + context.getDisplayName()); } - - }; + } //////////////////////////////////////////////////////////////////////////// // // setUp/tearDown // //////////////////////////////////////////////////////////////////////////// - @Before + @BeforeEach public void setUp() throws Exception { configureFirstTime(); } - @After + @AfterEach public void clearMemoryLeaks() throws Exception { // ObjectInfoUtils ((Map) ReflectionUtils.getFieldObject(ObjectInfoUtils.class, "m_idToObjectInfo")).clear(); @@ -160,7 +156,7 @@ private void configureEclipseWindowLocation() { } } - @After + @AfterEach public void tearDown() throws Exception { clearInstanceFields(); } @@ -218,32 +214,16 @@ protected final void removeExceptionsListener() { */ protected final void assertNoLoggedExceptions() { assertEquals( - "Check console for logged exceptions.", 0, - m_numberOfExceptionsDuringThisEditorSession); - } - - //////////////////////////////////////////////////////////////////////////// - // - // Asserts - // - //////////////////////////////////////////////////////////////////////////// - /** - * Asserts that given object is instance of expected class. - */ - protected static void assertInstanceOf(Class expectedClass, Object o) { - assertNotNull(expectedClass.getName() + " class expected, but 'null' found.", o); - assertTrue(expectedClass.getName() - + " class expected, but " - + o.getClass().getName() - + " found.", expectedClass.isAssignableFrom(o.getClass())); + m_numberOfExceptionsDuringThisEditorSession, + "Check console for logged exceptions."); } /** * Asserts that given object is instance of expected class. */ protected static void assertInstanceOf(String expectedClassName, Object o) { - assertNotNull(expectedClassName + " class expected, but 'null' found.", o); + assertNotNull(o, expectedClassName + " class expected, but 'null' found."); if (!ReflectionUtils.isSuccessorOf(o, expectedClassName)) { fail(expectedClassName + " class expected, but " + o.getClass().getName() + " found."); } @@ -254,10 +234,11 @@ protected static void assertInstanceOf(String expectedClassName, Object o) { */ protected static void assertNotInstanceOf(Class expectedClass, Object o) { assertNotNull(o); - assertFalse(expectedClass.getName() + assertFalse(expectedClass.isAssignableFrom(o.getClass()), + expectedClass.getName() + " class expected, but " + o.getClass().getName() - + " found.", expectedClass.isAssignableFrom(o.getClass())); + + " found."); } //////////////////////////////////////////////////////////////////////////// @@ -279,9 +260,9 @@ public static RGB getPixelRGB(Image image, int x, int y) { */ public static void assertRGB(RGB rgb, int red, int green, int blue) { String message = rgb.toString(); - assertEquals(message, rgb.red, red); - assertEquals(message, rgb.green, green); - assertEquals(message, rgb.blue, blue); + assertEquals(rgb.red, red, message); + assertEquals(rgb.green, green, message); + assertEquals(rgb.blue, blue, message); } //////////////////////////////////////////////////////////////////////////// diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/CompoundBorderTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/CompoundBorderTest.java index 53c1ff6a3..191fa564f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/CompoundBorderTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/CompoundBorderTest.java @@ -18,7 +18,7 @@ import org.eclipse.draw2d.geometry.Insets; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author lobas_av diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/Draw2dFigureTestCase.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/Draw2dFigureTestCase.java index 5cf001238..bb573112b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/Draw2dFigureTestCase.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/Draw2dFigureTestCase.java @@ -17,7 +17,7 @@ import org.eclipse.draw2d.ColorConstants; import org.eclipse.swt.widgets.Display; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; @@ -27,7 +27,7 @@ */ public abstract class Draw2dFigureTestCase extends DesignerTestCase implements ColorConstants { @Override - @Before + @BeforeEach public void setUp() throws Exception { // check create display for initialize figure's colors Display.getDefault(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/Draw2dTestCase.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/Draw2dTestCase.java index ff1cecc62..0845d5543 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/Draw2dTestCase.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/Draw2dTestCase.java @@ -18,15 +18,14 @@ import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; -import org.junit.Assert; - +import org.junit.jupiter.api.Assertions; /** * @author lobas_av * */ -public abstract class Draw2dTestCase extends Assert { +public abstract class Draw2dTestCase extends Assertions { //////////////////////////////////////////////////////////////////////////// // diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/Draw2dTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/Draw2dTests.java index bfc6cb000..99cf702e1 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/Draw2dTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/Draw2dTests.java @@ -12,17 +12,16 @@ *******************************************************************************/ package org.eclipse.wb.tests.draw2d; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @author lobas_av */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ // Border MarginBorderTest.class, LineBorderTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/FigureEventTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/FigureEventTest.java index b3cc549b8..c663f180c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/FigureEventTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/FigureEventTest.java @@ -26,9 +26,9 @@ import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Shell; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author lobas_av @@ -45,7 +45,7 @@ public class FigureEventTest extends Draw2dFigureTestCase { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // configure @@ -56,7 +56,7 @@ public void setUp() throws Exception { } @Override - @After + @AfterEach public void tearDown() throws Exception { m_shell.dispose(); } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/FigurePaintingTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/FigurePaintingTest.java index 81d011339..ca87b65fc 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/FigurePaintingTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/FigurePaintingTest.java @@ -25,8 +25,8 @@ import org.eclipse.swt.graphics.Font; import org.eclipse.swt.widgets.Display; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author lobas_av @@ -42,7 +42,7 @@ public class FigurePaintingTest extends Draw2dFigureTestCase { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); m_actualLogger = new TestLogger(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/FigureTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/FigureTest.java index 90eb2bd86..d261c589f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/FigureTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/FigureTest.java @@ -34,7 +34,7 @@ import org.eclipse.swt.graphics.Font; import org.assertj.core.util.Lists; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/LabelTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/LabelTest.java index 44c7cd1c3..27599727f 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/LabelTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/LabelTest.java @@ -25,7 +25,7 @@ import org.eclipse.swt.graphics.GC; import org.eclipse.swt.widgets.Display; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author lobas_av diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/LayerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/LayerTest.java index 38508f425..5980f2662 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/LayerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/LayerTest.java @@ -20,7 +20,7 @@ import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author lobas_av diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/LineBorderTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/LineBorderTest.java index cb3836294..5124e9417 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/LineBorderTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/LineBorderTest.java @@ -16,7 +16,7 @@ import org.eclipse.draw2d.geometry.Insets; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author lobas_av diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/MarginBorderTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/MarginBorderTest.java index b94944564..06eaa67f1 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/MarginBorderTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/MarginBorderTest.java @@ -16,7 +16,7 @@ import org.eclipse.draw2d.geometry.Insets; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author lobas_av diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/PolylineTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/PolylineTest.java index 6b1fd45fa..efdffe48b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/PolylineTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/PolylineTest.java @@ -20,8 +20,8 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.swt.SWT; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author lobas_av @@ -39,7 +39,7 @@ public class PolylineTest extends Draw2dFigureTestCase { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // configure diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/RootFigureTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/RootFigureTest.java index b49e30f9b..9e491a364 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/RootFigureTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/RootFigureTest.java @@ -23,7 +23,7 @@ import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Rectangle; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/AbstractCreationToolTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/AbstractCreationToolTest.java index 1ae8365b8..af5c567c0 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/AbstractCreationToolTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/AbstractCreationToolTest.java @@ -18,8 +18,8 @@ import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Point; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author lobas_av @@ -35,7 +35,7 @@ public abstract class AbstractCreationToolTest extends RequestTestCase { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // configure diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CommandsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CommandsTest.java index e516cd903..0e5bab1a3 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CommandsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CommandsTest.java @@ -16,14 +16,14 @@ import org.eclipse.gef.commands.CompoundCommand; import org.eclipse.gef.commands.UnexecutableCommand; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author lobas_av * */ -public class CommandsTest extends Assert { +public class CommandsTest extends Assertions { //////////////////////////////////////////////////////////////////////////// // // Tests diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CreationToolCursorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CreationToolCursorTest.java index 5c38eea2d..bf25b5d06 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CreationToolCursorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CreationToolCursorTest.java @@ -22,8 +22,8 @@ import org.eclipse.gef.commands.Command; import org.eclipse.swt.graphics.Cursor; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author lobas_av @@ -51,7 +51,7 @@ public static final Cursor CURSOR_NO() { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // create test factory diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CursorTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CursorTests.java index f80aa4f2f..a7fbb90f2 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CursorTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CursorTests.java @@ -12,15 +12,14 @@ *******************************************************************************/ package org.eclipse.wb.tests.gef; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @author lobas_av */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ CreationToolCursorTest.class, SelectionToolCursorTest.class, MarqueeSelectionToolCursorTest.class diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/EditPartTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/EditPartTest.java index f311db9b1..a53af7445 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/EditPartTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/EditPartTest.java @@ -28,7 +28,7 @@ import org.eclipse.gef.commands.Command; import org.assertj.core.util.Lists; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/EditPolicyTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/EditPolicyTest.java index 8bc82ab27..32ef5a75b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/EditPolicyTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/EditPolicyTest.java @@ -16,7 +16,7 @@ import org.eclipse.wb.gef.core.policies.EditPolicy; import org.assertj.core.util.Lists; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GefCursorTestCase.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GefCursorTestCase.java index 240dc9670..b39023957 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GefCursorTestCase.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GefCursorTestCase.java @@ -36,8 +36,8 @@ import org.eclipse.swt.graphics.Cursor; import org.eclipse.swt.widgets.Shell; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import java.util.ArrayList; import java.util.List; @@ -60,7 +60,7 @@ public abstract class GefCursorTestCase extends GefTestCase { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // create shell @@ -84,7 +84,7 @@ public Tool getDefaultTool() { m_sender = new EventSender(m_viewer.getControl()); } - @After + @AfterEach public void tearDown() throws Exception { m_shell.dispose(); m_shell = null; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GefTestCase.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GefTestCase.java index ca7d4e0bb..6349534d1 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GefTestCase.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GefTestCase.java @@ -17,16 +17,16 @@ import org.eclipse.gef.EditPart; import org.eclipse.swt.widgets.Display; -import org.junit.Assert; -import org.junit.Before; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; /** * @author lobas_av * */ -public abstract class GefTestCase extends Assert { +public abstract class GefTestCase extends Assertions { - @Before + @BeforeEach public void setUp() throws Exception { // check create display for initialize figure's colors Display.getDefault(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GefTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GefTests.java index f32277eff..0116e4088 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GefTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GefTests.java @@ -12,17 +12,16 @@ *******************************************************************************/ package org.eclipse.wb.tests.gef; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @author lobas_av * */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ RequestsTest.class, CommandsTest.class, EditPartTest.class, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GraphicalRobot.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GraphicalRobot.java index 4d921a951..919fceabc 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GraphicalRobot.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GraphicalRobot.java @@ -40,11 +40,11 @@ import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.swtbot.swt.finder.widgets.SWTBotText; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import org.assertj.core.api.Assertions; import org.assertj.core.description.Description; @@ -253,7 +253,7 @@ private GraphicalRobot toHandle(Object object, Predicate predicate) { m_viewer.select(editPart); // find Handle Point location = findSideHandle(bounds, predicate); - assertNotNull("Side Handle for " + predicate, location); + assertNotNull(location, "Side Handle for " + predicate); mouseX = location.x; mouseY = location.y; mouseInSourceX = mouseX - bounds.x; @@ -954,13 +954,13 @@ public void assertFigures(String layerName, Predicate... predicates) { { Layer feedbackLayer = m_viewer.getLayer(layerName); feedbacks = feedbackLayer.getChildren(); - assertEquals("Wrong count of feedbacks.", feedbacks.size(), predicates.length); + assertEquals(feedbacks.size(), predicates.length, "Wrong count of feedbacks."); } // check all feedback's for (int i = 0; i < predicates.length; i++) { Predicate predicate = predicates[i]; IFigure feedback = feedbacks.get(i); - assertTrue("Predicate [" + i + "] failed.", predicate.test(feedback)); + assertTrue(predicate.test(feedback), "Predicate [" + i + "] failed."); } } @@ -1016,7 +1016,7 @@ public void assertFeedbackFigures(FigureDescription... descriptions) { } } // figure should be found - assertTrue("No figure found for " + description, figureFound); + assertTrue(figureFound, "No figure found for " + description); } // all figure should be matched if (!feedbackFigures.isEmpty()) { @@ -1038,7 +1038,7 @@ public void assertFeedbackFigures(FigureDescription... descriptions) { * Asserts that there are no {@link IFigure}'s on feedback {@link Layer}. */ public void assertNoFeedbackFigures() { - assertTrue("Feedback layer should be empty.", getFeedbackFigures().isEmpty()); + assertTrue(getFeedbackFigures().isEmpty(), "Feedback layer should be empty."); } /** @@ -1067,7 +1067,7 @@ public String value() { */ public GraphicalRobot assertCommandNotNull() throws Exception { Command command = getCommand(); - assertNotNull("No command.", command); + assertNotNull(command, "No command."); return this; } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GraphicalViewerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GraphicalViewerTest.java index ef9889e8c..3ab9ee06c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GraphicalViewerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GraphicalViewerTest.java @@ -25,9 +25,9 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.widgets.Shell; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -47,7 +47,7 @@ public class GraphicalViewerTest extends GefTestCase { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // configure @@ -65,7 +65,7 @@ public Tool getDefaultTool() { m_viewer.setEditDomain(m_domain); } - @After + @AfterEach public void tearDown() throws Exception { m_shell.dispose(); } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/MarqueeSelectionToolCursorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/MarqueeSelectionToolCursorTest.java index cab8eed73..88e404956 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/MarqueeSelectionToolCursorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/MarqueeSelectionToolCursorTest.java @@ -18,8 +18,8 @@ import org.eclipse.draw2d.Cursors; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author lobas_av @@ -33,7 +33,7 @@ public class MarqueeSelectionToolCursorTest extends GefCursorTestCase { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // configure diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/MarqueeSelectionToolTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/MarqueeSelectionToolTest.java index f10ba70d3..07852187a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/MarqueeSelectionToolTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/MarqueeSelectionToolTest.java @@ -20,8 +20,8 @@ import org.eclipse.gef.RequestConstants; import org.eclipse.swt.SWT; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author lobas_av @@ -37,7 +37,7 @@ public class MarqueeSelectionToolTest extends RequestTestCase { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // configure diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/RequestTestCase.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/RequestTestCase.java index a539c728f..9497bd5f5 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/RequestTestCase.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/RequestTestCase.java @@ -20,8 +20,8 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.swt.widgets.Shell; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; /** * @author lobas_av @@ -39,7 +39,7 @@ public abstract class RequestTestCase extends GefTestCase { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // @@ -59,7 +59,7 @@ public Tool getDefaultTool() { m_sender = new EventSender(m_viewer.getControl()); } - @After + @AfterEach public void tearDown() throws Exception { m_shell.dispose(); } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/RequestsLogger.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/RequestsLogger.java index 31d4ab295..bba93bd33 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/RequestsLogger.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/RequestsLogger.java @@ -16,9 +16,8 @@ import org.eclipse.gef.Request; import org.eclipse.gef.requests.SelectionRequest; -import junit.framework.Assert; - import org.apache.commons.lang3.StringUtils; +import org.junit.jupiter.api.Assertions; import java.util.ArrayList; import java.util.List; @@ -52,14 +51,14 @@ public void clear() { * Asserts that this {@link RequestsLogger} has no events. */ public void assertEmpty() { - Assert.assertTrue(m_events.isEmpty()); + Assertions.assertTrue(m_events.isEmpty()); } /** * Asserts that this {@link RequestsLogger} contains same events as in expected one. */ public void assertEquals(RequestsLogger expectedLogger) { - Assert.assertEquals(getString(expectedLogger), getString(this)); + Assertions.assertEquals(getString(expectedLogger), getString(this)); } /** diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/RequestsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/RequestsTest.java index 757f2088b..0dde73aa0 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/RequestsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/RequestsTest.java @@ -31,8 +31,8 @@ import org.eclipse.gef.requests.SelectionRequest; import org.eclipse.swt.SWT; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -41,7 +41,7 @@ * @author lobas_av * */ -public class RequestsTest extends Assert { +public class RequestsTest extends Assertions { //////////////////////////////////////////////////////////////////////////// // diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/ResizeTrackerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/ResizeTrackerTest.java index 1b5610e67..b3463fb04 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/ResizeTrackerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/ResizeTrackerTest.java @@ -21,8 +21,8 @@ import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Point; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author lobas_av @@ -41,7 +41,7 @@ public class ResizeTrackerTest extends RequestTestCase { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // configure diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectAndDragEditPartTrackerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectAndDragEditPartTrackerTest.java index c55716964..33b9cda1c 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectAndDragEditPartTrackerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectAndDragEditPartTrackerTest.java @@ -26,7 +26,7 @@ import org.eclipse.gef.requests.SelectionRequest; import org.eclipse.swt.SWT; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectionToolCursorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectionToolCursorTest.java index 694dc866f..c44fe6e95 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectionToolCursorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectionToolCursorTest.java @@ -24,10 +24,10 @@ import org.eclipse.gef.commands.Command; import org.eclipse.swt.SWT; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * @author lobas_av @@ -45,7 +45,7 @@ public class SelectionToolCursorTest extends GefCursorTestCase { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // configure @@ -59,7 +59,7 @@ public void setUp() throws Exception { } @Override - @After + @AfterEach public void tearDown() throws Exception { super.tearDown(); m_tool = null; @@ -229,7 +229,7 @@ public void test_ResizeTracker() throws Exception { } } - @Ignore + @Disabled @Test public void test_ResizeTracker_Resize() throws Exception { ResizeCommand command = new ResizeCommand(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectionToolTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectionToolTest.java index a4728d6a8..26865ddcb 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectionToolTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectionToolTest.java @@ -23,8 +23,8 @@ import org.eclipse.gef.RequestConstants; import org.eclipse.gef.requests.SelectionRequest; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.lang.reflect.Field; @@ -42,7 +42,7 @@ public class SelectionToolTest extends RequestTestCase { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // configure diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TestLogger.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TestLogger.java index aaa28d719..0eb179370 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TestLogger.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TestLogger.java @@ -12,9 +12,8 @@ *******************************************************************************/ package org.eclipse.wb.tests.gef; -import junit.framework.Assert; - import org.apache.commons.lang3.StringUtils; +import org.junit.jupiter.api.Assertions; import java.util.ArrayList; import java.util.List; @@ -48,7 +47,7 @@ public void clear() { * Asserts that this {@link TestLogger} has no events. */ public void assertEmpty() { - Assert.assertTrue(m_events.isEmpty()); + Assertions.assertTrue(m_events.isEmpty()); } /** @@ -62,7 +61,7 @@ public void assertEquals(TestLogger expectedLogger) { * Asserts that two objects are equal. If they are not an AssertionFailedError is thrown. */ public static void assertEquals(TestLogger expectedLogger, TestLogger actualLoogger) { - Assert.assertEquals(getString(expectedLogger), getString(actualLoogger)); + Assertions.assertEquals(getString(expectedLogger), getString(actualLoogger)); expectedLogger.clear(); actualLoogger.clear(); } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TreeCreateToolTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TreeCreateToolTest.java index 91672dc2e..37830de76 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TreeCreateToolTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TreeCreateToolTest.java @@ -19,8 +19,8 @@ import org.eclipse.draw2d.geometry.Point; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author lobas_av @@ -33,7 +33,7 @@ public class TreeCreateToolTest extends TreeToolTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // create test factory diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TreeDragToolTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TreeDragToolTest.java index 3430dbe17..a3acec37b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TreeDragToolTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TreeDragToolTest.java @@ -22,8 +22,8 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author lobas_av @@ -36,7 +36,7 @@ public class TreeDragToolTest extends TreeToolTest { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // set SelectionTool diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TreeRobot.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TreeRobot.java index 1dd086cae..256960d93 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TreeRobot.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TreeRobot.java @@ -34,10 +34,10 @@ import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; import org.assertj.core.api.Assertions; import org.assertj.core.description.Description; @@ -568,7 +568,7 @@ public String value() { */ public TreeRobot assertCommandNotNull() throws Exception { Command command = getCommand(); - assertNotNull("No command.", command); + assertNotNull(command, "No command."); return this; } } \ No newline at end of file diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TreeToolTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TreeToolTest.java index ab6667fc7..3f93caba9 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TreeToolTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TreeToolTest.java @@ -31,8 +31,8 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import java.util.List; @@ -52,7 +52,7 @@ public abstract class TreeToolTest extends GefTestCase { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // @@ -80,7 +80,7 @@ public void expandAll() { m_sender = new EventSender(m_viewer.getControl()); } - @After + @AfterEach public void tearDown() throws Exception { m_shell.dispose(); m_shell = null; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/utils/CommonTests.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/utils/CommonTests.java index d73a5635d..5b513fb6e 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/utils/CommonTests.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/utils/CommonTests.java @@ -12,17 +12,16 @@ *******************************************************************************/ package org.eclipse.wb.tests.utils; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Test for "org.eclipse.wb.core.temp" project. * * @author scheglov_ke */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ StringUtilitiesTest.class, ProjectClassLoaderTest.class}) diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/utils/ProjectClassLoaderTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/utils/ProjectClassLoaderTest.java index bbe7f63c6..6cc873e72 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/utils/ProjectClassLoaderTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/utils/ProjectClassLoaderTest.java @@ -35,8 +35,8 @@ import org.apache.commons.io.FileUtils; import org.assertj.core.api.Assertions; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.File; import java.util.ArrayList; @@ -69,7 +69,7 @@ public void _test_exit() throws Exception { // //////////////////////////////////////////////////////////////////////////// @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); if (m_project != null) { diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/utils/StringUtilitiesTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/utils/StringUtilitiesTest.java index a9f3b9f60..cc34acb18 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/utils/StringUtilitiesTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/utils/StringUtilitiesTest.java @@ -16,7 +16,7 @@ import org.eclipse.wb.tests.designer.tests.DesignerTestCase; import org.apache.commons.lang3.ArrayUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link StringUtilities}. @@ -198,8 +198,8 @@ public void test_getDifferenceIntervals_begin2() throws Exception { */ private static void assertIntervals(int[] expected, int[] actual) { assertTrue( - ArrayUtils.toString(expected) + " != " + ArrayUtils.toString(actual), - ArrayUtils.isEquals(expected, actual)); + ArrayUtils.isEquals(expected, actual), + ArrayUtils.toString(expected) + " != " + ArrayUtils.toString(actual)); } ////////////////////////////////////////////////////////////////////////////