Bug 487095 - Move test bundles to JUnit 4

Change-Id: I416395f7efca8ba775b79a201540d60727a7ddd6
Signed-off-by: Sopot Cela <scela@redhat.com>

9 files changed, 123 insertions, 111 deletions

diff --git a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceDialogTest.java b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceDialogTest.java
index 92008e3be0c..4100efeb9ca 100644
--- a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceDialogTest.java
+++ b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceDialogTest.java
@@ -10,9 +10,12 @@
  *******************************************************************************/
 package org.eclipse.ui.workbench.texteditor.tests;
 
+import static org.junit.Assert.*;
+
 import java.util.ResourceBundle;
 
-import org.eclipse.test.OrderedTestSuite;
+import org.junit.Before;
+import org.junit.Test;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Button;
@@ -31,27 +34,16 @@ import org.eclipse.jface.text.TextViewer;
 
 import org.eclipse.ui.PlatformUI;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-
 /**
  * Tests the FindReplaceDialog.
  *
  * @since 3.1
  */
-public class FindReplaceDialogTest extends TestCase {
+public class FindReplaceDialogTest {
 
 	private Accessor fFindReplaceDialog;
 	private TextViewer fTextViewer;
 
-	public FindReplaceDialogTest(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		return new OrderedTestSuite(FindReplaceDialogTest.class);
-	}
-
 	private void runEventQueue() {
 		Display display= PlatformUI.getWorkbench().getDisplay();
 		for (int i= 0; i < 10; i++) { // workaround for https://bugs.eclipse.org/323272
@@ -88,8 +80,8 @@ public class FindReplaceDialogTest extends TestCase {
 		fFindReplaceDialog= new Accessor(fFindReplaceDialogStubAccessor.invoke("getDialog", null), "org.eclipse.ui.texteditor.FindReplaceDialog", getClass().getClassLoader());
 	}
 
-	@Override
-	protected void tearDown() throws Exception {
+	@Before
+	public void tearDown() throws Exception {
 		if (fFindReplaceDialog != null) {
 			fFindReplaceDialog.invoke("close", null);
 			fFindReplaceDialog= null;
@@ -101,6 +93,7 @@ public class FindReplaceDialogTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void testInitialButtonState() {
 		openFindReplaceDialog();
 
@@ -121,6 +114,7 @@ public class FindReplaceDialogTest extends TestCase {
 		assertFalse(checkbox.isEnabled()); // there's no word in the Find field
 	}
 
+	@Test
 	public void testDisableWholeWordIfRegEx() {
 		openFindReplaceDialog();
 
@@ -143,6 +137,7 @@ public class FindReplaceDialogTest extends TestCase {
 		assertTrue(wholeWordCheckbox.getSelection());
 	}
 
+	@Test
 	public void testDisableWholeWordIfNotWord() {
 		openFindReplaceDialog();
 
@@ -166,6 +161,7 @@ public class FindReplaceDialogTest extends TestCase {
 		assertTrue(wholeWordCheckbox.getSelection());
 	}
 
+	@Test
 	public void testFocusNotChangedWhenEnterPressed() {
 		openTextViewerAndFindReplaceDialog();
 
@@ -211,11 +207,12 @@ public class FindReplaceDialogTest extends TestCase {
 		runEventQueue();
 		assertTrue(allScopeBox.isFocusControl());
 	}
-	
+
 	private String takeScreenshot() {
-		return ScreenshotTest.takeScreenshot(FindReplaceDialogTest.class, getName(), System.out);
+		return ScreenshotTest.takeScreenshot(FindReplaceDialogTest.class, FindReplaceDialogTest.class.getSimpleName(), System.out);
 	}
 
+	@Test
 	public void testFocusNotChangedWhenButtonMnemonicPressed() {
 		if (Util.isMac())
 			return; // Mac doesn't support mnemonics.
@@ -260,7 +257,7 @@ public class FindReplaceDialogTest extends TestCase {
 		assertTrue(allScopeBox.isFocusControl());
 	}
 
-
+	@Test
 	public void testShiftEnterReversesSearchDirection() {
 		openTextViewerAndFindReplaceDialog();
 
diff --git a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/HippieCompletionTest.java b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/HippieCompletionTest.java
index 56df24cb9e1..5bd3e9ef3b2 100644
--- a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/HippieCompletionTest.java
+++ b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/HippieCompletionTest.java
@@ -11,11 +11,16 @@
  *******************************************************************************/
 package org.eclipse.ui.workbench.texteditor.tests;
 
+import static org.junit.Assert.*;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
+import org.junit.Before;
+import org.junit.Test;
+
 import org.eclipse.core.runtime.AssertionFailedException;
 
 import org.eclipse.text.tests.Accessor;
@@ -26,27 +31,18 @@ import org.eclipse.jface.text.IDocument;
 
 import org.eclipse.ui.internal.texteditor.HippieCompletionEngine;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-
 /**
  * Tests for the Hippie completion action of the text editor.
  *
  * @author Genady Beryozkin, me@genady.org
  */
-public class HippieCompletionTest extends TestCase {
+public class HippieCompletionTest {
 
 	IDocument[] documents;
 	private HippieCompletionEngine fEngine;
 
-	public HippieCompletionTest(String name) {
-		super(name);
-	}
-
-	@Override
-	protected void setUp() throws Exception {
+	@Before
+	public void setUp() throws Exception {
 		documents= new IDocument[5];
 		documents[0]= new Document("package ui.TestPackage;\n" +
 				"\n" +
@@ -137,6 +133,7 @@ public class HippieCompletionTest extends TestCase {
 		fEngine= new HippieCompletionEngine();
 	}
 
+	@Test
 	public void testSearchBackwards1() {
 		try {
 			List<String> list= fEngine.getCompletionsBackwards(documents[0],
@@ -166,6 +163,7 @@ public class HippieCompletionTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void testSearchBackwards2() {
 		try {
 			List<String> list= fEngine.getCompletionsBackwards(documents[2],
@@ -184,6 +182,7 @@ public class HippieCompletionTest extends TestCase {
 		}
 	}
 
+	@Test
     public void testSearchBackwards3() {
         try {
         	List<String> list= fEngine.getCompletionsBackwards(documents[1],
@@ -201,6 +200,7 @@ public class HippieCompletionTest extends TestCase {
         }
     }
 
+	@Test
 	public void testSearch() {
 		ArrayList<IDocument> docsList= new ArrayList<>(Arrays.asList(this.documents));
 		List<String> result= createSuggestions("te", docsList);
@@ -227,6 +227,7 @@ public class HippieCompletionTest extends TestCase {
 		assertEquals("Incorrect completion", "roperties", result.get(9));
 	}
 
+	@Test
 	public void testSearch2() {
 		ArrayList<IDocument> docsList= new ArrayList<>(Arrays.asList(this.documents));
 		List<String> result= createSuggestions("printe", docsList);
@@ -239,7 +240,7 @@ public class HippieCompletionTest extends TestCase {
 		assertEquals("Number of completions does not match", 1, result.size());
 	}
 
-
+	@Test
 	public void testForwardSearch() {
 		try {
 			List<String> result= fEngine.getCompletionsForward(documents[0],
@@ -262,6 +263,7 @@ public class HippieCompletionTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void testForwardSearchInternational() {
 		List<String> result;
 		try {
@@ -286,7 +288,7 @@ public class HippieCompletionTest extends TestCase {
 		}
 	}
 
-
+	@Test
 	public void testPrefix() {
 		try {
 			String prefix= fEngine.getPrefixString(documents[0],
@@ -347,6 +349,7 @@ public class HippieCompletionTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void testInternational() {
 		IDocument intlDoc= documents[4];
 
@@ -413,7 +416,7 @@ public class HippieCompletionTest extends TestCase {
 		assertEquals("Number of completions does not match", 0, result.size());
 	}
 
-
+	@Test
 	public void testInternationalBackwards() {
 		IDocument intlDoc= documents[4];
 		try {
@@ -457,6 +460,7 @@ public class HippieCompletionTest extends TestCase {
 	/*
 	 * Getting completions lazily
 	 */
+	@Test
 	public void testCompletionState() throws Exception {
 		ArrayList<String> list= new ArrayList<>();
 		Accessor state= null;
@@ -519,6 +523,7 @@ public class HippieCompletionTest extends TestCase {
 	/*
 	 * Getting completions lazily
 	 */
+	@Test
 	public void testIteration() throws Exception {
 		//Check only with current document
 		IDocument openDocument= new Document("" +
@@ -579,10 +584,6 @@ public class HippieCompletionTest extends TestCase {
 
 	}
 
-	public static Test suite() {
-		return new TestSuite(HippieCompletionTest.class);
-	}
-
 	private List<String> createSuggestions(String prefix, IDocument doc) {
 		return createSuggestions(prefix, Arrays.asList(new IDocument[]{doc}));
 	}
diff --git a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/ScreenshotTest.java b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/ScreenshotTest.java
index b465738616b..2ad7fef913f 100644
--- a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/ScreenshotTest.java
+++ b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/ScreenshotTest.java
@@ -13,7 +13,7 @@ package org.eclipse.ui.workbench.texteditor.tests;
 import java.io.File;
 import java.io.PrintStream;
 
-import org.eclipse.test.OrderedTestSuite;
+import org.junit.Test;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.GC;
@@ -32,24 +32,14 @@ import org.eclipse.jface.util.Util;
 
 import org.eclipse.ui.PlatformUI;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class ScreenshotTest extends TestCase {
-
-	public ScreenshotTest(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		return new OrderedTestSuite(ScreenshotTest.class);
-	}
-
+public class ScreenshotTest {
 
+	@Test
 	public void testScreenshot() throws Exception {
-		takeScreenshot(ScreenshotTest.class, getName(), System.out);
+		takeScreenshot(ScreenshotTest.class, ScreenshotTest.class.getSimpleName(), System.out);
 	}
 
+	@Test
 	public void testWindowsTaskManagerScreenshots() throws Exception {
 		if (! Util.isWindows())
 			return;
@@ -75,7 +65,7 @@ public class ScreenshotTest extends TestCase {
         System.out.println("* CTRL up " + display.post(event));
         
         runEventQueue();
-        takeScreenshot(ScreenshotTest.class, getName() + 2, System.out);
+        takeScreenshot(ScreenshotTest.class, ScreenshotTest.class.getSimpleName() + 2, System.out);
         
         event.type= SWT.KeyDown;
         event.character= SWT.ESC;
@@ -85,7 +75,7 @@ public class ScreenshotTest extends TestCase {
         System.out.println("* ESC up " + display.post(event));
         
         runEventQueue();
-        takeScreenshot(ScreenshotTest.class, getName() + 3, System.out);
+        takeScreenshot(ScreenshotTest.class, ScreenshotTest.class.getSimpleName() + 3, System.out);
 	}
 	
 	/**
diff --git a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java
index 2059a40b4ac..30cf0893cde 100644
--- a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java
+++ b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java
@@ -10,8 +10,9 @@
  *******************************************************************************/
 package org.eclipse.ui.workbench.texteditor.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;
 
 import org.eclipse.ui.workbench.texteditor.tests.revisions.ChangeRegionTest;
 import org.eclipse.ui.workbench.texteditor.tests.revisions.HunkComputerTest;
@@ -24,20 +25,16 @@ import org.eclipse.ui.workbench.texteditor.tests.rulers.RulerTestSuite;
  *
  * @since 3.0
  */
-public class WorkbenchTextEditorTestSuite extends TestSuite {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test Suite for org.eclipse.ui.workbench.texteditor"); //$NON-NLS-1$
-		//$JUnit-BEGIN$
-		suite.addTest(FindReplaceDialogTest.suite());
-        suite.addTest(HippieCompletionTest.suite());
-        suite.addTest(RangeTest.suite());
-        suite.addTest(ChangeRegionTest.suite());
-        suite.addTest(RulerTestSuite.suite());
-        suite.addTest(HunkComputerTest.suite());
-        suite.addTest(ScreenshotTest.suite());
-
-		//$JUnit-END$
-		return suite;
-	}
+@RunWith(Suite.class)
+@SuiteClasses({
+	FindReplaceDialogTest.class,
+	HippieCompletionTest.class,
+	RangeTest.class,
+	ChangeRegionTest.class,
+	RulerTestSuite.class,
+	HunkComputerTest.class,
+	ScreenshotTest.class
+})
+public class WorkbenchTextEditorTestSuite {
+	//intentionally left blank
 }
diff --git a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/ChangeRegionTest.java b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/ChangeRegionTest.java
index d67ef01f310..18902158d25 100644
--- a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/ChangeRegionTest.java
+++ b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/ChangeRegionTest.java
@@ -10,9 +10,14 @@
  *******************************************************************************/
 package org.eclipse.ui.workbench.texteditor.tests.revisions;
 
+import static org.junit.Assert.*;
+
 import java.util.Date;
 import java.util.List;
 
+import org.junit.Before;
+import org.junit.Test;
+
 import org.eclipse.swt.graphics.RGB;
 
 import org.eclipse.jface.internal.text.revisions.ChangeRegion;
@@ -22,18 +27,11 @@ import org.eclipse.jface.internal.text.revisions.Range;
 import org.eclipse.jface.text.revisions.Revision;
 import org.eclipse.jface.text.source.LineRange;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
 /**
  *
  * @since 3.2
  */
-public class ChangeRegionTest extends TestCase {
-	public static Test suite() {
-		return new TestSuite(ChangeRegionTest.class);
-	}
+public class ChangeRegionTest {
 
 	public static final class TestRevision extends Revision {
 		@Override
@@ -59,11 +57,12 @@ public class ChangeRegionTest extends TestCase {
 
 	private Revision fRevision;
 
-	@Override
-	protected void setUp() throws Exception {
+	@Before
+	public void setUp() throws Exception {
 		fRevision= new TestRevision();
 	}
 
+	@Test
 	public void testCreation() throws Exception {
 		try {
 			new ChangeRegion(fRevision, null);
@@ -89,6 +88,7 @@ public class ChangeRegionTest extends TestCase {
 		RangeUtil.assertEqualRange(new LineRange(12, 3), r.getAdjustedCoverage());
 	}
 
+	@Test
 	public void testHunkAfter() throws Exception {
 		ChangeRegion r= new ChangeRegion(fRevision, new LineRange(12, 3));
 		List<Range> before= RangeUtil.deepClone(r.getAdjustedRanges());
@@ -103,6 +103,7 @@ public class ChangeRegionTest extends TestCase {
 		RangeUtil.assertEqualRange(before.get(0), r.getAdjustedCoverage());
 	}
 
+	@Test
 	public void testHunkRightAfter() throws Exception {
 		ChangeRegion r= new ChangeRegion(fRevision, new LineRange(12, 3));
 		List<Range> before= RangeUtil.deepClone(r.getAdjustedRanges());
@@ -117,6 +118,7 @@ public class ChangeRegionTest extends TestCase {
 		RangeUtil.assertEqualRange(before.get(0), r.getAdjustedCoverage());
 	}
 
+	@Test
 	public void testHunkBefore() throws Exception {
 		ChangeRegion r;
 
@@ -146,6 +148,7 @@ public class ChangeRegionTest extends TestCase {
 		RangeUtil.assertEqualRange(new LineRange(9, 3), r.getAdjustedCoverage());
 	}
 
+	@Test
 	public void testHunkRightBefore() throws Exception {
 		ChangeRegion r;
 
@@ -180,6 +183,7 @@ public class ChangeRegionTest extends TestCase {
 		RangeUtil.assertEqualRange(new LineRange(15, 3), r.getAdjustedCoverage());
 	}
 
+	@Test
 	public void testHunkAtStart() throws Exception {
 		ChangeRegion r;
 
@@ -209,6 +213,7 @@ public class ChangeRegionTest extends TestCase {
 		RangeUtil.assertEqualRange(new LineRange(17, 5), r.getAdjustedCoverage());
 	}
 
+	@Test
 	public void testHunkAtEnd() throws Exception {
 		ChangeRegion r;
 
@@ -232,7 +237,8 @@ public class ChangeRegionTest extends TestCase {
 		RangeUtil.assertEqualSingleRange(new LineRange(12, 5), r.getAdjustedRanges());
 		RangeUtil.assertEqualRange(new LineRange(12, 5), r.getAdjustedCoverage());
 	}
-
+	
+	@Test
 	public void testHunkOverStart() throws Exception {
 		ChangeRegion r;
 
@@ -252,6 +258,7 @@ public class ChangeRegionTest extends TestCase {
 		RangeUtil.assertEqualRange(new LineRange(13, 4), r.getAdjustedCoverage());
 	}
 
+	@Test
 	public void testHunkOverEnd() throws Exception {
 		ChangeRegion r;
 
@@ -286,6 +293,7 @@ public class ChangeRegionTest extends TestCase {
 		RangeUtil.assertEqualRange(new LineRange(12, 5), r.getAdjustedCoverage());
 	}
 
+	@Test
 	public void testHunkCovering() throws Exception {
 		ChangeRegion r;
 
@@ -365,6 +373,7 @@ public class ChangeRegionTest extends TestCase {
 		RangeUtil.assertEqualRange(new LineRange(12, 0), r.getAdjustedCoverage());
 	}
 
+	@Test
 	public void testHunkInBetween() throws Exception {
 		// TODO require merging of adjacent ranges?
 		ChangeRegion r;
diff --git a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/HunkComputerTest.java b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/HunkComputerTest.java
index 3b4773ec281..df994a01a9f 100644
--- a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/HunkComputerTest.java
+++ b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/HunkComputerTest.java
@@ -10,9 +10,9 @@
  *******************************************************************************/
 package org.eclipse.ui.workbench.texteditor.tests.revisions;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
 
 import org.eclipse.jface.internal.text.revisions.Hunk;
 import org.eclipse.jface.internal.text.revisions.HunkComputer;
@@ -26,10 +26,7 @@ import org.eclipse.jface.text.source.ILineDiffer;
  *
  * @since 3.3
  */
-public class HunkComputerTest extends TestCase {
-	public static Test suite() {
-		return new TestSuite(HunkComputerTest.class);
-	}
+public class HunkComputerTest {
 
 	private static final int A= ILineDiffInfo.ADDED;
 	private static final int C= ILineDiffInfo.CHANGED;
@@ -94,6 +91,7 @@ public class HunkComputerTest extends TestCase {
 	private int[] fRemovedBelow;
 
 
+	@Test
 	public void testNoDiff() throws Exception {
 		int[] diffInfo= new int[] {U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, };
 		int[] expected= {};
@@ -101,6 +99,7 @@ public class HunkComputerTest extends TestCase {
 		assertHunks(diffInfo, expected);
 	}
 
+	@Test
 	public void testShiftOne() throws Exception {
 		int[] diffInfo= new int[] {C, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, };
 		int[] expected= {0, 0, 1};
@@ -108,6 +107,7 @@ public class HunkComputerTest extends TestCase {
 		assertHunks(diffInfo, expected);
 	}
 
+	@Test
 	public void testRemoveFirstLine() throws Exception {
 		int[] diffInfo= new int[] {U, 1, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, };
 		int[] expected= {0, -1, 0};
@@ -115,6 +115,7 @@ public class HunkComputerTest extends TestCase {
 		assertHunks(diffInfo, expected);
 	}
 
+	@Test
 	public void testRemoveSecondLine() throws Exception {
 		int[] diffInfo= new int[] {U, 0, U, 1, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, };
 		int[] expected= {1, -1, 0};
@@ -122,6 +123,7 @@ public class HunkComputerTest extends TestCase {
 		assertHunks(diffInfo, expected);
 	}
 
+	@Test
 	public void testAddFirstLine() throws Exception {
 		int[] diffInfo= new int[] {A, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, };
 		int[] expected= {0, 1, 0};
@@ -129,6 +131,7 @@ public class HunkComputerTest extends TestCase {
 		assertHunks(diffInfo, expected);
 	}
 
+	@Test
 	public void testAddSecondLine() throws Exception {
 		int[] diffInfo= new int[] {U, 0, A, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, };
 		int[] expected= {1, 1, 0};
@@ -136,6 +139,7 @@ public class HunkComputerTest extends TestCase {
 		assertHunks(diffInfo, expected);
 	}
 
+	@Test
 	public void testAddThirdLine() throws Exception {
 		int[] diffInfo= new int[] {U, 0, U, 0, A, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, };
 		int[] expected= {2, 1, 0};
@@ -143,6 +147,7 @@ public class HunkComputerTest extends TestCase {
 		assertHunks(diffInfo, expected);
 	}
 
+	@Test
 	public void testRemoveFirstRegion() throws Exception {
 		int[] diffInfo= new int[] {U, 2, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, };
 		int[] expected= {0, -2, 0};
@@ -150,6 +155,7 @@ public class HunkComputerTest extends TestCase {
 		assertHunks(diffInfo, expected);
 	}
 
+	@Test
 	public void testReplaceFirstRegion() throws Exception {
 		int[] diffInfo= new int[] {C, 0, C, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, };
 		int[] expected= {0, 0, 2};
@@ -157,6 +163,7 @@ public class HunkComputerTest extends TestCase {
 		assertHunks(diffInfo, expected);
 	}
 
+	@Test
 	public void testRemoveOverlappingRegion() throws Exception {
 		int[] diffInfo= new int[] {U, 0, U, 2, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, };
 		int[] expected= {1, -2, 0};
@@ -164,6 +171,7 @@ public class HunkComputerTest extends TestCase {
 		assertHunks(diffInfo, expected);
 	}
 
+	@Test
 	public void testReplaceOverlappingRegion() throws Exception {
 		int[] diffInfo= new int[] {U, 0, C, 0, C, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, };
 		int[] expected= {1, 0, 2};
@@ -171,6 +179,7 @@ public class HunkComputerTest extends TestCase {
 		assertHunks(diffInfo, expected);
 	}
 
+	@Test
 	public void testRemoveInnerLines() throws Exception {
 		int[] diffInfo= new int[] {U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 2, };
 		int[] expected= {8, -2, 0};
@@ -178,6 +187,7 @@ public class HunkComputerTest extends TestCase {
 		assertHunks(diffInfo, expected);
 	}
 
+	@Test
 	public void testReplaceInnerLines() throws Exception {
 		int[] diffInfo= new int[] {U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, C, 0, C, 0, U, 0, };
 		int[] expected= {8, 0, 2};
@@ -185,6 +195,7 @@ public class HunkComputerTest extends TestCase {
 		assertHunks(diffInfo, expected);
 	}
 
+	@Test
 	public void testAddInnerLines() throws Exception {
 		int[] diffInfo= new int[] {U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, A, 0, A, 0, U, 0, U, 0, U, 0, };
 		int[] expected= {8, +2, 0};
@@ -192,6 +203,7 @@ public class HunkComputerTest extends TestCase {
 		assertHunks(diffInfo, expected);
 	}
 
+	@Test
 	public void testRemoveLastLine() throws Exception {
 		int[] diffInfo= new int[] {U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0};
 		fRemovedBelow= new int[10];
@@ -201,6 +213,7 @@ public class HunkComputerTest extends TestCase {
 		assertHunks(diffInfo, expected);
 	}
 
+	@Test
 	public void testReplaceLastLine() throws Exception {
 		int[] diffInfo= new int[] {U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, C, 0, };
 		int[] expected= {10, 0, 1};
@@ -208,6 +221,7 @@ public class HunkComputerTest extends TestCase {
 		assertHunks(diffInfo, expected);
 	}
 
+	@Test
 	public void testAddLastLine() throws Exception {
 		int[] diffInfo= new int[] {U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, U, 0, A, 0, };
 		int[] expected= {12, 1, 0};
diff --git a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/RangeTest.java b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/RangeTest.java
index f41d0b27e00..015042ecec7 100644
--- a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/RangeTest.java
+++ b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/RangeTest.java
@@ -10,20 +10,20 @@
  *******************************************************************************/
 package org.eclipse.ui.workbench.texteditor.tests.revisions;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import org.junit.Test;
 
 import org.eclipse.jface.internal.text.revisions.LineIndexOutOfBoundsException;
 import org.eclipse.jface.internal.text.revisions.Range;
 
 import org.eclipse.jface.text.source.LineRange;
 
-public class RangeTest extends TestCase {
-	public static Test suite() {
-		return new TestSuite(RangeTest.class);
-	}
+public class RangeTest {
 
+	@Test
 	public void testLegalOperations() {
 		Range r= Range.createRelative(0, 1);
 		assertEquals(0, r.start());
@@ -111,6 +111,7 @@ public class RangeTest extends TestCase {
 		assertConsistency(r);
 	}
 
+	@Test
 	public void testSplit() throws Exception {
 		Range r= Range.createRelative(12, 18);
 		Range second= r.split(8);
@@ -123,6 +124,7 @@ public class RangeTest extends TestCase {
 		assertConsistency(second);
 	}
 
+	@Test
 	public void testIllegalOperations() throws Exception {
 
 		try {
@@ -346,6 +348,7 @@ public class RangeTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void testIllegalSplit() throws Exception {
 		Range r= Range.createRelative(12, 18);
 
diff --git a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/rulers/DAGTest.java b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/rulers/DAGTest.java
index cb726bb0261..72b225c76b0 100644
--- a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/rulers/DAGTest.java
+++ b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/rulers/DAGTest.java
@@ -10,19 +10,21 @@
  *******************************************************************************/
 package org.eclipse.ui.workbench.texteditor.tests.rulers;
 
+import static org.junit.Assert.*;
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import org.eclipse.ui.internal.texteditor.rulers.DAG;
 
 /**
  * @since 3.3
  */
-public class DAGTest extends TestCase {
+public class DAGTest {
 	private static final Object A= "A";
 	private static final Object B= "B";
 	private static final Object C= "C";
@@ -37,12 +39,14 @@ public class DAGTest extends TestCase {
 
 	private DAG<Object> fDag= new DAG<>();
 
+	@Test
 	public void testEmpty() throws Exception {
 		assertTrue(fDag.getChildren(new Object()).isEmpty());
 		assertTrue(fDag.getSources().isEmpty());
 		assertTrue(fDag.getSinks().isEmpty());
 	}
-
+	
+	@Test
 	public void testIllegal() throws Exception {
 		assertFalse(fDag.addEdge(A, A));
 		try {
@@ -66,7 +70,8 @@ public class DAGTest extends TestCase {
 		} catch (RuntimeException x) {
 		}
 	}
-
+	
+	@Test
 	public void testDag() throws Exception {
 		assertTrue(fDag.addEdge(A, B));
 		assertEquals(AS, fDag.getSources());
diff --git a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/rulers/RulerTestSuite.java b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/rulers/RulerTestSuite.java
index 91fa8118852..8c5fc0d7f79 100755
--- a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/rulers/RulerTestSuite.java
+++ b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/rulers/RulerTestSuite.java
@@ -10,20 +10,16 @@
  *******************************************************************************/
 package org.eclipse.ui.workbench.texteditor.tests.rulers;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
 
 
 /**
  * @since 3.0
  */
+@RunWith(Suite.class)
+@SuiteClasses(DAGTest.class)
 public class RulerTestSuite {
-
-	public static Test suite() {
-		TestSuite suite= new TestSuite("Test for org.eclipse.ui.internal.texteditor.rulers");
-		//$JUnit-BEGIN$
-		suite.addTestSuite(DAGTest.class);
-		//$JUnit-END$
-		return suite;
-	}
+	//intentionally left blank
 }