diff options
Diffstat (limited to 'tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/AllTests.java')
| -rw-r--r-- | tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/AllTests.java | 54 |
1 files changed, 26 insertions, 28 deletions
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/AllTests.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/AllTests.java index 83f2c44cc..e4bab73d1 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/AllTests.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/AllTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. + * Copyright (c) 2000, 2018 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,35 +10,33 @@ *******************************************************************************/ package org.eclipse.compare.tests; -import junit.framework.Test; -import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; /** - * Test some non-UI areas of the compare plugin. + * Test some non-UI areas of the compare plug-in. */ -public class AllTests { - public static Test suite() { - TestSuite suite = new TestSuite("Test for org.eclipse.compare.tests"); //$NON-NLS-1$ - // $JUnit-BEGIN$ - suite.addTestSuite(TextMergeViewerTest.class); - suite.addTestSuite(LineReaderTest.class); - suite.addTestSuite(StreamMergerTest.class); - suite.addTestSuite(DocLineComparatorTest.class); - suite.addTestSuite(FilterTest.class); - suite.addTestSuite(PatchTest.class); - suite.addTestSuite(PatchBuilderTest.class); - suite.addTestSuite(AsyncExecTests.class); - suite.addTestSuite(DiffTest.class); - suite.addTestSuite(FileDiffResultTest.class); - suite.addTestSuite(ContentMergeViewerTest.class); - suite.addTestSuite(PatchLinesTest.class); - suite.addTestSuite(PatchUITest.class); - suite.addTestSuite(RangeDifferencerThreeWayDiffTest.class); - suite.addTestSuite(CompareUIPluginTest.class); - suite.addTestSuite(StructureCreatorTest.class); - suite.addTestSuite(CompareFileRevisionEditorInputTest.class); - // $JUnit-END$ - return suite; - } +@RunWith(Suite.class) +@SuiteClasses({ + TextMergeViewerTest.class, + LineReaderTest.class, + StreamMergerTest.class, + DocLineComparatorTest.class, + FilterTest.class, + PatchTest.class, + PatchBuilderTest.class, + AsyncExecTests.class, + DiffTest.class, + FileDiffResultTest.class, + ContentMergeViewerTest.class, + PatchLinesTest.class, + PatchUITest.class, + RangeDifferencerThreeWayDiffTest.class, + CompareUIPluginTest.class, + StructureCreatorTest.class, + CompareFileRevisionEditorInputTest.class}) +public class AllTests { + // test suite } |