Bug 487095 - Move test bundles to JUnit 4

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

28 files changed, 1114 insertions, 744 deletions

diff --git a/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionDocumentTest.java b/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionDocumentTest.java
index e0a0e31583e..f2f74acb19f 100644
--- a/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionDocumentTest.java
+++ b/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionDocumentTest.java
@@ -11,10 +11,19 @@
  *******************************************************************************/
 package org.eclipse.text.tests;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.TestCase;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.DefaultLineTracker;
@@ -29,7 +38,7 @@ import org.eclipse.jface.text.Region;
 import org.eclipse.jface.text.projection.Fragment;
 import org.eclipse.jface.text.projection.Segment;
 
-public class ProjectionDocumentTest extends TestCase {
+public class ProjectionDocumentTest {
 
 	static private class ProjectionDocument extends org.eclipse.jface.text.projection.ProjectionDocument {
 
@@ -81,10 +90,6 @@ public class ProjectionDocumentTest extends TestCase {
 	private ISlaveDocumentManager fSlaveDocumentManager;
 
 
-	public ProjectionDocumentTest(String name) {
-		super(name);
-	}
-
 	private String getOriginalMasterContents() {
 		return LINES ?
 			"1111111111111111111\n" +
@@ -108,16 +113,16 @@ public class ProjectionDocumentTest extends TestCase {
 			"99999999999999999999";
 	}
 
-	@Override
-	protected void setUp() {
+	@Before
+	public void setUp() {
 		fMasterDocument= new Document();
 		fMasterDocument.set(getOriginalMasterContents());
 		fSlaveDocumentManager= new ProjectionDocumentManager();
 		fSlaveDocument= (ProjectionDocument) fSlaveDocumentManager.createSlaveDocument(fMasterDocument);
 	}
 
-	@Override
-	protected void tearDown () {
+	@After
+	public void tearDown () {
 		fSlaveDocumentManager.freeSlaveDocument(fSlaveDocument);
 		fSlaveDocument= null;
 		fSlaveDocumentManager= null;
@@ -247,7 +252,7 @@ public class ProjectionDocumentTest extends TestCase {
 		for (int i= 0; i < expected.length; i++) {
 			Segment segment= (Segment) segmentation[i];
 			Fragment actual= segment.fragment;
-			assertEquals(print(actual) + " != " + print(expected[i]), expected[i], actual);
+			Assert.assertEquals(print(actual) + " != " + print(expected[i]), expected[i], actual);
 		}
 
 	}
@@ -258,15 +263,15 @@ public class ProjectionDocumentTest extends TestCase {
 
 		int textLines= textTracker.getNumberOfLines();
 		int trackerLines= document.getNumberOfLines();
-		assertEquals(trackerLines, textLines);
+		Assert.assertEquals(trackerLines, textLines);
 
 		for (int i= 0; i < trackerLines; i++) {
 			try {
 				IRegion trackerLine= document.getLineInformation(i);
 				IRegion textLine= textTracker.getLineInformation(i);
 
-				assertEquals(trackerLine.getOffset(), textLine.getOffset());
-				assertEquals(trackerLine.getLength(), textLine.getLength());
+				Assert.assertEquals(trackerLine.getOffset(), textLine.getOffset());
+				Assert.assertEquals(trackerLine.getLength(), textLine.getLength());
 
 			} catch (BadLocationException e) {
 				assertTrue(false);
@@ -277,7 +282,7 @@ public class ProjectionDocumentTest extends TestCase {
 	private void assertContents(String expected, IDocument document) {
 		assertWellFormedSegmentation();
 		assertWellFormedFragmentation();
-		assertEquals(expected, document.get());
+		Assert.assertEquals(expected, document.get());
 		assertLineInformationConsistency(document);
 	}
 
@@ -289,12 +294,14 @@ public class ProjectionDocumentTest extends TestCase {
 		assertContents(expected, fMasterDocument);
 	}
 
+	@Test
 	public void test1() {
 		// test identical projection
 		createIdenticalProjection();
 		assertSlaveContents(fMasterDocument.get());
 	}
 
+	@Test
 	public void test2() {
 		// test complete replace the master document in case of identical projection
 		createIdenticalProjection();
@@ -306,12 +313,14 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(fMasterDocument.get());
 	}
 
+	@Test
 	public void test3() {
 		// test standard projection, i.e. all odd digits
 		createProjectionA();
 		assertSlaveContents(getProjectionASlaveContents());
 	}
 
+	@Test
 	public void test4() {
 		// test modifying the unprojected regions of the master document
 		createProjectionA();
@@ -326,6 +335,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(getProjectionASlaveContents());
 	}
 
+	@Test
 	public void test5() {
 		// test modifying the projected regions of the master document
 		createProjectionA();
@@ -348,6 +358,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test6() {
 		// test replacing the contents of the projected regions of the master document
 		createProjectionA();
@@ -364,6 +375,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents("~~~~~");
 	}
 
+	@Test
 	public void test7() {
 		// test replacing the contents of the master document
 		createProjectionA();
@@ -379,6 +391,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertFragmentation(expected);
 	}
 
+	@Test
 	public void test8_1() {
 		// test corner case manipulation of the projected regions of the master document
 		// insert at the beginning of the document
@@ -393,6 +406,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents("~" + getProjectionASlaveContents());
 	}
 
+	@Test
 	public void test8_2() {
 		// test corner case manipulation of the projected regions of the master document
 		// delete at the beginning of the document
@@ -407,6 +421,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(getProjectionASlaveContents().substring(1));
 	}
 
+	@Test
 	public void test8_3() {
 		// test corner case manipulation of the projected regions of the master document
 		// replace at the beginning of the document
@@ -421,6 +436,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents("~" + getProjectionASlaveContents().substring(1));
 	}
 
+	@Test
 	public void test8_4() {
 		// test corner case manipulation of the projected regions of the master document
 		// insert at the end of the document
@@ -435,6 +451,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(getProjectionASlaveContents() + "~");
 	}
 
+	@Test
 	public void test8_5() {
 		// test corner case manipulation of the projected regions of the master document
 		// delete at the end of the document
@@ -450,6 +467,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(text.substring(0, text.length()-1));
 	}
 
+	@Test
 	public void test8_6() {
 		// test corner case manipulation of the projected regions of the master document
 		// replace at the end of the document
@@ -465,6 +483,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(text.substring(0, text.length()-1) + "~");
 	}
 
+	@Test
 	public void test8_7() {
 		// test corner case manipulation of the projected regions of the master document
 		// insert at the beginning of a projected region of the master document
@@ -481,6 +500,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test8_8() {
 		// test corner case manipulation of the projected regions of the master document
 		// delete at the beginning of a projected region of the master document
@@ -497,6 +517,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test8_9() {
 		// test corner case manipulation of the projected regions of the master document
 		// replace at the beginning of a projected region of the master document
@@ -513,6 +534,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test8_10() {
 		// test corner case manipulation of the projected regions of the master document
 		// insert at the end of a projected region of the master document
@@ -521,6 +543,7 @@ public class ProjectionDocumentTest extends TestCase {
 		test9_1();
 	}
 
+	@Test
 	public void test8_11() {
 		// test corner case manipulation of the projected regions of the master document
 		// delete at the end of a projected region of the master document
@@ -538,6 +561,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test8_12() {
 		// test corner case manipulation of the projected regions of the master document
 		// replace at the end of a projected region of the master document
@@ -555,6 +579,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test9_1() {
 		// test corner case manipulation of the unprojected regions of the master document
 		// insert at the beginning of an unprojected region
@@ -570,6 +595,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(getProjectionASlaveContents());
 	}
 
+	@Test
 	public void test9_2() {
 		// test corner case manipulation of the unprojected regions of the master document
 		// delete at the beginning of an unprojected region
@@ -585,6 +611,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(getProjectionASlaveContents());
 	}
 
+	@Test
 	public void test9_3() {
 		// test corner case manipulation of the unprojected regions of the master document
 		// replace at the beginning of an unprojected region
@@ -600,6 +627,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(getProjectionASlaveContents());
 	}
 
+	@Test
 	public void test9_4() {
 		// test corner case manipulation of the unprojected regions of the master document
 		// insert at the end of an unprojected region
@@ -608,6 +636,7 @@ public class ProjectionDocumentTest extends TestCase {
 		test8_7();
 	}
 
+	@Test
 	public void test9_5() {
 		// test corner case manipulation of the unprojected regions of the master document
 		// delete at the end of an unprojected region
@@ -623,6 +652,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(getProjectionASlaveContents());
 	}
 
+	@Test
 	public void test9_6() {
 		// test corner case manipulation of the unprojected regions of the master document
 		// replace at the end of an unprojected region
@@ -638,6 +668,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(getProjectionASlaveContents());
 	}
 
+	@Test
 	public void test9_7() {
 		// test corner case manipulation of the unprojected regions of the master document
 		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=51594
@@ -647,9 +678,9 @@ public class ProjectionDocumentTest extends TestCase {
 
 		try {
 			int startOffset= fMasterDocument.getLineOffset(4);
-			assertEquals(80, startOffset);
+			Assert.assertEquals(80, startOffset);
 			int endOffset= fMasterDocument.getLineOffset(7);
-			assertEquals(140, endOffset);
+			Assert.assertEquals(140, endOffset);
 			fSlaveDocument.addMasterDocumentRange(startOffset, endOffset - startOffset);
 
 			assertSlaveContents(getOriginalMasterContents().substring(80, 140));
@@ -661,6 +692,7 @@ public class ProjectionDocumentTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test10_1() {
 		// test manipulations overlapping projected and unprojected regions of the master document
 		// delete range overlapping from a projected into an unprojected region
@@ -677,6 +709,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test10_2() {
 		// test manipulations overlapping projected and unprojected regions of the master document
 		// replace range overlapping from a projected into an unprojected region
@@ -703,6 +736,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test10_3() {
 		// test manipulations overlapping projected and unprojected regions of the master document
 		// delete range overlapping from an unprojected into a projected region
@@ -719,6 +753,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test10_4() {
 		// test manipulations overlapping projected and unprojected regions of the master document
 		// replace range overlapping from an unprojected into a projected region
@@ -745,6 +780,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test11() {
 		// test deleting an unprojected region of the master document
 
@@ -766,6 +802,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(getProjectionASlaveContents());
 	}
 
+	@Test
 	public void test12() {
 		// test deleting a projected region of the master document
 
@@ -785,6 +822,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertFragmentation(expected);
 	}
 
+	@Test
 	public void test13() {
 		// test complete replace of the contents of the slave document in identical projection
 
@@ -800,6 +838,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertMasterContents("~~~~~");
 	}
 
+	@Test
 	public void test14_1() {
 		// test complete replace of the contents of the slave document in standard projection A
 
@@ -813,6 +852,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertMasterContents("~~~~~");
 	}
 
+	@Test
 	public void test14_2() {
 		// test complete replace of the contents of the slave document in standard projection B
 
@@ -828,6 +868,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertMasterContents(buffer.toString());
 	}
 
+	@Test
 	public void test15() {
 		// test modifying the segments of the slave document
 
@@ -859,6 +900,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertMasterContents(buffer.toString());
 	}
 
+	@Test
 	public void test16() {
 		// test replacing the contents of the segments of the slave document
 
@@ -883,6 +925,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertMasterContents(buffer.toString());
 	}
 
+	@Test
 	public void test17_1() {
 		// test corner case manipulation of the segments of the slave document
 		// insert at the beginning of a segment of the slave document
@@ -903,6 +946,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertMasterContents(buffer.toString());
 	}
 
+	@Test
 	public void test17_2() {
 		// test corner case manipulation of the segments of the slave document
 		// delete at the beginning of a segment of the slave document
@@ -923,6 +967,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertMasterContents(buffer.toString());
 	}
 
+	@Test
 	public void test17_3() {
 		// test corner case manipulation of the segments of the slave document
 		// replace at the beginning of a segment of the slave document
@@ -943,6 +988,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertMasterContents(buffer.toString());
 	}
 
+	@Test
 	public void test17_4() {
 		// test corner case manipulation of the segments of the slave document
 		// insert at the end of a segment of the slave document
@@ -951,6 +997,7 @@ public class ProjectionDocumentTest extends TestCase {
 		test17_1();
 	}
 
+	@Test
 	public void test17_5() {
 		// test corner case manipulation of the segments of the slave document
 		// delete at the end of a segment of the slave document
@@ -971,6 +1018,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertMasterContents(buffer.toString());
 	}
 
+	@Test
 	public void test17_6() {
 		// test corner case manipulation of the segments of the slave document
 		// replace at the end of a segment of the slave document
@@ -991,6 +1039,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertMasterContents(buffer.toString());
 	}
 
+	@Test
 	public void test17_7() {
 		// test corner case manipulation of the segments of the slave document
 		// insert at the end of last segment of the slave document - bug 301023
@@ -1014,6 +1063,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertMasterContents(buffer.toString());
 	}
 
+	@Test
 	public void test18_1() {
 		// test manipulations overlapping multiple segments of the slave document
 		// delete range overlapping two neighboring segments
@@ -1043,6 +1093,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertMasterContents(buffer.toString());
 	}
 
+	@Test
 	public void test18_2() {
 		// test manipulations overlapping multiple segments of the slave document
 		// replace range overlapping two neighboring segments
@@ -1072,6 +1123,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertMasterContents(buffer.toString());
 	}
 
+	@Test
 	public void test19() {
 		// test deleting the contents of a segment of the slave document
 
@@ -1100,6 +1152,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertFragmentation(expected);
 	}
 
+	@Test
 	public void test20_1() {
 		// test adding a range to the slave document at the beginning of a segment gap
 
@@ -1126,6 +1179,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test20_2() {
 		// test adding a range to the slave document at the end of a segment gap
 
@@ -1152,6 +1206,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test20_3() {
 		// test adding a range to the slave document that is in the middle of a segment gap
 
@@ -1179,6 +1234,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test20_4() {
 		// test adding a range to the slave document that is a segment gap
 
@@ -1204,6 +1260,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test20_5() {
 		// test adding a range to the slave document beginning in a segment gap and ending in a segment
 
@@ -1230,6 +1287,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test20_6() {
 		// test adding a range to the slave document beginning in a segment and ending in a segment gap
 
@@ -1256,6 +1314,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test20_7() {
 		// test adding a range to the slave document beginning in a segment and ending in a segment
 
@@ -1281,6 +1340,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test20_8() {
 		// test adding a range to the slave document beginning in a segment gap and ending in a segment gap
 
@@ -1309,6 +1369,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test21_1() {
 		// test removing a range from the slave document at the beginning of a segment
 
@@ -1334,6 +1395,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test21_2() {
 		// test removing a range from the slave document at the end of a segment
 
@@ -1359,6 +1421,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test21_3() {
 		// test removing a range from the slave document that is in the middle of a segment
 
@@ -1385,6 +1448,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test21_4() {
 		// test removing a range from the slave document that is a segment
 
@@ -1409,6 +1473,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test21_5() {
 		// test removing a range from the slave document beginning in a segment and ending in a segment gap
 
@@ -1434,6 +1499,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test21_6() {
 		// test removing a range from the slave document beginning in a segment gap and ending in a segment
 
@@ -1459,6 +1525,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test21_7() {
 		// test removing a range from the slave document beginning in a segment gap and ending in a segment gap
 
@@ -1483,6 +1550,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test21_8() {
 		// test removing a range from the slave document beginning in a segment and ending in a segment
 
@@ -1508,6 +1576,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test21_9() {
 		// test removing a range from the slave document using identical projection
 
@@ -1530,6 +1599,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveContents(buffer.toString());
 	}
 
+	@Test
 	public void test21_a() {
 		// test removing a range from the slave document using identical projection
 		// the removed range includes the end of the master document - see bug 301023
@@ -1555,12 +1625,12 @@ public class ProjectionDocumentTest extends TestCase {
 
 	private void assertEquals(DocumentEvent expected, DocumentEvent received) {
 		assertSame(expected.getDocument(), received.getDocument());
-		assertEquals(expected.getOffset(), received.getOffset());
-		assertEquals(expected.getLength(), received.getLength());
+		Assert.assertEquals(expected.getOffset(), received.getOffset());
+		Assert.assertEquals(expected.getLength(), received.getLength());
 		if (expected.getText() == null || expected.getText().length() == 0)
 			assertTrue(received.getText() == null || received.getText().length() == 0);
 		else
-			assertEquals(expected.getText(), received.getText());
+			Assert.assertEquals(expected.getText(), received.getText());
 	}
 
 	private void assertSlaveEvents(DocumentEvent[] expected, DocumentEvent[] received) {
@@ -1573,6 +1643,7 @@ public class ProjectionDocumentTest extends TestCase {
 			assertEquals(received[i], expected[i]);
 	}
 
+	@Test
 	public void test22() {
 		// test document events sent out by the slave document when adding segments
 
@@ -1603,6 +1674,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveEvents(expected, actual);
 	}
 
+	@Test
 	public void test23() {
 		// test document events sent out by the slave document when removing segments
 
@@ -1632,6 +1704,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertSlaveEvents(expected, actual);
 	}
 
+	@Test
 	public void test24_1() {
 		// test auto expand mode when manipulating the master document
 		// master event completely left of slave document
@@ -1656,6 +1729,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertFragmentation(expected);
 	}
 
+	@Test
 	public void test24_2() {
 		// test auto expand mode when manipulating the master document
 		// master event completely right of slave document
@@ -1680,6 +1754,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertFragmentation(expected);
 	}
 
+	@Test
 	public void test24_3() {
 		// test auto expand mode when manipulating the master document
 		// master event completely left of fragment
@@ -1704,6 +1779,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertFragmentation(expected);
 	}
 
+	@Test
 	public void test24_4() {
 		// test auto expand mode when manipulating the master document
 		// master event completely right of fragment
@@ -1729,6 +1805,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertFragmentation(expected);
 	}
 
+	@Test
 	public void test24_5() {
 		// test auto expand mode when manipulating the master document
 		// master event starts left of fragment and ends inside of a fragment
@@ -1752,6 +1829,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertFragmentation(expected);
 	}
 
+	@Test
 	public void test24_6() {
 		// test auto expand mode when manipulating the master document
 		// master event starts inside of a fragment and ends right of a fragment
@@ -1775,6 +1853,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertFragmentation(expected);
 	}
 
+	@Test
 	public void test24_7() {
 		// test auto expand mode when manipulating the master document
 		// master event starts left of a fragment and ends right of a fragment
@@ -1798,6 +1877,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertFragmentation(expected);
 	}
 
+	@Test
 	public void test24_8() {
 		// test auto expand mode when manipulating the master document
 		// complete replace of master document
@@ -1818,6 +1898,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertFragmentation(expected);
 	}
 
+	@Test
 	public void test25() {
 		// test auto expand mode when manipulating the slave document
 
@@ -1834,6 +1915,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertFragmentation(expected, false);
 	}
 
+	@Test
 	public void test26() {
 		// test multiple slave documents for the same master document
 
@@ -1851,6 +1933,7 @@ public class ProjectionDocumentTest extends TestCase {
 		fSlaveDocumentManager.freeSlaveDocument(slave2);
 	}
 
+	@Test
 	public void test27() {
 		// test changing the projection until identical projection is reached
 
@@ -1916,6 +1999,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertFragmentation(expected);
 	}
 
+	@Test
 	public void test28_1() {
 		// delete slave content and check fragmentation, need to keep a single fragment as anchor
 		createProjectionB();
@@ -1935,6 +2019,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertFragmentation(expected);
 	}
 
+	@Test
 	public void test28_2() {
 		// test step wise version of the complete replace
 		// delete whole content of slave, followed by inserting text
@@ -1963,6 +2048,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertMasterContents(buffer.toString());
 	}
 
+	@Test
 	public void _test29() {
 		// test computation of unprojected  master regions
 
@@ -2027,12 +2113,11 @@ public class ProjectionDocumentTest extends TestCase {
 
 		if (actual == null) {
 			assertNull(expected);
-			return;
 		}
 
 		assertTrue("invalid number of regions", expected.length == actual.length);
 		for (int i= 0; i < expected.length; i++)
-			assertEquals(print(actual[i]) + " != " + print(expected[i]), expected[i], actual[i]);
+			Assert.assertEquals(print(actual[i]) + " != " + print(expected[i]), expected[i], actual[i]);
 	}
 
 	private void assertUnprojectedMasterRegions(IRegion[] expected, int offsetInMaster, int lengthInMaster) {
@@ -2045,6 +2130,7 @@ public class ProjectionDocumentTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test29_1() {
 		// test computation of unprojected  master regions
 		// spanning no fragment
@@ -2056,6 +2142,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 45, 10);
 	}
 
+	@Test
 	public void test29_2() {
 		// test computation of unprojected  master regions
 		// spanning no fragment
@@ -2067,6 +2154,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 45, 15);
 	}
 
+	@Test
 	public void test29_3() {
 		// test computation of unprojected  master regions
 		// spanning no fragment
@@ -2078,6 +2166,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 80, 15);
 	}
 
+	@Test
 	public void test29_4() {
 		// test computation of unprojected  master regions
 		// spanning no fragment
@@ -2089,6 +2178,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 85, 10);
 	}
 
+	@Test
 	public void test29_5() {
 		// test computation of unprojected  master regions
 		// spanning one fragment
@@ -2100,6 +2190,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 50, 20);
 	}
 
+	@Test
 	public void test29_6() {
 		// test computation of unprojected  master regions
 		// spanning one fragment
@@ -2108,6 +2199,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(new IRegion[] {}, 60, 10);
 	}
 
+	@Test
 	public void test29_7() {
 		// test computation of unprojected  master regions
 		// spanning one fragment
@@ -2116,6 +2208,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(new IRegion[] {}, 65, 10);
 	}
 
+	@Test
 	public void test29_8() {
 		// test computation of unprojected  master regions
 		// spanning one fragment
@@ -2124,6 +2217,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(new IRegion[] {}, 65, 15);
 	}
 
+	@Test
 	public void test29_9() {
 		// test computation of unprojected  master regions
 		// spanning one fragment
@@ -2135,6 +2229,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 70, 20);
 	}
 
+	@Test
 	public void test29_10() {
 		// test computation of unprojected  master regions
 		// spanning one fragment
@@ -2143,6 +2238,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(new IRegion[] {}, 60, 20);
 	}
 
+	@Test
 	public void test29_11() {
 		// test computation of unprojected  master regions
 		// spanning one fragment
@@ -2155,6 +2251,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 50, 40);
 	}
 
+	@Test
 	public void test29_12() {
 		// test computation of unprojected  master regions
 		// spanning multiple fragments
@@ -2169,6 +2266,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 50, 80);
 	}
 
+	@Test
 	public void test29_13() {
 		// test computation of unprojected  master regions
 		// spanning multiple fragments
@@ -2183,6 +2281,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 50, 90);
 	}
 
+	@Test
 	public void test29_14() {
 		// test computation of unprojected  master regions
 		// spanning multiple fragments
@@ -2196,6 +2295,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 50, 60);
 	}
 
+	@Test
 	public void test29_15() {
 		// test computation of unprojected  master regions
 		// spanning multiple fragments
@@ -2210,6 +2310,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 50, 110);
 	}
 
+	@Test
 	public void test29_16() {
 		// test computation of unprojected  master regions
 		// spanning multiple fragments
@@ -2224,6 +2325,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 50, 80);
 	}
 
+	@Test
 	public void test29_17() {
 		// test computation of unprojected  master regions
 		// spanning multiple fragments
@@ -2237,6 +2339,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 60, 70);
 	}
 
+	@Test
 	public void test29_18() {
 		// test computation of unprojected  master regions
 		// spanning multiple fragments
@@ -2250,6 +2353,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 60, 80);
 	}
 
+	@Test
 	public void test29_19() {
 		// test computation of unprojected  master regions
 		// spanning multiple fragments
@@ -2262,6 +2366,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 60, 50);
 	}
 
+	@Test
 	public void test29_20() {
 		// test computation of unprojected  master regions
 		// spanning multiple fragments
@@ -2275,6 +2380,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 60, 100);
 	}
 
+	@Test
 	public void test29_21() {
 		// test computation of unprojected  master regions
 		// spanning multiple fragments
@@ -2288,6 +2394,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 60, 70);
 	}
 
+	@Test
 	public void test29_22() {
 		// test computation of unprojected  master regions
 		// spanning multiple fragments
@@ -2301,6 +2408,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 70, 60);
 	}
 
+	@Test
 	public void test29_23() {
 		// test computation of unprojected  master regions
 		// spanning multiple fragments
@@ -2314,6 +2422,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 70, 70);
 	}
 
+	@Test
 	public void test29_24() {
 		// test computation of unprojected  master regions
 		// spanning multiple fragments
@@ -2326,6 +2435,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 70, 40);
 	}
 
+	@Test
 	public void test29_25() {
 		// test computation of unprojected  master regions
 		// spanning multiple fragments
@@ -2339,6 +2449,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 70, 90);
 	}
 
+	@Test
 	public void test29_26() {
 		// test computation of unprojected  master regions
 		// spanning multiple fragments
@@ -2352,6 +2463,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 70, 60);
 	}
 
+	@Test
 	public void test29_27() {
 		// test computation of unprojected  master regions
 		// spanning multiple fragments
@@ -2366,6 +2478,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 40, 90);
 	}
 
+	@Test
 	public void test29_28() {
 		// test computation of unprojected  master regions
 		// spanning multiple fragments
@@ -2380,6 +2493,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 40, 100);
 	}
 
+	@Test
 	public void test29_29() {
 		// test computation of unprojected  master regions
 		// spanning multiple fragments
@@ -2393,6 +2507,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 40, 70);
 	}
 
+	@Test
 	public void test29_30() {
 		// test computation of unprojected  master regions
 		// spanning multiple fragments
@@ -2407,6 +2522,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 40, 120);
 	}
 
+	@Test
 	public void test29_31() {
 		// test computation of unprojected  master regions
 		// spanning multiple fragments
@@ -2421,6 +2537,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 40, 90);
 	}
 
+	@Test
 	public void test29_32() {
 		// test computation of unprojected  master regions
 		// spanning multiple fragments
@@ -2435,6 +2552,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 50, 80);
 	}
 
+	@Test
 	public void test29_33() {
 		// test computation of unprojected  master regions
 		// spanning multiple fragments
@@ -2449,6 +2567,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 50, 90);
 	}
 
+	@Test
 	public void test29_34() {
 		// test computation of unprojected  master regions
 		// spanning multiple fragments
@@ -2462,6 +2581,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 50, 60);
 	}
 
+	@Test
 	public void test29_35() {
 		// test computation of unprojected  master regions
 		// spanning multiple fragments
@@ -2476,6 +2596,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 50, 110);
 	}
 
+	@Test
 	public void test29_36() {
 		// test computation of unprojected  master regions
 		// spanning multiple fragments
@@ -2490,6 +2611,7 @@ public class ProjectionDocumentTest extends TestCase {
 		assertUnprojectedMasterRegions(expected, 50, 80);
 	}
 
+	@Test
 	public void test29_37() {
 		// test computation of unprojected  master regions
 
@@ -2509,6 +2631,7 @@ public class ProjectionDocumentTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test29_38() {
 		// test computation of unprojected  master regions
 		createProjectionA();
diff --git a/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionMappingTest.java b/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionMappingTest.java
index 56860db2997..8e05bed45d1 100644
--- a/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionMappingTest.java
+++ b/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionMappingTest.java
@@ -10,7 +10,12 @@
  *******************************************************************************/
 package org.eclipse.text.tests;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.BadPositionCategoryException;
@@ -25,7 +30,7 @@ import org.eclipse.jface.text.projection.Segment;
 /**
  * @since 3.0
  */
-public class ProjectionMappingTest extends TestCase {
+public class ProjectionMappingTest {
 
 	private IDocument fMasterDocument;
 	private IDocument fSlaveDocument;
@@ -34,10 +39,6 @@ public class ProjectionMappingTest extends TestCase {
 	private ProjectionMapping fProjectionMapping;
 
 
-	public ProjectionMappingTest(String name) {
-		super(name);
-	}
-
 	private String getOriginalMasterContent() {
 		return
 			"1111111111111111111\n" +
@@ -103,8 +104,8 @@ public class ProjectionMappingTest extends TestCase {
 		addProjection(70, 30, 10);
 	}
 
-	@Override
-	protected void setUp() throws Exception {
+	@Before
+	public void setUp() {
 		fMasterDocument= new Document();
 		fSlaveDocument= new Document();
 		fFragmentsCategory= "_fragments" + fSlaveDocument.hashCode();
@@ -115,8 +116,8 @@ public class ProjectionMappingTest extends TestCase {
 	}
 
 
-	@Override
-	protected void tearDown() throws Exception {
+	@After
+	public void tearDown() {
 		fMasterDocument= null;
 		fSlaveDocument= null;
 		fFragmentsCategory= null;
@@ -124,6 +125,7 @@ public class ProjectionMappingTest extends TestCase {
 		fProjectionMapping= null;
 	}
 
+	@Test
 	public void test1() {
 		// test getCoverage
 
@@ -133,6 +135,7 @@ public class ProjectionMappingTest extends TestCase {
 		assertTrue(coverage.getLength() == 60);
 	}
 
+	@Test
 	public void test2() {
 		// test toOriginOffset
 
@@ -154,7 +157,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
-
+	@Test
 	public void test3a() {
 		// test toOriginRegion
 		// image region inside segment
@@ -170,6 +173,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test3b() {
 		// test toOriginRegion
 		// image region is segment
@@ -185,6 +189,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test3c() {
 		// test toOriginRegion
 		// image region overlapping segments
@@ -199,6 +204,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test3d() {
 		// test toOriginRegion
 		// test null projection
@@ -223,6 +229,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test3e() {
 		// test toOriginRegion
 		// identical projection
@@ -242,6 +249,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test3f() {
 		// test toOriginRegion
 		// test empty slave document
@@ -258,6 +266,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test4() {
 		// test toOriginLines
 
@@ -276,6 +285,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test5a() {
 		// test toOriginLine
 		// test projection with no wrapped line
@@ -292,6 +302,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test5b() {
 		// test toOriginLine
 		// test line wrapping projection
@@ -307,6 +318,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test6() {
 		// test toImageOffset
 
@@ -371,6 +383,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test7() {
 		// test toExactImageRegion
 
@@ -399,6 +412,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test8() {
 		// test toImageRegion
 
@@ -427,6 +441,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test8b() {
 		// test toImageRegion
 
@@ -481,6 +496,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test9a() {
 		// test toImageLine
 		// test standard line wrapping projection
@@ -502,6 +518,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test9b() {
 		// test toImageLine
 		// test non-line wrapping, well distributed projection of empty lines
@@ -536,6 +553,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test10a() {
 		// test toClosestImageLine
 		// test standard line wrapping projection
@@ -557,6 +575,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test10b() {
 		// test toClosestImageLine
 		// test empty projection
@@ -568,6 +587,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test10c() {
 		// test toClosestImageLine
 		// test non-line wrapping, well distributed projection of empty lines
@@ -609,6 +629,7 @@ public class ProjectionMappingTest extends TestCase {
 			assertEquals(expected[i], actual[i]);
 	}
 
+	@Test
 	public void test11a() {
 		// test toExactOriginRegions
 		// test the whole slave document
@@ -627,6 +648,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test11b() {
 		// test toExactOriginRegions
 		// test a region completely comprised by a segment
@@ -644,6 +666,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test11c() {
 		// test toExactOriginRegions
 		// test a region completely comprised by a segment at the beginning of a segment
@@ -661,6 +684,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test11d() {
 		// test toExactOriginRegions
 		// test a region completely comprised by a segment at the end of a segment
@@ -678,6 +702,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test11e() {
 		// test toExactOriginRegions
 		// test a complete segment
@@ -695,6 +720,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test11f() {
 		// test toExactOriginRegions
 		// test zero-length regions
@@ -725,6 +751,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test11g() {
 		// test toExactOriginRegions
 		// test a region starting in the middle of a segment and ending in the middle of another fragment
@@ -743,6 +770,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test11h() {
 		// test toExactOriginRegions
 		// test a region completely comprised by a segment at the end of a segment, not the first segment
@@ -760,6 +788,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test11i() {
 		// test toExactOriginRegions
 		// test a single region in the identical projection
@@ -778,6 +807,7 @@ public class ProjectionMappingTest extends TestCase {
 
 	}
 
+	@Test
 	public void test12a() {
 		// test toExactImageRegions
 		// test the whole master document
@@ -796,6 +826,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test12b() {
 		// test toExactImageRegions
 		// test a region completely comprised by a fragment
@@ -813,6 +844,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test12c() {
 		// test toExactImageRegions
 		// test a region completely comprised by a fragment at the beginning of a fragment
@@ -830,6 +862,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test12d() {
 		// test toExactImageRegions
 		// test a region completely comprised by a fragment at the end of a fragment
@@ -847,6 +880,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test12e() {
 		// test toExactImageRegions
 		// test a complete fragment
@@ -864,6 +898,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test12f() {
 		// test toExactImageRegions
 		// test zero-length regions
@@ -894,6 +929,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test12g() {
 		// test toExactImageRegions
 		// test a region starting in the middle of a fragment and ending in the middle of another fragment
@@ -912,6 +948,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test12h() {
 		// test toExactImageRegions
 		// test a region completely comprised by a fragment at the end of a fragment, not the first fragment
@@ -929,6 +966,7 @@ public class ProjectionMappingTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void test12i() {
 		// test toExactImageRegions
 		// test a single region in the identical projection
@@ -947,12 +985,14 @@ public class ProjectionMappingTest extends TestCase {
 
 	}
 
+	@Test
 	public void test13a() {
 		// test getImageLength
 		// empty projection
 		assertEquals(0, fProjectionMapping.getImageLength());
 	}
 
+	@Test
 	public void test13b() {
 		// test getImageLength
 		// identical projection
@@ -960,6 +1000,7 @@ public class ProjectionMappingTest extends TestCase {
 		assertEquals(fSlaveDocument.getLength(), fProjectionMapping.getImageLength());
 	}
 
+	@Test
 	public void test13c() {
 		// test getImageLength
 		// standard projection
@@ -967,6 +1008,7 @@ public class ProjectionMappingTest extends TestCase {
 		assertEquals(fSlaveDocument.getLength(), fProjectionMapping.getImageLength());
 	}
 
+	@Test
 	public void test13d() {
 		// test getImageLength
 		// line wrapping projection
diff --git a/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionTestSuite.java b/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionTestSuite.java
index baa116f7bc5..1106d0d4662 100644
--- a/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionTestSuite.java
+++ b/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionTestSuite.java
@@ -11,22 +11,18 @@
 
 package org.eclipse.text.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;
 
 
 /**
  *
  * @since 3.0
  */
+@RunWith(Suite.class)
+@SuiteClasses({ProjectionDocumentTest.class,
+	ProjectionMappingTest.class})
 public class ProjectionTestSuite {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test Suite for org.eclipse.text - projection"); //$NON-NLS-1$
-		//$JUnit-BEGIN$
-		suite.addTestSuite(ProjectionDocumentTest.class);
-		suite.addTestSuite(ProjectionMappingTest.class);
-		//$JUnit-END$
-		return suite;
-	}
+	//intentionally left blank
 }
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/AbstractGapTextTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/AbstractGapTextTest.java
index 589678cc682..967e546f102 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/AbstractGapTextTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/AbstractGapTextTest.java
@@ -10,7 +10,8 @@
  *******************************************************************************/
 package org.eclipse.text.tests;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import org.eclipse.jface.text.GapTextStore;
 
@@ -19,7 +20,7 @@ import org.eclipse.jface.text.GapTextStore;
  *
  * @since 3.3
  */
-public class AbstractGapTextTest extends TestCase {
+public class AbstractGapTextTest {
 	protected static class GapText extends GapTextStore {
 
 		/**
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/AbstractLineTrackerTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/AbstractLineTrackerTest.java
index cf5f5c9b867..6db6313831e 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/AbstractLineTrackerTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/AbstractLineTrackerTest.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.text.tests;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
 
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.ILineTracker;
@@ -21,14 +21,10 @@ import org.eclipse.jface.text.ITextStore;
  *
  * @since 3.2
  */
-public abstract class AbstractLineTrackerTest extends TestCase {
+public abstract class AbstractLineTrackerTest {
 	protected ITextStore fText;
 	protected ILineTracker  fTracker;
 
-	protected AbstractLineTrackerTest(String name) {
-		super(name);
-	}
-
 	protected final void checkLines(int[] lines) throws BadLocationException {
 		assertEquals("number of lines", lines.length, fTracker.getNumberOfLines());
 
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/AdaptiveGapTextTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/AdaptiveGapTextTest.java
index ec3905b9392..510c58dde5d 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/AdaptiveGapTextTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/AdaptiveGapTextTest.java
@@ -10,30 +10,29 @@
  *******************************************************************************/
 package org.eclipse.text.tests;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 public class AdaptiveGapTextTest extends AbstractGapTextTest {
-	@Override
-	protected void setUp() {
+	
+	@Before
+	public void setUp() {
 		fText= new GapText(2, 10, 0.5f);
 		fText.set("xxxxx");
 	}
 
-	public static Test suite() {
-		return new TestSuite(AdaptiveGapTextTest.class);
-	}
-
-	@Override
-	protected void tearDown () {
+	@After
+	public void tearDown () {
 		fText= null;
 	}
 
+	@Test
 	public void testSet() {
 		assertGap(5, 7);
 	}
 
+	@Test
 	public void testGetText1() {
 		String[] expected= {
 			"xyxxxx",
@@ -50,6 +49,7 @@ public class AdaptiveGapTextTest extends AbstractGapTextTest {
 
 	}
 
+	@Test
 	public void testGetText2() {
 		String[] expected= {
 			"yxxxxx",
@@ -66,6 +66,7 @@ public class AdaptiveGapTextTest extends AbstractGapTextTest {
 
 	}
 
+	@Test
 	public void testInsert() {
 		fText.replace(2, 0, "y");
 		assertGap(3, 4);
@@ -80,6 +81,7 @@ public class AdaptiveGapTextTest extends AbstractGapTextTest {
 		assertGap(8, 10);
 	}
 
+	@Test
 	public void testRemoveGapOverlapping() {
 		fText.replace(2, 2, null);
 		assertGap(2, 6);
@@ -87,7 +89,8 @@ public class AdaptiveGapTextTest extends AbstractGapTextTest {
 		fText.replace(1, 2, null);
 		assertGap(1, 3);
 	}
-
+	
+	@Test
 	public void testRemoveGapOverlapping2() {
 		fText.replace(0, 0, "aaaaazzzzzyyyyy");
 		assertGap(15, 21);
@@ -98,7 +101,8 @@ public class AdaptiveGapTextTest extends AbstractGapTextTest {
 		assertGap(5, 7);
 		assertContents("aaaaaxxx");
 	}
-
+	
+	@Test
 	public void testRemoveRemoteFromGap() {
 		fText.replace(0, 0, "aaaaazzzzzyyyyy");
 		assertGap(15, 21);
@@ -116,6 +120,7 @@ public class AdaptiveGapTextTest extends AbstractGapTextTest {
 
 	}
 
+	@Test
 	public void testRemoveAtLeftGapEdge() {
 		fText.replace(4, 0, "xxx");
 		assertGap(7, 9);
@@ -124,7 +129,8 @@ public class AdaptiveGapTextTest extends AbstractGapTextTest {
 		fText.replace(6, 1, null);
 		assertGap(6, 8);
 	}
-
+	
+	@Test
 	public void testRemoveAtRightGapEdge() {
 		fText.replace(4, 0, "xxx");
 		assertGap(7, 9);
@@ -133,7 +139,8 @@ public class AdaptiveGapTextTest extends AbstractGapTextTest {
 		fText.replace(7, 1, null);
 		assertGap(7, 9);
 	}
-
+	
+	@Test
 	public void testReplace() {
 		fText.replace(2, 2, "yy");
 		assertGap(4, 6);
@@ -144,7 +151,8 @@ public class AdaptiveGapTextTest extends AbstractGapTextTest {
 		fText.replace(14, 0, "yyy");
 		assertGap(17, 19);
 	}
-
+	
+	@Test
 	public void testRemoveReallocateBeforeGap() throws Exception {
 	    fText.replace(0, 0, "yyyyyzzzzz");
 	    assertGap(10, 15);
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelExtension2Test.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelExtension2Test.java
index c39b3f91a81..948b861d246 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelExtension2Test.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelExtension2Test.java
@@ -10,12 +10,18 @@
  *******************************************************************************/
 package org.eclipse.text.tests;
 
+import static org.junit.Assert.assertTrue;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.Position;
@@ -24,17 +30,12 @@ import org.eclipse.jface.text.source.AnnotationModel;
 import org.eclipse.jface.text.source.IAnnotationModel;
 import org.eclipse.jface.text.source.IAnnotationModelListener;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-
 /**
  * Tests the {@link org.eclipse.jface.text.source.IAnnotationModelExtension2}.
  *
  * @since 3.4
  */
-public class AnnotationModelExtension2Test extends TestCase {
+public class AnnotationModelExtension2Test {
 
 	public class OldAnnotationModel implements IAnnotationModel {
 
@@ -98,12 +99,8 @@ public class AnnotationModelExtension2Test extends TestCase {
 	private Annotation fAfterIn;
 	private Annotation fAfterOut;
 
-	public static Test suite() {
-		return new TestSuite(AnnotationModelExtension2Test.class);
-	}
-
-	@Override
-	protected void setUp() throws Exception {
+	@Before
+	public void setUp() {
 		fDocument= new Document("How much wood\nwould a woodchuck chuck\nif a woodchuck\ncould chuck wood?\n42");
 
 		fAnnotationModel= new AnnotationModel();
@@ -129,8 +126,8 @@ public class AnnotationModelExtension2Test extends TestCase {
 		fAnnotationModel.connect(fDocument);
 	}
 
-	@Override
-	protected void tearDown() throws Exception {
+	@After
+	public void tearDown() {
 		fAnnotationModel.disconnect(fDocument);
 	}
 
@@ -252,22 +249,26 @@ public class AnnotationModelExtension2Test extends TestCase {
 		}
 		return null;
 	}
-
+	
+	@Test
 	public void testInside() throws Exception {
 		Annotation[] expected= new Annotation[] { fInside, fInsideIn };
 		assertPermutations(false, false, expected);
 	}
-
+	
+	@Test
 	public void testAhead() throws Exception {
 		Annotation[] expected= new Annotation[] { fInside, fInsideIn, fBefore, fBeforeIn };
 		assertPermutations(true, false, expected);
 	}
-
+	
+	@Test
 	public void testBehind() throws Exception {
 		Annotation[] expected= new Annotation[] { fInside, fInsideIn, fAfter, fAfterIn };
 		assertPermutations(false, true, expected);
 	}
-
+	
+	@Test
 	public void testAheadBehind() throws Exception {
 		Annotation[] expected= new Annotation[] { fInside, fInsideIn, fInsideOut, fAfter, fAfterIn, fBefore, fBeforeIn };
 		assertPermutations(true, true, expected);
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelStressTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelStressTest.java
index 4e5bca4b9d6..982af938e43 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelStressTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelStressTest.java
@@ -10,25 +10,28 @@
  *******************************************************************************/
 package org.eclipse.text.tests;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Random;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.Position;
 import org.eclipse.jface.text.source.Annotation;
 import org.eclipse.jface.text.source.AnnotationModel;
 import org.eclipse.jface.text.source.IAnnotationModel;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-
 /**
  * @since 3.4
  */
-public class AnnotationModelStressTest extends TestCase {
+public class AnnotationModelStressTest {
 
 	private static final String RANDOM_CONTENT= "UENTXRXNMRXSTNVZFACSMTQYVGOLEPGRXRH\n" +
 			"BCQCYH\n" +
@@ -1210,12 +1213,8 @@ public class AnnotationModelStressTest extends TestCase {
 	private AnnotationModel fInnerModel1;
 	private AnnotationModel fInnerModel2;
 
-	public static Test suite() {
-		return new TestSuite(AnnotationModelStressTest.class);
-	}
-
-	@Override
-	protected void setUp() throws Exception {
+	@Before
+	public void setUp() throws Exception {
 		fDocument= new Document(RANDOM_CONTENT);
 
 		fAnnotationModel= new AnnotationModel();
@@ -1229,8 +1228,8 @@ public class AnnotationModelStressTest extends TestCase {
 		fAnnotationModel.connect(fDocument);
 	}
 
-	@Override
-	protected void tearDown() throws Exception {
+	@After
+	public void tearDown() throws Exception {
 		fAnnotationModel.disconnect(fDocument);
 		
 		fDocument= null;
@@ -1346,7 +1345,8 @@ public class AnnotationModelStressTest extends TestCase {
 
 		return result;
 	}
-
+	
+	@Test
 	public void testStressTestPlainOld() throws Exception {
 		ArrayList<AnnotationData> added= new ArrayList<>();
 		int i= 0;
@@ -1376,7 +1376,8 @@ public class AnnotationModelStressTest extends TestCase {
 			assertExist(added);
 		}
 	}
-
+	
+	@Test
 	public void testStressTestPlainNew() throws Exception {
 		ArrayList<AnnotationData> added= new ArrayList<>();
 		int i= 0;
@@ -1406,7 +1407,8 @@ public class AnnotationModelStressTest extends TestCase {
 			assertExistNew(added);
 		}
 	}
-
+	
+	@Test
 	public void testStressTestMoveOld() throws Exception {
 		ArrayList<AnnotationData> added= new ArrayList<>();
 		int i= 0;
@@ -1440,7 +1442,8 @@ public class AnnotationModelStressTest extends TestCase {
 			assertExist(added);
 		}
 	}
-
+	
+	@Test
 	public void testStressTestMoveNew() throws Exception {
 		ArrayList<AnnotationData> added= new ArrayList<>();
 		int i= 0;
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/ChildDocumentTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/ChildDocumentTest.java
index 85b79f9c135..453d70ad922 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/ChildDocumentTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/ChildDocumentTest.java
@@ -10,9 +10,12 @@
  *******************************************************************************/
 package org.eclipse.text.tests;
 
-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 org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.BadPositionCategoryException;
@@ -24,18 +27,13 @@ import org.eclipse.jface.text.Position;
 import org.eclipse.jface.text.projection.ChildDocument;
 import org.eclipse.jface.text.projection.ChildDocumentManager;
 
-public class ChildDocumentTest extends TestCase {
+public class ChildDocumentTest {
 
 	private IDocument fDocument;
 	private Document fParent;
 	private ChildDocumentManager fManager;
 
 
-	public ChildDocumentTest(String name) {
-		super(name);
-	}
-
-
 	protected void checkPositions(Position[] positions) {
 
 		try {
@@ -90,8 +88,8 @@ public class ChildDocumentTest extends TestCase {
 		}
 	}
 
-	@Override
-	protected void setUp() {
+	@Before
+	public void setUp() {
 
 		fParent= new Document();
 
@@ -136,15 +134,12 @@ public class ChildDocumentTest extends TestCase {
 		}
 	}
 
-	public static Test suite() {
-		return new TestSuite(ChildDocumentTest.class);
-	}
-
-	@Override
-	protected void tearDown () {
+	@After
+	public void tearDown () {
 		fDocument= null;
 	}
-
+	
+	@Test
 	public void testDelete1() {
 
 		try {
@@ -167,7 +162,8 @@ public class ChildDocumentTest extends TestCase {
 
 		checkPositions(positions);
 	}
-
+	
+	@Test
 	public void testEditScript1() {
 
 		//	1. step
@@ -203,7 +199,8 @@ public class ChildDocumentTest extends TestCase {
 		checkPositions(positions);
 
 	}
-
+	
+	@Test
 	public void testFindPositions() {
 
 		try {
@@ -243,7 +240,8 @@ public class ChildDocumentTest extends TestCase {
 		checkPositions(positions);
 
 	}
-
+	
+	@Test
 	public void testInsert1() {
 
 		try {
@@ -266,7 +264,8 @@ public class ChildDocumentTest extends TestCase {
 
 		checkPositions(positions);
 	}
-
+	
+	@Test
 	public void testInsert2() {
 
 		try {
@@ -289,7 +288,8 @@ public class ChildDocumentTest extends TestCase {
 
 		checkPositions(positions);
 	}
-
+	
+	@Test
 	public void testInsert3() {
 
 		try {
@@ -312,7 +312,8 @@ public class ChildDocumentTest extends TestCase {
 
 		checkPositions(positions);
 	}
-
+	
+	@Test
 	public void testInsert4() {
 
 		try {
@@ -337,7 +338,8 @@ public class ChildDocumentTest extends TestCase {
 
 		checkPositions(positions);
 	}
-
+	
+	@Test
 	public void testReplace1() {
 
 		try {
@@ -360,7 +362,8 @@ public class ChildDocumentTest extends TestCase {
 
 		checkPositions(positions);
 	}
-
+	
+	@Test
 	public void testReplace2() {
 
 		try {
@@ -383,7 +386,8 @@ public class ChildDocumentTest extends TestCase {
 
 		checkPositions(positions);
 	}
-
+	
+	@Test
 	public void testReplace3() {
 
 		Position[] actual= new Position[] {
@@ -411,7 +415,8 @@ public class ChildDocumentTest extends TestCase {
 	 *
 	 * [formatting] IllegalArgumentException when formatting comment code snippet in segmented mode
 	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=51594
-	 */
+	 */	
+	@Test
 	public void testReplace4() {
 		try {
 			int start= fParent.getLineOffset(5);
@@ -424,7 +429,8 @@ public class ChildDocumentTest extends TestCase {
 			assertTrue("BadLocationException thrown", false);
 		}
 	}
-
+	
+	@Test
 	public void testAppend() {
 
 		Position[] actual= new Position[] {
@@ -449,7 +455,7 @@ public class ChildDocumentTest extends TestCase {
 		checkPositions(expected, actual);
 	}
 
-
+	@Test
 	public void testShiftLeft() {
 
 		try {
@@ -473,7 +479,8 @@ public class ChildDocumentTest extends TestCase {
 
 		checkPositions(positions);
 	}
-
+	
+	@Test
 	public void testShiftRight() {
 
 		try {
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/CopyOnWriteTextStoreTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/CopyOnWriteTextStoreTest.java
index 569dfd9484e..65d6927ec33 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/CopyOnWriteTextStoreTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/CopyOnWriteTextStoreTest.java
@@ -11,9 +11,11 @@
 
 package org.eclipse.text.tests;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import static org.junit.Assert.*;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 import org.eclipse.jface.text.CopyOnWriteTextStore;
 import org.eclipse.jface.text.GapTextStore;
@@ -24,7 +26,7 @@ import org.eclipse.jface.text.ITextStore;
  *
  * @since 3.2
  */
-public class CopyOnWriteTextStoreTest extends TestCase {
+public class CopyOnWriteTextStoreTest {
 
 	private static class COWTextStore extends CopyOnWriteTextStore {
 		COWTextStore() {
@@ -42,28 +44,19 @@ public class CopyOnWriteTextStoreTest extends TestCase {
 
 	private COWTextStore fText;
 
-
-	public CopyOnWriteTextStoreTest(String name) {
-		super(name);
-	}
-
-
-	@Override
-	protected void setUp() {
+	@Before
+	public void setUp() {
 
 		fText= new COWTextStore();
 		fText.set(INITIAL_CONTENT);
 	}
 
-	public static Test suite() {
-		return new TestSuite(CopyOnWriteTextStoreTest.class);
-	}
-
-	@Override
-	protected void tearDown () {
+	@After
+	public void tearDown () {
 		fText= null;
 	}
-
+	
+	@Test
 	public void testInitialContent() {
 
 		assertEquals(INITIAL_CONTENT, fText.get());
@@ -77,14 +70,16 @@ public class CopyOnWriteTextStoreTest extends TestCase {
 		assertTrue(failed);
 
 	}
-
+	
+	@Test
 	public void testFirstModification() {
 
 		checkReplace(1, 1, "y");
 		assertEquals(GapTextStore.class, fText.getStore().getClass());
 
 	}
-
+	
+	@Test
 	public void testSet() {
 
 		fText.replace(1, 1, "y");
@@ -99,7 +94,8 @@ public class CopyOnWriteTextStoreTest extends TestCase {
 		}
 		assertTrue(failed);
 	}
-
+	
+	@Test
 	public void testInsert1() {
 
 		for (int i= 1; i < 5; i++) {
@@ -107,7 +103,8 @@ public class CopyOnWriteTextStoreTest extends TestCase {
 		}
 
 	}
-
+	
+	@Test
 	public void testInsert2() {
 
 		for (int i= 1; i < 5; i++) {
@@ -115,7 +112,8 @@ public class CopyOnWriteTextStoreTest extends TestCase {
 		}
 
 	}
-
+	
+	@Test
 	public void testDelete1() {
 
 		for (int i= 1; i < 5; i++) {
@@ -123,7 +121,8 @@ public class CopyOnWriteTextStoreTest extends TestCase {
 		}
 
 	}
-
+	
+	@Test
 	public void testDelete2() {
 
 		for (int i= 1; i < 5; i++) {
@@ -131,7 +130,8 @@ public class CopyOnWriteTextStoreTest extends TestCase {
 		}
 
 	}
-
+	
+	@Test
 	public void testAppend() {
 
 		for (int i= 1; i < 5; i++) {
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentExtensionTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentExtensionTest.java
index 40126d353fe..ff38127485b 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentExtensionTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentExtensionTest.java
@@ -11,9 +11,13 @@
 package org.eclipse.text.tests;
 
 
+import static org.junit.Assert.assertTrue;
+
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.Test;
+
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.DocumentEvent;
@@ -23,13 +27,7 @@ import org.eclipse.jface.text.IDocumentListener;
 import org.eclipse.jface.text.projection.ChildDocument;
 import org.eclipse.jface.text.projection.ChildDocumentManager;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-
-
-public class DocumentExtensionTest extends TestCase {
+public class DocumentExtensionTest {
 
 
 	static class Listener implements IDocumentListener {
@@ -151,16 +149,7 @@ public class DocumentExtensionTest extends TestCase {
 
 	}
 
-
-	public DocumentExtensionTest(String name) {
-		super(name);
-	}
-
-
-	public static Test suite() {
-		return new TestSuite(DocumentExtensionTest.class);
-	}
-
+	@Test
 	public void testAppend() {
 		Listener listener= new Listener() {
 			@Override
@@ -190,7 +179,8 @@ public class DocumentExtensionTest extends TestCase {
 
 		assertTrue("axbxcx".equals(document.get()));
 	}
-
+	
+	@Test
 	public void testRemove() {
 		Listener listener= new Listener() {
 			@Override
@@ -220,7 +210,8 @@ public class DocumentExtensionTest extends TestCase {
 
 		assertTrue("yyy".equals(document.get()));
 	}
-
+	
+	@Test
 	public void testRepeatedAppend() {
 		Listener listener= new Listener() {
 			@Override
@@ -325,11 +316,13 @@ public class DocumentExtensionTest extends TestCase {
 			assertTrue(false);
 		}
 	}
-
+	
+	@Test
 	public void testChildDocumentPP() {
 		internalTestChildDocument(true, true, 1);
 	}
-
+	
+	@Test
 	public void testChildDocumentCC() {
 		try {
 			internalTestChildDocument(false, false, 1);
@@ -337,11 +330,13 @@ public class DocumentExtensionTest extends TestCase {
 		}
 
 	}
-
+	
+	@Test
 	public void testChildDocumentRepeatedPP() {
 		internalTestChildDocument(true, true, 5);
 	}
-
+	
+	@Test
 	public void testChildDocumentRepeatedCC() {
 		try {
 			internalTestChildDocument(false, false, 5);
@@ -352,6 +347,7 @@ public class DocumentExtensionTest extends TestCase {
 	/**
 	 * Tests that this is not supported.
 	 */
+	@Test
 	public void testChildDocumentPC() {
 		try {
 			internalTestChildDocument(true, false, 1);
@@ -359,14 +355,16 @@ public class DocumentExtensionTest extends TestCase {
 		} catch (UnsupportedOperationException x) {
 		}
 	}
-
+	
+	@Test
 	public void testChildDocumentCP() {
 		internalTestChildDocument(false, true, 1);
 	}
 
 	/**
 	 * Tests that this is not supported.
-	 */
+	 */	
+	@Test
 	public void testChildDocumentRepeatedPC() {
 		try {
 			internalTestChildDocument(true, false, 5);
@@ -374,7 +372,8 @@ public class DocumentExtensionTest extends TestCase {
 		} catch (UnsupportedOperationException x) {
 		}
 	}
-
+	
+	@Test
 	public void testChildDocumentRepeatedCP() {
 		internalTestChildDocument(false, true, 5);
 	}
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentTest.java
index 1bb465913fa..a1901281f35 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentTest.java
@@ -10,9 +10,12 @@
  *******************************************************************************/
 package org.eclipse.text.tests;
 
-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 org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.BadPositionCategoryException;
@@ -21,16 +24,10 @@ import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.Position;
 
 
-public class DocumentTest extends TestCase {
+public class DocumentTest {
 
 	private Document fDocument;
 
-
-	public DocumentTest(String name) {
-		super(name);
-	}
-
-
 	protected void checkPositions(Position[] expected) {
 
 		try {
@@ -54,8 +51,8 @@ public class DocumentTest extends TestCase {
 
 	}
 
-	@Override
-	protected void setUp() {
+	@Before
+	public void setUp() {
 
 		fDocument= new Document();
 
@@ -90,22 +87,19 @@ public class DocumentTest extends TestCase {
 		}
 	}
 
-	public static Test suite() {
-		return new TestSuite(DocumentTest.class);
-	}
-
-	@Override
-	protected void tearDown () {
+	@After
+	public void tearDown () {
 		fDocument= null;
 	}
-
-
+	
+	@Test
 	public void testEmptyDocument() {
 		IDocument document= new Document();
 		int lines= document.getNumberOfLines();
 		assertEquals(1, lines);
 	}
 	
+	@Test
 	public void testDelete1() {
 
 		try {
@@ -129,6 +123,7 @@ public class DocumentTest extends TestCase {
 		checkPositions(positions);
 	}
 
+	@Test
 	public void testEditScript1() {
 
 		//	1. step
@@ -165,6 +160,7 @@ public class DocumentTest extends TestCase {
 
 	}
 
+	@Test
 	public void testFindPositions() {
 
 		try {
@@ -205,6 +201,7 @@ public class DocumentTest extends TestCase {
 
 	}
 
+	@Test
 	public void testInsert1() {
 
 		try {
@@ -228,6 +225,7 @@ public class DocumentTest extends TestCase {
 		checkPositions(positions);
 	}
 
+	@Test
 	public void testInsert2() {
 
 		try {
@@ -250,7 +248,8 @@ public class DocumentTest extends TestCase {
 
 		checkPositions(positions);
 	}
-
+	
+	@Test
 	public void testInsert3() {
 
 		try {
@@ -273,7 +272,8 @@ public class DocumentTest extends TestCase {
 
 		checkPositions(positions);
 	}
-
+	
+	@Test
 	public void testInsert4() {
 
 		try {
@@ -298,7 +298,8 @@ public class DocumentTest extends TestCase {
 
 		checkPositions(positions);
 	}
-
+	
+	@Test
 	public void testReplace1() {
 
 		try {
@@ -321,7 +322,8 @@ public class DocumentTest extends TestCase {
 
 		checkPositions(positions);
 	}
-
+	
+	@Test
 	public void testReplace2() {
 
 		try {
@@ -344,7 +346,8 @@ public class DocumentTest extends TestCase {
 
 		checkPositions(positions);
 	}
-
+	
+	@Test
 	public void testReplace3() {
 
 		Position[] actual= new Position[] {
@@ -366,7 +369,8 @@ public class DocumentTest extends TestCase {
 
 		checkPositions(expected, actual);
 	}
-
+	
+	@Test
 	public void testReplace4() {
 
 		try {
@@ -389,7 +393,8 @@ public class DocumentTest extends TestCase {
 
 		checkPositions(positions);
 	}
-
+	
+	@Test
 	public void testAppend() {
 
 		Position[] actual= new Position[] {
@@ -414,7 +419,7 @@ public class DocumentTest extends TestCase {
 		checkPositions(expected, actual);
 	}
 
-
+	@Test
 	public void testShiftLeft() {
 
 		try {
@@ -438,7 +443,8 @@ public class DocumentTest extends TestCase {
 
 		checkPositions(positions);
 	}
-
+	
+	@Test
 	public void testShiftRight() {
 
 		try {
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/EclipseTextTestSuite.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/EclipseTextTestSuite.java
index 4bd88113087..0e64d4b4120 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/EclipseTextTestSuite.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/EclipseTextTestSuite.java
@@ -11,45 +11,40 @@
  *******************************************************************************/
 package org.eclipse.text.tests;
 
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
 import org.eclipse.text.tests.link.LinkTestSuite;
 import org.eclipse.text.tests.templates.TemplatesTestSuite;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 
 /**
  * Test Suite for org.eclipse.text.
  *
  * @since 3.0
  */
+@RunWith(Suite.class)
+@SuiteClasses({
+	LineTrackerTest4.class,
+	DocumentExtensionTest.class,
+	LineTrackerTest3.class,
+	DocumentTest.class,
+	FindReplaceDocumentAdapterTest.class,
+	PositionUpdatingCornerCasesTest.class,
+	ExclusivePositionUpdaterTest.class,
+	TextEditTests.class,
+	GapTextTest.class,
+	GapTextStoreTest.class,
+	ChildDocumentTest.class,
+	ProjectionTestSuite.class,
+	LinkTestSuite.class,
+	CopyOnWriteTextStoreTest.class,
+	TextUtilitiesTest.class,
+	AnnotationModelStressTest.class,
+	AnnotationModelExtension2Test.class,
+	TemplatesTestSuite.class
+})
 public class EclipseTextTestSuite {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test Suite for org.eclipse.text"); //$NON-NLS-1$
-		//$JUnit-BEGIN$
-		suite.addTest(LineTrackerTest4.suite());
-		suite.addTest(DocumentExtensionTest.suite());
-		suite.addTest(LineTrackerTest3.suite());
-		suite.addTest(DocumentTest.suite());
-		suite.addTest(FindReplaceDocumentAdapterTest.suite());
-		suite.addTest(PositionUpdatingCornerCasesTest.suite());
-		suite.addTest(ExclusivePositionUpdaterTest.suite());
-		suite.addTest(TextEditTests.suite());
-		suite.addTest(GapTextTest.suite());
-		suite.addTest(AdaptiveGapTextTest.suite());
-		suite.addTest(GapTextStoreTest.suite());
-		suite.addTest(ChildDocumentTest.suite());
-		suite.addTest(ProjectionTestSuite.suite());
-		suite.addTest(LinkTestSuite.suite());
-		suite.addTest(CopyOnWriteTextStoreTest.suite());
-		suite.addTest(TextUtilitiesTest.suite());
-		suite.addTest(AnnotationModelStressTest.suite());
-		suite.addTest(AnnotationModelExtension2Test.suite());
-		suite.addTest(new JUnit4TestAdapter(TemplatesTestSuite.class));
-		//$JUnit-END$
-
-		return suite;
-	}
+	//intentionally left blank
 }
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/ExclusivePositionUpdaterTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/ExclusivePositionUpdaterTest.java
index 98121c63640..248ba9972e5 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/ExclusivePositionUpdaterTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/ExclusivePositionUpdaterTest.java
@@ -10,11 +10,10 @@
  *******************************************************************************/
 package org.eclipse.text.tests;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
+import org.junit.After;
 import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.DefaultPositionUpdater;
@@ -27,17 +26,15 @@ import org.eclipse.jface.text.Position;
  * Tests DefaultPositionUpdater. Does NOT test one of the ExclusivePositionUpdaters.
  * @since 3.3
  */
-public class ExclusivePositionUpdaterTest extends TestCase {
-	public static Test suite() {
-		return new TestSuite(ExclusivePositionUpdaterTest.class);
-	}
+public class ExclusivePositionUpdaterTest {
 
 	private IPositionUpdater fUpdater;
 	private static final String CATEGORY= "testcategory";
 	private Position fPos;
 	private IDocument fDoc;
-	@Override
-	protected void setUp() throws Exception {
+	
+	@Before
+	public void setUp() throws Exception {
 		fUpdater= new DefaultPositionUpdater(CATEGORY);
 		fDoc= new Document("ccccccccccccccccccccccccccccccccccccccccccccc");
 		fPos= new Position(5, 5);
@@ -47,14 +44,15 @@ public class ExclusivePositionUpdaterTest extends TestCase {
 		fDoc.addPosition(CATEGORY, fPos);
 	}
 
-	@Override
-	protected void tearDown() throws Exception {
+	@After
+	public void tearDown() throws Exception {
 		fDoc.removePositionUpdater(fUpdater);
 		fDoc.removePositionCategory(CATEGORY);
 	}
 	
 	// Delete, ascending by offset, length:
-
+	
+	@Test
 	public void testDeleteBefore() throws BadLocationException {
 		fDoc.replace(2, 2, "");
 		Assert.assertEquals(3, fPos.offset);
@@ -62,6 +60,7 @@ public class ExclusivePositionUpdaterTest extends TestCase {
 		Assert.assertFalse(fPos.isDeleted);
 	}
 	
+	@Test
 	public void testDeleteRightBefore() throws BadLocationException {
 		fDoc.replace(3, 2, "");
 		Assert.assertEquals(3, fPos.offset);
@@ -69,13 +68,15 @@ public class ExclusivePositionUpdaterTest extends TestCase {
 		Assert.assertFalse(fPos.isDeleted);
 	}
 	
+	@Test
 	public void testDeleteOverLeftBorder() throws BadLocationException {
 		fDoc.replace(3, 6, "");
 		Assert.assertEquals(3, fPos.offset);
 		Assert.assertEquals(1, fPos.length);
 		Assert.assertFalse(fPos.isDeleted);
 	}
-
+	
+	@Test
 	public void testDeleteOverLeftBorderTillRight() throws BadLocationException {
 		fDoc.replace(4, 6, "");
 		Assert.assertEquals(4, fPos.offset);
@@ -83,11 +84,13 @@ public class ExclusivePositionUpdaterTest extends TestCase {
 		Assert.assertFalse(fPos.isDeleted);
 	}
 	
+	@Test
 	public void testDeleted() throws BadLocationException {
 		fDoc.replace(4, 7, "");
 		Assert.assertTrue(fPos.isDeleted);
 	}
 	
+	@Test
 	public void testDeleteAtOffset() throws BadLocationException {
 		fDoc.replace(5, 1, "");
 		Assert.assertEquals(5, fPos.offset);
@@ -95,6 +98,7 @@ public class ExclusivePositionUpdaterTest extends TestCase {
 		Assert.assertFalse(fPos.isDeleted);
 	}
 	
+	@Test
 	public void testDeleteAtOffset2() throws BadLocationException {
 		fDoc.replace(5, 2, "");
 		Assert.assertEquals(5, fPos.offset);
@@ -102,6 +106,7 @@ public class ExclusivePositionUpdaterTest extends TestCase {
 		Assert.assertFalse(fPos.isDeleted);
 	}
 	
+	@Test
 	public void testDeleteAtOffsetTillRight() throws BadLocationException {
 		fDoc.replace(5, 5, "");
 		Assert.assertEquals(5, fPos.offset);
@@ -109,6 +114,7 @@ public class ExclusivePositionUpdaterTest extends TestCase {
 		Assert.assertFalse(fPos.isDeleted);
 	}
 	
+	@Test
 	public void testDeleteAtOffsetOverRightBorder() throws BadLocationException {
 		fDoc.replace(5, 6, "");
 		Assert.assertEquals(5, fPos.offset);
@@ -116,6 +122,7 @@ public class ExclusivePositionUpdaterTest extends TestCase {
 		Assert.assertFalse(fPos.isDeleted);
 	}
 	
+	@Test
 	public void testDeleteWithin() throws BadLocationException {
 		fDoc.replace(6, 2, "");
 		Assert.assertEquals(5, fPos.offset);
@@ -123,6 +130,7 @@ public class ExclusivePositionUpdaterTest extends TestCase {
 		Assert.assertFalse(fPos.isDeleted);
 	}
 	
+	@Test
 	public void testDeleteAtRight() throws BadLocationException {
 		fDoc.replace(8, 2, "");
 		Assert.assertEquals(5, fPos.offset);
@@ -130,6 +138,7 @@ public class ExclusivePositionUpdaterTest extends TestCase {
 		Assert.assertFalse(fPos.isDeleted);
 	}
 	
+	@Test
 	public void testDeleteOverRightBorder() throws BadLocationException {
 		fDoc.replace(9, 2, "");
 		Assert.assertEquals(5, fPos.offset);
@@ -137,6 +146,7 @@ public class ExclusivePositionUpdaterTest extends TestCase {
 		Assert.assertFalse(fPos.isDeleted);
 	}
 	
+	@Test
 	public void testDeleteRightAfter() throws BadLocationException {
 		fDoc.replace(10, 2, "");
 		Assert.assertEquals(5, fPos.offset);
@@ -144,6 +154,7 @@ public class ExclusivePositionUpdaterTest extends TestCase {
 		Assert.assertFalse(fPos.isDeleted);
 	}
 	
+	@Test
 	public void testDeleteAfter() throws BadLocationException {
 		fDoc.replace(20, 2, "");
 		Assert.assertEquals(5, fPos.offset);
@@ -153,36 +164,42 @@ public class ExclusivePositionUpdaterTest extends TestCase {
 
 	// Add, ascending by offset:
 	
+	@Test
 	public void testAddBefore() throws BadLocationException {
 		fDoc.replace(2, 0, "yy");
 		Assert.assertEquals(7, fPos.offset);
 		Assert.assertEquals(5, fPos.length);
 	}
 	
+	@Test
 	public void testAddRightBefore() throws BadLocationException {
 		fDoc.replace(5, 0, "yy");
 		Assert.assertEquals(7, fPos.offset);
 		Assert.assertEquals(5, fPos.length);
 	}
-
+	
+	@Test
 	public void testAddWithin() throws BadLocationException {
 		fDoc.replace(6, 0, "yy");
 		Assert.assertEquals(5, fPos.offset);
 		Assert.assertEquals(7, fPos.length);
 	}
 	
+	@Test
 	public void testAddWithin2() throws BadLocationException {
 		fDoc.replace(9, 0, "yy");
 		Assert.assertEquals(5, fPos.offset);
 		Assert.assertEquals(7, fPos.length);
 	}
 	
+	@Test
 	public void testAddRightAfter() throws BadLocationException {
 		fDoc.replace(10, 0, "yy");
 		Assert.assertEquals(5, fPos.offset);
 		Assert.assertEquals(5, fPos.length);
 	}
 	
+	@Test
 	public void testAddAfter() throws BadLocationException {
 		fDoc.replace(20, 0, "yy");
 		Assert.assertEquals(5, fPos.offset);
@@ -191,35 +208,41 @@ public class ExclusivePositionUpdaterTest extends TestCase {
 
 	// Replace, ascending by offset, length:
 	
+	@Test
 	public void testReplaceBefore() throws BadLocationException {
 		fDoc.replace(2, 2, "y");
 		Assert.assertEquals(4, fPos.offset);
 		Assert.assertEquals(5, fPos.length);
 	}
-
+	
+	@Test
 	public void testReplaceRightBefore() throws BadLocationException {
 		fDoc.replace(2, 3, "y");
 		Assert.assertEquals(3, fPos.offset);
 		Assert.assertEquals(5, fPos.length);
 	}
 	
+	@Test
 	public void testReplaceLeftBorder() throws BadLocationException {
 		fDoc.replace(4, 2, "yy");
 		Assert.assertEquals(6, fPos.offset);
 		Assert.assertEquals(4, fPos.length);
 	}
-
+	
+	@Test
 	public void testReplaceLeftBorderTillRight() throws BadLocationException {
 		fDoc.replace(4, 6, "yy");
 		Assert.assertEquals(6, fPos.offset);
 		Assert.assertEquals(0, fPos.length);
 	}
 	
+	@Test
 	public void testReplaced() throws BadLocationException {
 		fDoc.replace(4, 7, "yyyyyyy");
 		Assert.assertTrue(fPos.isDeleted);
 	}
 	
+	@Test
 	public void testReplaceAtOffset1() throws BadLocationException {
 		fDoc.replace(5, 1, "yy");
 		// 01234[fPo]0123456789
@@ -227,6 +250,7 @@ public class ExclusivePositionUpdaterTest extends TestCase {
 		Assert.assertEquals(6, fPos.length);
 	}
 	
+	@Test
 	public void testReplaceAtOffset2() throws BadLocationException {
 		fDoc.replace(5, 4, "yy");
 		// 01234[fPo]0123456789
@@ -234,6 +258,7 @@ public class ExclusivePositionUpdaterTest extends TestCase {
 		Assert.assertEquals(3, fPos.length);
 	}
 	
+	@Test
 	public void testReplaceAtOffsetTillRight() throws BadLocationException {
 		fDoc.replace(5, 5, "yy");
 		// 01234[fPo]0123456789
@@ -242,24 +267,28 @@ public class ExclusivePositionUpdaterTest extends TestCase {
 		Assert.assertFalse(fPos.isDeleted);
 	}
 	
+	@Test
 	public void testReplaceAtRight() throws BadLocationException {
 		fDoc.replace(6, 4, "yy");
 		Assert.assertEquals(5, fPos.offset);
 		Assert.assertEquals(3, fPos.length);
 	}
 	
+	@Test
 	public void testReplaceRightBorder() throws BadLocationException {
 		fDoc.replace(9, 2, "yy");
 		Assert.assertEquals(5, fPos.offset);
 		Assert.assertEquals(4, fPos.length);
 	}
-
+	
+	@Test
 	public void testReplaceRightAfter() throws BadLocationException {
 		fDoc.replace(10, 2, "y");
 		Assert.assertEquals(5, fPos.offset);
 		Assert.assertEquals(5, fPos.length);
 	}
 	
+	@Test
 	public void testReplaceAfter() throws BadLocationException {
 		fDoc.replace(20, 2, "y");
 		Assert.assertEquals(5, fPos.offset);
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/FindReplaceDocumentAdapterTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/FindReplaceDocumentAdapterTest.java
index d9c4fd5a008..01e6ad5e1e4 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/FindReplaceDocumentAdapterTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/FindReplaceDocumentAdapterTest.java
@@ -12,15 +12,17 @@
  *******************************************************************************/
 package org.eclipse.text.tests;
 
+import static org.junit.Assert.*;
+
 import java.util.Arrays;
 import java.util.Locale;
 import java.util.regex.PatternSyntaxException;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
+import org.junit.After;
 import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
 
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.Document;
@@ -33,20 +35,14 @@ import org.eclipse.jface.text.Region;
  *
  * @since 3.1
  */
-public class FindReplaceDocumentAdapterTest extends TestCase {
+public class FindReplaceDocumentAdapterTest {
 
 	private static final boolean BUG_392594= true;
 	
 	private Document fDocument;
 
-
-	public FindReplaceDocumentAdapterTest(String name) {
-		super(name);
-	}
-
-
-	@Override
-	protected void setUp() {
+	@Before
+	public void setUp() {
 
 		fDocument= new Document();
 
@@ -68,15 +64,12 @@ public class FindReplaceDocumentAdapterTest extends TestCase {
 		fDocument.set(text);
 	}
 
-	public static Test suite() {
-		return new TestSuite(FindReplaceDocumentAdapterTest.class);
-	}
-
-	@Override
-	protected void tearDown () {
+	@After
+	public void tearDown () {
 		fDocument= null;
 	}
-
+	
+	@org.junit.Test
 	public void testFind() {
 		FindReplaceDocumentAdapter findReplaceDocumentAdapter= new FindReplaceDocumentAdapter(fDocument);
 		try {
@@ -98,7 +91,8 @@ public class FindReplaceDocumentAdapterTest extends TestCase {
 			Assert.assertTrue(false);
 		}
 	}
-
+	
+	@Test
 	public void testFindCaretInMiddleOfWord() {
 		FindReplaceDocumentAdapter findReplaceDocumentAdapter= new FindReplaceDocumentAdapter(fDocument);
 		try {
@@ -115,7 +109,8 @@ public class FindReplaceDocumentAdapterTest extends TestCase {
 			Assert.assertTrue(false);
 		}
 	}
-
+	
+	@Test
 	public void testFindCaretAtWordStart() {
 		FindReplaceDocumentAdapter findReplaceDocumentAdapter= new FindReplaceDocumentAdapter(fDocument);
 		try {
@@ -128,7 +123,8 @@ public class FindReplaceDocumentAdapterTest extends TestCase {
 			Assert.assertTrue(false);
 		}
 	}
-
+	
+	@Test
 	public void testFindCaretAtEndStart() {
 		FindReplaceDocumentAdapter findReplaceDocumentAdapter= new FindReplaceDocumentAdapter(fDocument);
 		try {
@@ -144,7 +140,8 @@ public class FindReplaceDocumentAdapterTest extends TestCase {
 
 	/**
 	 * Test case for: https://bugs.eclipse.org/bugs/show_bug.cgi?id=74993
-	 */
+	 */	
+	@Test
 	public void testBug74993() {
 		FindReplaceDocumentAdapter findReplaceDocumentAdapter= new FindReplaceDocumentAdapter(fDocument);
 		try {
@@ -158,7 +155,8 @@ public class FindReplaceDocumentAdapterTest extends TestCase {
 
 	/**
 	 * Test case for: https://bugs.eclipse.org/386751
-	 */
+	 */	
+	@Test
 	public void testBug386751() {
 		FindReplaceDocumentAdapter adapter= new FindReplaceDocumentAdapter(fDocument);
 		try {
@@ -168,7 +166,8 @@ public class FindReplaceDocumentAdapterTest extends TestCase {
 			Assert.assertTrue(false);
 		}
 	}
-
+	
+	@Test
 	public void testUTF8Pattern() {
 		FindReplaceDocumentAdapter findReplaceDocumentAdapter= new FindReplaceDocumentAdapter(fDocument);
 		try {
@@ -190,7 +189,8 @@ public class FindReplaceDocumentAdapterTest extends TestCase {
 			Assert.assertTrue(false);
 		}
 	}
-
+	
+	@Test
 	public void testReplace() {
 		FindReplaceDocumentAdapter findReplaceDocumentAdapter= new FindReplaceDocumentAdapter(fDocument);
 		try {
@@ -234,7 +234,9 @@ public class FindReplaceDocumentAdapterTest extends TestCase {
 			Assert.assertTrue(false);
 		}
 	}
-
+	
+	@Test
+	@Ignore
 	public void _testRegexReplace() throws Exception {
 		fDocument.set(
 				"UnixWindowsMacInferred\n" +
@@ -250,7 +252,8 @@ public class FindReplaceDocumentAdapterTest extends TestCase {
 		String text= "Unix\nWindows\r\nMac\rInferred\n\n\\, \u00F6, \u00F6, \t, \n, \r, \f, \u0007, \u001B, \u0006";
 		assertEquals(text, fDocument.get());
 	}
-
+	
+	@Test
 	public void testRegexReplace2() throws Exception {
 		FindReplaceDocumentAdapter findReplaceDocumentAdapter= new FindReplaceDocumentAdapter(fDocument);
 
@@ -270,7 +273,8 @@ public class FindReplaceDocumentAdapterTest extends TestCase {
 		regexReplace("foo", "$010", findReplaceDocumentAdapter);
 		assertEquals("foo10", fDocument.get());
 	}
-
+	
+	@Test
 	public void testRegexReplace3() throws Exception {
 		FindReplaceDocumentAdapter findReplaceDocumentAdapter= new FindReplaceDocumentAdapter(fDocument);
 
@@ -285,7 +289,8 @@ public class FindReplaceDocumentAdapterTest extends TestCase {
 
 	/*
 	 * @since 3.4
-	 */
+	 */	
+	@Test
 	public void testRegexRetainCase() throws Exception {
 		FindReplaceDocumentAdapter findReplaceDocumentAdapter= new FindReplaceDocumentAdapter(fDocument);
 
@@ -340,7 +345,8 @@ public class FindReplaceDocumentAdapterTest extends TestCase {
 		IRegion r= findReplaceDocumentAdapter.replace(replace, true);
 		assertNotNull(r);
 	}
-
+	
+	@Test
 	public void testRegexFindLinebreak() throws Exception {
 		FindReplaceDocumentAdapter adapter= new FindReplaceDocumentAdapter(fDocument);
 		String contents= "Unix\nWindows\r\nMac\rEnd";
@@ -362,7 +368,8 @@ public class FindReplaceDocumentAdapterTest extends TestCase {
 		region= adapter.find(r + 1, "\\R", true, false, false, true);
 		assertNull(region);
 	}
-
+	
+	@Test
 	public void testRegexFindLinebreak2_fail() throws Exception {
 		FindReplaceDocumentAdapter adapter= new FindReplaceDocumentAdapter(fDocument);
 		String contents= "Unix\n[\\R]\\R\r\n";
@@ -383,7 +390,9 @@ public class FindReplaceDocumentAdapterTest extends TestCase {
 		}
 		fail();
 	}
-
+	
+	@Test
+	@Ignore
 	public void _testRegexFindLinebreak2() throws Exception {
 		FindReplaceDocumentAdapter adapter= new FindReplaceDocumentAdapter(fDocument);
 		String contents= "+[\\R]\\R\r\n";
@@ -400,7 +409,8 @@ public class FindReplaceDocumentAdapterTest extends TestCase {
 		adapter.replace("Win\\1$1", true);
 		assertEquals("+Win\r\n\r\n", fDocument.get());
 	}
-
+	
+	@Test
 	public void testRegexFindLinebreak3() throws Exception {
 		FindReplaceDocumentAdapter adapter= new FindReplaceDocumentAdapter(fDocument);
 		String contents= "One\r\nTwo\r\n\r\nEnd";
@@ -417,7 +427,8 @@ public class FindReplaceDocumentAdapterTest extends TestCase {
 		region= adapter.find(0, "[a-zA-Z]+\\R{2}", true, false, false, true);
 		assertEquals(new Region(two, end - two), region);
 	}
-
+	
+	@Test
 	public void testRegexFindLinebreakIllegal() throws Exception {
 		FindReplaceDocumentAdapter adapter= new FindReplaceDocumentAdapter(fDocument);
 		fDocument.set("\n");
@@ -444,7 +455,8 @@ public class FindReplaceDocumentAdapterTest extends TestCase {
 		}
 		assertNull(region);
 	}
-
+	
+	@Test
 	public void testIllegalState() {
 		FindReplaceDocumentAdapter findReplaceDocumentAdapter= new FindReplaceDocumentAdapter(fDocument);
 		try {
@@ -464,7 +476,8 @@ public class FindReplaceDocumentAdapterTest extends TestCase {
 			Assert.assertTrue(false);
 		}
 	}
-
+	
+	@Test
 	public void testRegexFindStackOverflow_fail() throws Exception {
 		// test for https://bugs.eclipse.org/bugs/show_bug.cgi?id=102699
 		
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/GapTextStoreTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/GapTextStoreTest.java
index d09f5cad1de..578c9c491cf 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/GapTextStoreTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/GapTextStoreTest.java
@@ -10,18 +10,11 @@
  *******************************************************************************/
 package org.eclipse.text.tests;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.eclipse.jface.text.GapTextStore;
 import org.eclipse.jface.text.ITextStore;
 
 public class GapTextStoreTest extends TextStoreTest {
 
-	public static Test suite() {
-		return new TestSuite(GapTextStoreTest.class);
-	}
-
 	@Override
 	protected ITextStore createTextStore() {
 		return new GapTextStore(256, 4096, 0.1f);
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/GapTextTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/GapTextTest.java
index f62f97221be..397260dfa80 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/GapTextTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/GapTextTest.java
@@ -10,33 +10,32 @@
  *******************************************************************************/
 package org.eclipse.text.tests;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 public class GapTextTest extends AbstractGapTextTest {
 	/**
 	 * @deprecated tests the legacy constructor of GapTextStore
 	 */
 	@Deprecated
-	@Override
-	protected void setUp() {
+	@Before
+	public void setUp() {
 		fText= new GapText(5, 10);
 		fText.set("xxxxx");
 	}
 
-	public static Test suite() {
-		return new TestSuite(GapTextTest.class);
-	}
-
-	@Override
-	protected void tearDown () {
+	@After
+	public void tearDown () {
 		fText= null;
 	}
-
+	
+	@Test
 	public void testSet() {
 		assertGap(5, 10);
 	}
-
+	
+	@Test
 	public void testGetText1() {
 		String[] expected= {
 			"xyxxxx",
@@ -52,7 +51,8 @@ public class GapTextTest extends AbstractGapTextTest {
 		}
 
 	}
-
+	
+	@Test
 	public void testGetText2() {
 		String[] expected= {
 			"yxxxxx",
@@ -68,7 +68,8 @@ public class GapTextTest extends AbstractGapTextTest {
 		}
 
 	}
-
+	
+	@Test
 	public void testInsert() {
 		fText.replace(2, 0, "y");
 		assertGap(3, 7);
@@ -82,7 +83,8 @@ public class GapTextTest extends AbstractGapTextTest {
 		fText.replace(7, 0, "y");
 		assertGap(8, 13);
 	}
-
+	
+	@Test
 	public void testRemoveGapOverlapping() {
 		fText.replace(2, 2, null);
 		assertGap(2, 9);
@@ -90,7 +92,8 @@ public class GapTextTest extends AbstractGapTextTest {
 		fText.replace(1, 2, null);
 		assertGap(1, 10);
 	}
-
+	
+	@Test
 	public void testRemoveGapOverlapping2() {
 		fText.replace(0, 0, "aaaaazzzzzyyyyy");
 		assertGap(15, 20);
@@ -101,7 +104,8 @@ public class GapTextTest extends AbstractGapTextTest {
 		assertGap(5, 10);
 		assertContents("aaaaaxxx");
 	}
-
+	
+	@Test
 	public void testRemoveRemoteFromGap() {
 		fText.replace(0, 0, "aaaaazzzzzyyyyy");
 		assertGap(15, 20);
@@ -118,7 +122,8 @@ public class GapTextTest extends AbstractGapTextTest {
 		assertContents("aaaaazzx");
 
 	}
-
+	
+	@Test
 	public void testRemoveAtLeftGapEdge() {
 		fText.replace(4, 0, "xxx");
 		assertGap(7, 9);
@@ -127,7 +132,8 @@ public class GapTextTest extends AbstractGapTextTest {
 		fText.replace(6, 1, null);
 		assertGap(6, 8);
 	}
-
+	
+	@Test
 	public void testRemoveAtRightGapEdge() {
 		fText.replace(4, 0, "xxx");
 		assertGap(7, 9);
@@ -136,7 +142,8 @@ public class GapTextTest extends AbstractGapTextTest {
 		fText.replace(7, 1, null);
 		assertGap(7, 9);
 	}
-
+	
+	@Test
 	public void testReplace() {
 		fText.replace(2, 2, "yy");
 		assertGap(4, 9);
@@ -147,7 +154,8 @@ public class GapTextTest extends AbstractGapTextTest {
 		fText.replace(14, 0, "yyy");
 		assertGap(17, 19);
 	}
-
+	
+	@Test
 	public void testRemoveReallocateBeforeGap() throws Exception {
 	    fText.replace(0, 0, "yyyyyzzzzz");
 	    assertGap(10, 15);
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/LineTrackerTest3.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/LineTrackerTest3.java
index ddf7876c32d..2dd619b74f9 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/LineTrackerTest3.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/LineTrackerTest3.java
@@ -10,8 +10,12 @@
  *******************************************************************************/
 package org.eclipse.text.tests;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
+
+import static org.junit.Assert.*;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.ConfigurableLineTracker;
@@ -20,23 +24,15 @@ import org.eclipse.jface.text.IRegion;
 
 public class LineTrackerTest3 extends AbstractLineTrackerTest {
 
-	public static Test suite() {
-		return new TestSuite(LineTrackerTest3.class);
-	}
-
-	public LineTrackerTest3(String name) {
-		super(name);
-	}
-
-	@Override
-	protected void setUp() {
+	@Before
+	public void setUp() {
 		fText= new GapTextStore();
 		fTracker= new ConfigurableLineTracker(new String[] { "\n" });
 		set("x\nx\nx\nx\nx\n");
 	}
 
-	@Override
-	protected void tearDown() {
+	@After
+	public void tearDown() {
 		fTracker= null;
 		fText= null;
 	}
@@ -48,7 +44,8 @@ public class LineTrackerTest3 extends AbstractLineTrackerTest {
 			offset += (lines[i] + 1);
 		return offset;
 	}
-
+	
+	@Test
 	public void testEditScript1() throws Exception {
 		checkLines(new int[] { 1, 1, 1, 1, 1, 0 });
 
@@ -67,7 +64,8 @@ public class LineTrackerTest3 extends AbstractLineTrackerTest {
 		replace(4, 0, "x");
 		checkLines(new int[] { 3, 1 });
 	}
-
+	
+	@Test
 	public void testEmptyLines() throws Exception {
 		checkLines(new int[] { 1, 1, 1, 1, 1, 0 });
 
@@ -82,7 +80,8 @@ public class LineTrackerTest3 extends AbstractLineTrackerTest {
 			assertTrue("invalid line number " + no + " reported instead of " + i, no == i);
 		}
 	}
-
+	
+	@Test
 	public void testInsert1() throws Exception {
 		checkLines(new int[] { 1, 1, 1, 1, 1, 0 });
 
@@ -98,7 +97,8 @@ public class LineTrackerTest3 extends AbstractLineTrackerTest {
 		replace(13, 0, "y");
 		checkLines(new int[] { 1, 5, 2, 1, 1, 1, 1, 0 });
 	}
-
+	
+	@Test
 	public void testInsert2() throws Exception {
 		checkLines(new int[] { 1, 1, 1, 1, 1, 0 });
 
@@ -108,7 +108,8 @@ public class LineTrackerTest3 extends AbstractLineTrackerTest {
 		replace(9, 0, "y\ny\ny");
 		checkLines(new int[] { 1, 5, 2, 1, 1, 1, 1, 0 });
 	}
-
+	
+	@Test
 	public void testLinesNumbers() throws Exception {
 		checkLines(new int[] { 1, 1, 1, 1, 1, 0 });
 
@@ -124,7 +125,8 @@ public class LineTrackerTest3 extends AbstractLineTrackerTest {
 			offset+= (i + 1);
 		}
 	}
-
+	
+	@Test
 	public void testOffsets() throws Exception {
 		checkLines(new int[] { 1, 1, 1, 1, 1, 0 });
 
@@ -147,7 +149,8 @@ public class LineTrackerTest3 extends AbstractLineTrackerTest {
 			assertTrue("invalid line number " + line + " for position " + i + " should be " + l, l == line);
 		}
 	}
-
+	
+	@Test
 	public void testRemove() throws Exception {
 		checkLines(new int[] { 1, 1, 1, 1, 1, 0 });
 
@@ -163,7 +166,8 @@ public class LineTrackerTest3 extends AbstractLineTrackerTest {
 		replace(0, 3, null);
 		checkLines(new int[] { 0 });
 	}
-
+	
+	@Test
 	public void testReplace() throws Exception {
 		checkLines(new int[] { 1, 1, 1, 1, 1, 0 });
 
@@ -171,7 +175,8 @@ public class LineTrackerTest3 extends AbstractLineTrackerTest {
 
 		checkLines(new int[] { 2, 2, 2, 2, 2, 0 });
 	}
-
+	
+	@Test
 	public void testReplace2() throws Exception {
 		checkLines(new int[] { 1, 1, 1, 1, 1, 0 });
 
@@ -183,7 +188,8 @@ public class LineTrackerTest3 extends AbstractLineTrackerTest {
 
 		checkLines(new int[] { 1, 1, 1, 0 });
 	}
-
+	
+	@Test
 	public void testReplace3() throws Exception {
 		checkLines(new int[] { 1, 1, 1, 1, 1, 0 });
 
@@ -191,7 +197,8 @@ public class LineTrackerTest3 extends AbstractLineTrackerTest {
 
 		checkLines(new int[] { 1, 1, 1, 1, 1, 0 });
 	}
-
+	
+	@Test
 	public void testReplace4() throws Exception {
 		checkLines(new int[] { 1, 1, 1, 1, 1, 0 });
 
@@ -205,7 +212,8 @@ public class LineTrackerTest3 extends AbstractLineTrackerTest {
 			previous= fTracker.getLineInformation(i);
 		}
 	}
-
+	
+	@Test
 	public void testShiftLeft() throws Exception {
 		checkLines(new int[] { 1, 1, 1, 1, 1, 0 });
 
@@ -220,7 +228,8 @@ public class LineTrackerTest3 extends AbstractLineTrackerTest {
 		String txt= fText.get(0, fText.getLength());
 		assertEquals("invalid text", "x\nx\nx\nx\nx\n", txt);
 	}
-
+	
+	@Test
 	public void testShiftRight() throws Exception {
 		checkLines(new int[] { 1, 1, 1, 1, 1, 0 });
 
@@ -234,7 +243,8 @@ public class LineTrackerTest3 extends AbstractLineTrackerTest {
 		String txt= fText.get(0, fText.getLength());
 		assertEquals("invalid text", "\tx\n\tx\n\tx\n\tx\n\tx\n", txt);
 	}
-
+	
+	@Test
 	public void testMultipleNewlines() throws Exception {
 		fText= new GapTextStore();
 		fTracker= new ConfigurableLineTracker(new String[] { "\n" });
@@ -245,7 +255,7 @@ public class LineTrackerTest3 extends AbstractLineTrackerTest {
 		assertTrue(line == 5);
 	}
 
-
+	@Test
 	public void testDeleteEmptyLine() throws Exception {
 		set("x\nx\n\nx\n\n");
 
@@ -255,7 +265,8 @@ public class LineTrackerTest3 extends AbstractLineTrackerTest {
 			fTracker.replace(fTracker.getLineOffset(line), fTracker.getLineLength(line), null);
 
 	}
-
+	
+	@Test
 	public void testDeleteLinesFromEnd() throws Exception {
 		set("x\nx\n\nx\n\n");
 
@@ -265,7 +276,8 @@ public class LineTrackerTest3 extends AbstractLineTrackerTest {
 			fTracker.replace(fTracker.getLineOffset(line), fTracker.getLineLength(line), null);
 
 	}
-
+	
+	@Test
 	public void testDeleteLines() throws Exception {
 		String content= "";
 		for (int i= 0; i < 50; i++) {
@@ -284,7 +296,8 @@ public class LineTrackerTest3 extends AbstractLineTrackerTest {
 				fTracker.replace(fTracker.getLineOffset(line), fTracker.getLineLength(line), null);
 		}
 	}
-
+	
+	@Test
 	public void testSet() throws Exception {
 		String content= "";
 		for (int i= 0; i < 35; i++) {
@@ -300,7 +313,8 @@ public class LineTrackerTest3 extends AbstractLineTrackerTest {
 			content += "\n";
 		}
 	}
-
+	
+	@Test
 	public void testFunnyLastLineCompatibility() throws Exception {
 		/* empty last line */
 		set("x\n");
@@ -362,7 +376,8 @@ public class LineTrackerTest3 extends AbstractLineTrackerTest {
 		}
 
 	}
-
+	
+	@Test
 	public void testNoDelimiterLine() throws Exception {
 	    set("abcef");
 	    checkLines(new int[] { 5 });
@@ -370,7 +385,8 @@ public class LineTrackerTest3 extends AbstractLineTrackerTest {
 	    replace(0, 0, ""); // switch to TreeLineTracker
 	    checkLines(new int[] { 5 });
     }
-
+	
+	@Test
 	public void testFunnyLastLineCompatibility2() throws Exception {
 		/* empty last line */
 		set("x\n");
@@ -434,7 +450,8 @@ public class LineTrackerTest3 extends AbstractLineTrackerTest {
 		}
 
 	}
-
+	
+	@Test
 	public void testNegativeOffset() throws Exception {
 		try {
 			assertEquals(-1, fTracker.getLineNumberOfOffset(-1));
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/LineTrackerTest4.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/LineTrackerTest4.java
index 70bf030e14c..908b5fd3210 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/LineTrackerTest4.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/LineTrackerTest4.java
@@ -10,8 +10,11 @@
  *******************************************************************************/
 package org.eclipse.text.tests;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import static org.junit.Assert.*;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 import org.eclipse.jface.text.ConfigurableLineTracker;
 import org.eclipse.jface.text.GapTextStore;
@@ -19,23 +22,16 @@ import org.eclipse.jface.text.IRegion;
 
 public class LineTrackerTest4 extends AbstractLineTrackerTest {
 
-	public static Test suite() {
-		return new TestSuite(LineTrackerTest4.class);
-	}
-
-	public LineTrackerTest4(String name) {
-		super(name);
-	}
 
-	@Override
-	protected void setUp() {
+	@Before
+	public void setUp() {
 		fText= new GapTextStore();
 		fTracker= new ConfigurableLineTracker(new String[] { "\r\n" });
 		set("x\r\nx\r\nx\r\nx\r\nx\r\n");
 	}
 
-	@Override
-	protected void tearDown() {
+	@After
+	public void tearDown() {
 		fTracker= null;
 		fText= null;
 	}
@@ -48,6 +44,7 @@ public class LineTrackerTest4 extends AbstractLineTrackerTest {
 		return offset;
 	}
 
+	@Test
 	public void testEditScript1() throws Exception {
 		checkLines(new int[] { 1, 1, 1, 1, 1, 0 });
 
@@ -66,7 +63,8 @@ public class LineTrackerTest4 extends AbstractLineTrackerTest {
 		replace(5, 0, "x");
 		checkLines(new int[] { 3, 1 });
 	}
-
+	
+	@Test
 	public void testEmptyLines() throws Exception {
 		checkLines(new int[] { 1, 1, 1, 1, 1, 0 });
 
@@ -82,7 +80,8 @@ public class LineTrackerTest4 extends AbstractLineTrackerTest {
 			assertTrue("invalid line number " + no + " for position " + i + " should be " + l, l == no);
 		}
 	}
-
+	
+	@Test
 	public void testInsert1() throws Exception {
 		checkLines(new int[] { 1, 1, 1, 1, 1, 0 });
 
@@ -98,7 +97,8 @@ public class LineTrackerTest4 extends AbstractLineTrackerTest {
 		replace(17, 0, "y");
 		checkLines(new int[] { 1, 5, 2, 1, 1, 1, 1, 0 });
 	}
-
+	
+	@Test
 	public void testInsert2() throws Exception {
 		checkLines(new int[] { 1, 1, 1, 1, 1, 0 });
 
@@ -108,7 +108,8 @@ public class LineTrackerTest4 extends AbstractLineTrackerTest {
 		replace(11, 0, "y\r\ny\r\ny");
 		checkLines(new int[] { 1, 5, 2, 1, 1, 1, 1, 0 });
 	}
-
+	
+	@Test
 	public void testLinesNumbers() throws Exception {
 		checkLines(new int[] { 1, 1, 1, 1, 1, 0 });
 
@@ -124,7 +125,8 @@ public class LineTrackerTest4 extends AbstractLineTrackerTest {
 			offset+= (i + 2);
 		}
 	}
-
+	
+	@Test
 	public void testOffsets() throws Exception {
 		checkLines(new int[] { 1, 1, 1, 1, 1, 0 });
 
@@ -156,7 +158,8 @@ public class LineTrackerTest4 extends AbstractLineTrackerTest {
 		int length= fTracker.getLineLength(lastLine);
 		assertTrue("invalid last line end offset " + (offset + length - 1), 0 == length);
 	}
-
+	
+	@Test
 	public void testRemove() throws Exception {
 		checkLines(new int[] { 1, 1, 1, 1, 1, 0 });
 
@@ -172,14 +175,16 @@ public class LineTrackerTest4 extends AbstractLineTrackerTest {
 		replace(0, 4, null);
 		checkLines(new int[] { 0 });
 	}
-
+	
+	@Test
 	public void testReplace() throws Exception {
 		checkLines(new int[] { 1, 1, 1, 1, 1, 0 });
 
 		replace(0, fText.getLength(), "\tx\r\n\tx\r\n\tx\r\n\tx\r\n\tx\r\n");
 		checkLines(new int[] { 2, 2, 2, 2, 2, 0 });
 	}
-
+	
+	@Test
 	public void testShiftLeft() throws Exception {
 		checkLines(new int[] { 1, 1, 1, 1, 1, 0 });
 
@@ -194,7 +199,8 @@ public class LineTrackerTest4 extends AbstractLineTrackerTest {
 		String txt= fText.get(0, fText.getLength());
 		assertEquals("invalid text", "x\r\nx\r\nx\r\nx\r\nx\r\n", txt);
 	}
-
+	
+	@Test
 	public void testShiftRight() throws Exception {
 		checkLines(new int[] { 1, 1, 1, 1, 1, 0 });
 
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/PositionUpdatingCornerCasesTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/PositionUpdatingCornerCasesTest.java
index 8123d6a3c67..9da417e7650 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/PositionUpdatingCornerCasesTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/PositionUpdatingCornerCasesTest.java
@@ -10,9 +10,11 @@
  *******************************************************************************/
 package org.eclipse.text.tests;
 
-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 org.junit.After;
+import org.junit.Test;
 
 import org.eclipse.jface.text.BadPositionCategoryException;
 import org.eclipse.jface.text.Document;
@@ -21,13 +23,9 @@ import org.eclipse.jface.text.Position;
 
 
 
-public class PositionUpdatingCornerCasesTest extends TestCase {
+public class PositionUpdatingCornerCasesTest {
 	private Document fDocument;
 
-	public PositionUpdatingCornerCasesTest(String name) {
-		super(name);
-	}
-
 	protected void checkPositions(Position[] expected) throws BadPositionCategoryException {
 		Position[] actual= fDocument.getPositions(IDocument.DEFAULT_CATEGORY);
 		assertTrue("invalid number of positions", actual.length == expected.length);
@@ -41,15 +39,12 @@ public class PositionUpdatingCornerCasesTest extends TestCase {
 		return "[" + p.getOffset() + "," + p.getLength() + "]";
 	}
 
-	public static Test suite() {
-		return new TestSuite(PositionUpdatingCornerCasesTest.class);
-	}
-
-	@Override
-	protected void tearDown() {
+	@After
+	public void tearDown() {
 		fDocument= null;
 	}
 
+	@Test
 	public void testInsert() throws Exception {
 		fDocument= new Document("x-x-x-x-x-x-x-x-x-x-x");
 		fDocument.addPosition(new Position(0, 0));
@@ -69,6 +64,7 @@ public class PositionUpdatingCornerCasesTest extends TestCase {
 		checkPositions(positions);
 	}
 	
+	@Test
 	public void testInsert2() throws Exception {
 		fDocument= new Document("x-x-x-x-x-x-x-x-x-x-x");
 		fDocument.addPosition(new Position(0, 0));
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/TextEditTests.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/TextEditTests.java
index 16176538ce0..c2142e11788 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/TextEditTests.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/TextEditTests.java
@@ -10,11 +10,19 @@
  *******************************************************************************/
 package org.eclipse.text.tests;
 
+import static org.junit.Assert.*;
+
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 
+import org.junit.After;
+import org.junit.Assert;
+
+import org.junit.Before;
+import org.junit.Test;
+
 import org.eclipse.text.edits.CopySourceEdit;
 import org.eclipse.text.edits.CopyTargetEdit;
 import org.eclipse.text.edits.DeleteEdit;
@@ -34,53 +42,38 @@ import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class TextEditTests extends TestCase {
-
-	private static final Class<TextEditTests> THIS= TextEditTests.class;
+public class TextEditTests {
 
 	private IDocument fDocument;
 	private MultiTextEdit fRoot;
 
-	public TextEditTests(String name) {
-		super(name);
-	}
-
-	public static Test allTests() {
-		return new TestSuite(THIS);
-	}
-
-	public static Test suite() {
-		return new TestSuite(THIS);
-	}
-
-	@Override
-	protected void setUp() throws Exception {
+	@Before
+	public void setUp() {
 		fDocument= new Document("0123456789");
 		fRoot= new MultiTextEdit();
 	}
 
-	@Override
-	protected void tearDown() throws Exception {
+	@After
+	public void tearDown() {
 		fRoot= null;
 		fRoot= null;
 	}
-
+	
+	@Test
 	public void testCovers1() throws Exception {
 		InsertEdit insert= new InsertEdit(1, "");
 		DeleteEdit delete= new DeleteEdit(2, 2);
-		assertEquals(false, insert.covers(delete));
+		Assert.assertEquals(false, insert.covers(delete));
 	}
-
+	
+	@Test
 	public void testCovers2() throws Exception {
 		MultiTextEdit multi= new MultiTextEdit(0,0);
 		MultiTextEdit child= new MultiTextEdit(0,0);
-		assertEquals(true, multi.covers(child));
+		Assert.assertEquals(true, multi.covers(child));
 	}
-
+	
+	@Test
 	public void testOverlap1() throws Exception {
 		// [ [ ] ]
 		fRoot.addChild(new ReplaceEdit(0, 2, "01"));
@@ -92,7 +85,8 @@ public class TextEditTests extends TestCase {
 		}
 		assertTrue(exception);
 	}
-
+	
+	@Test
 	public void testOverlap2() throws Exception {
 		// [[ ] ]
 		fRoot.addChild(new ReplaceEdit(0, 2, "01"));
@@ -104,7 +98,8 @@ public class TextEditTests extends TestCase {
 		}
 		assertTrue(exception);
 	}
-
+	
+	@Test
 	public void testOverlap3() throws Exception {
 		// [ [ ]]
 		fRoot.addChild(new ReplaceEdit(0, 2, "01"));
@@ -116,7 +111,8 @@ public class TextEditTests extends TestCase {
 		}
 		assertTrue(exception);
 	}
-
+	
+	@Test
 	public void testOverlap4() throws Exception {
 		// [ [ ] ]
 		fRoot.addChild(new ReplaceEdit(0, 3, "012"));
@@ -128,7 +124,8 @@ public class TextEditTests extends TestCase {
 		}
 		assertTrue(exception);
 	}
-
+	
+	@Test
 	public void testOverlap5() throws Exception {
 		// [ []  ]
 		fRoot.addChild(new ReplaceEdit(0, 3, "012"));
@@ -140,7 +137,8 @@ public class TextEditTests extends TestCase {
 		}
 		assertTrue(exception);
 	}
-
+	
+	@Test
 	public void testOverlap6() throws Exception {
 		// [  [] ]
 		fRoot.addChild(new ReplaceEdit(0, 3, "012"));
@@ -152,7 +150,8 @@ public class TextEditTests extends TestCase {
 		}
 		assertTrue(exception);
 	}
-
+	
+	@Test
 	public void testOverlap7() throws Exception {
 		MoveSourceEdit source= new MoveSourceEdit(2, 5);
 		MoveTargetEdit target= new MoveTargetEdit(3, source);
@@ -165,7 +164,8 @@ public class TextEditTests extends TestCase {
 		}
 		assertTrue(exception);
 	}
-
+	
+	@Test
 	public void testOverlap8() throws Exception {
 		MoveSourceEdit source= new MoveSourceEdit(2, 5);
 		MoveTargetEdit target= new MoveTargetEdit(6, source);
@@ -178,7 +178,8 @@ public class TextEditTests extends TestCase {
 		}
 		assertTrue(exception);
 	}
-
+	
+	@Test
 	public void testOverlap9() throws Exception {
 		MoveSourceEdit s1= new MoveSourceEdit(3, 1);
 		MoveTargetEdit t1= new MoveTargetEdit(7, s1);
@@ -195,7 +196,8 @@ public class TextEditTests extends TestCase {
 		}
 		assertTrue(exception);
 	}
-
+	
+	@Test
 	public void testUndefinedMultiEdit1() throws Exception {
 		MultiTextEdit m1= new MultiTextEdit();
 		m1.addChild(new InsertEdit(0,""));
@@ -205,45 +207,51 @@ public class TextEditTests extends TestCase {
 		m2.addChild(new InsertEdit(2, ""));
 		fRoot.addChild(m2);
 	}
-
+	
+	@Test
 	public void testUndefinedMultiEdit2() throws Exception {
 		MultiTextEdit m1= new MultiTextEdit();
 		MultiTextEdit m2= new MultiTextEdit();
 		assertTrue(m1.covers(m2));
 		assertTrue(m2.covers(m1));
 	}
-
+	
+	@Test
 	public void testUndefinedMultiEdit3() throws Exception {
 		MultiTextEdit m2= new MultiTextEdit();
-		assertEquals(0, m2.getOffset());
-		assertEquals(0, m2.getLength());
+		Assert.assertEquals(0, m2.getOffset());
+		Assert.assertEquals(0, m2.getLength());
 		m2.addChild(new DeleteEdit(1,3));
-		assertEquals(1, m2.getOffset());
-		assertEquals(3, m2.getLength());
+		Assert.assertEquals(1, m2.getOffset());
+		Assert.assertEquals(3, m2.getLength());
 	}
-
+	
+	@Test
 	public void testUndefinedMultiEdit4() throws Exception {
 		MultiTextEdit m2= new MultiTextEdit();
 		m2.addChild(new DeleteEdit(1,3));
 		m2.addChild(new DeleteEdit(4, 2));
-		assertEquals(1, m2.getOffset());
-		assertEquals(5, m2.getLength());
+		Assert.assertEquals(1, m2.getOffset());
+		Assert.assertEquals(5, m2.getLength());
 	}
-
+	
+	@Test
 	public void testUndefinedMultiEdit5() throws Exception {
 		MultiTextEdit m2= new MultiTextEdit();
 		m2.addChild(new DeleteEdit(4, 2));
 		m2.addChild(new DeleteEdit(1,3));
-		assertEquals(1, m2.getOffset());
-		assertEquals(5, m2.getLength());
+		Assert.assertEquals(1, m2.getOffset());
+		Assert.assertEquals(5, m2.getLength());
 	}
-
+	
+	@Test
 	public void testUndefinedMultiEdit6() throws Exception {
 		DeleteEdit d1= new DeleteEdit(1,3);
 		MultiTextEdit m2= new MultiTextEdit();
 		assertTrue(d1.covers(m2));
 	}
-
+	
+	@Test
 	public void testUnconnected1() throws Exception {
 		MoveSourceEdit s1= new MoveSourceEdit(3, 1);
 		boolean exception= false;
@@ -255,7 +263,8 @@ public class TextEditTests extends TestCase {
 		}
 		assertTrue(exception);
 	}
-
+	
+	@Test
 	public void testBufferLength() throws Exception {
 		MultiTextEdit edit= new MultiTextEdit(0, fDocument.getLength() + 1);
 		boolean exception= false;
@@ -267,7 +276,8 @@ public class TextEditTests extends TestCase {
 			assertTrue(exception);
 		}
 	}
-
+	
+	@Test
 	public void testCopy1() throws Exception {
 		MultiTextEdit root= new MultiTextEdit();
 		TextEdit e1= new InsertEdit(2, "yy");
@@ -279,7 +289,8 @@ public class TextEditTests extends TestCase {
 		List<TextEdit> copy= flatten(copier.perform());
 		compare(org, copy);
 	}
-
+	
+	@Test
 	public void testCopy2() throws Exception {
 		MultiTextEdit root= new MultiTextEdit();
 		CopySourceEdit s1= new CopySourceEdit(5, 2);
@@ -334,7 +345,8 @@ public class TextEditTests extends TestCase {
 			}
 		}
 	}
-
+	
+	@Test
 	public void testInsert1() throws Exception {
 		// [][  ]
 		TextEdit e1= new InsertEdit(2, "yy");
@@ -345,10 +357,11 @@ public class TextEditTests extends TestCase {
 		assertEquals(fRoot, 2, 6);
 		assertEquals(e1, 2, 2);
 		assertEquals(e2, 4, 4);
-		assertEquals("Buffer content", "01yy345656789", fDocument.get());
+		Assert.assertEquals("Buffer content", "01yy345656789", fDocument.get());
 		doUndoRedo(undo, "01yy345656789");
 	}
-
+	
+	@Test
 	public void testInsert2() throws Exception {
 		// [][]
 		TextEdit e1= new InsertEdit(2, "yy");
@@ -359,10 +372,11 @@ public class TextEditTests extends TestCase {
 		assertEquals(fRoot, 2, 4);
 		assertEquals(e1, 2, 2);
 		assertEquals(e2, 4, 2);
-		assertEquals("Buffer content", "01yyxx23456789", fDocument.get());
+		Assert.assertEquals("Buffer content", "01yyxx23456789", fDocument.get());
 		doUndoRedo(undo, "01yyxx23456789");
 	}
-
+	
+	@Test
 	public void testInsert3() throws Exception {
 		// [  ][][  ]
 		TextEdit e1= new ReplaceEdit(0, 2, "011");
@@ -376,32 +390,35 @@ public class TextEditTests extends TestCase {
 		assertEquals(e1, 0, 3);
 		assertEquals(e2, 3, 2);
 		assertEquals(e3, 5, 1);
-		assertEquals("Buffer content", "011xx2456789", fDocument.get());
+		Assert.assertEquals("Buffer content", "011xx2456789", fDocument.get());
 		doUndoRedo(undo, "011xx2456789");
 	}
-
+	
+	@Test
 	public void testInsert4() throws Exception {
 		TextEdit e1= new InsertEdit(0, "xx");
 		fRoot.addChild(e1);
 		UndoEdit undo= fRoot.apply(fDocument);
-		assertEquals("Buffer length", 12, fDocument.getLength());
+		Assert.assertEquals("Buffer length", 12, fDocument.getLength());
 		assertEquals(fRoot, 0, 2);
 		assertEquals(e1, 0, 2);
-		assertEquals("Buffer content", "xx0123456789", fDocument.get());
+		Assert.assertEquals("Buffer content", "xx0123456789", fDocument.get());
 		doUndoRedo(undo, "xx0123456789");
 	}
-
+	
+	@Test
 	public void testInsert5() throws Exception {
 		TextEdit e1= new InsertEdit(10, "xx");
 		fRoot.addChild(e1);
 		UndoEdit undo= fRoot.apply(fDocument);
-		assertEquals("Buffer length", 12, fDocument.getLength());
+		Assert.assertEquals("Buffer length", 12, fDocument.getLength());
 		assertEquals(fRoot, 10, 2);
 		assertEquals(e1, 10, 2);
-		assertEquals("Buffer content", "0123456789xx", fDocument.get());
+		Assert.assertEquals("Buffer content", "0123456789xx", fDocument.get());
 		doUndoRedo(undo, "0123456789xx");
 	}
-
+	
+	@Test
 	public void testInsertReplace1() throws Exception {
 		TextEdit e1= new ReplaceEdit(2, 1, "y");
 		TextEdit e2= new InsertEdit(2, "xx");
@@ -411,20 +428,22 @@ public class TextEditTests extends TestCase {
 		assertEquals(fRoot, 2, 3);
 		assertEquals(e1, 4, 1);
 		assertEquals(e2, 2, 2);
-		assertEquals("Buffer content", "01xxy3456789", fDocument.get());
+		Assert.assertEquals("Buffer content", "01xxy3456789", fDocument.get());
 		doUndoRedo(undo, "01xxy3456789");
 	}
-
+	
+	@Test
 	public void testDelete1() throws Exception {
 		TextEdit e1= new DeleteEdit(3, 1);
 		fRoot.addChild(e1);
 		UndoEdit undo= fRoot.apply(fDocument);
 		assertEquals(fRoot, 3, 0);
 		assertEquals(e1, 3, 0);
-		assertEquals("Buffer content", "012456789", fDocument.get());
+		Assert.assertEquals("Buffer content", "012456789", fDocument.get());
 		doUndoRedo(undo, "012456789");
 	}
-
+	
+	@Test
 	public void testDelete2() throws Exception {
 		TextEdit e1= new DeleteEdit(4, 1);
 		TextEdit e2= new DeleteEdit(3, 1);
@@ -437,10 +456,11 @@ public class TextEditTests extends TestCase {
 		assertEquals(e1, 3, 0);
 		assertEquals(e2, 3, 0);
 		assertEquals(e3, 3, 0);
-		assertEquals("Buffer content", "0126789", fDocument.get());
+		Assert.assertEquals("Buffer content", "0126789", fDocument.get());
 		doUndoRedo(undo, "0126789");
 	}
-
+	
+	@Test
 	public void testDelete3() throws Exception {
 		TextEdit e1= new InsertEdit(3, "x");
 		TextEdit e2= new DeleteEdit(3, 1);
@@ -450,10 +470,11 @@ public class TextEditTests extends TestCase {
 		assertEquals(fRoot, 3, 1);
 		assertEquals(e1, 3, 1);
 		assertEquals(e2, 4, 0);
-		assertEquals("Buffer content", "012x456789", fDocument.get());
+		Assert.assertEquals("Buffer content", "012x456789", fDocument.get());
 		doUndoRedo(undo, "012x456789");
 	}
-
+	
+	@Test
 	public void testDeleteWithChildren() throws Exception {
 		TextEdit e1= new DeleteEdit(2, 6);
 		MultiTextEdit e2= new MultiTextEdit(3, 3);
@@ -464,7 +485,7 @@ public class TextEditTests extends TestCase {
 		e2.addChild(e4);
 		fRoot.addChild(e1);
 		UndoEdit undo= fRoot.apply(fDocument);
-		assertEquals("Buffer content", "0189", fDocument.get());
+		Assert.assertEquals("Buffer content", "0189", fDocument.get());
 		assertEquals(fRoot, 2, 0);
 		assertEquals(e1, 2, 0);
 		assertTrue(e2.isDeleted());
@@ -472,7 +493,8 @@ public class TextEditTests extends TestCase {
 		assertTrue(e4.isDeleted());
 		doUndoRedo(undo, "0189");
 	}
-
+	
+	@Test
 	public void testTreeUpdate1() throws Exception {
 		MultiTextEdit m1= new MultiTextEdit();
 		TextEdit e1= new InsertEdit(2, "aa");
@@ -489,7 +511,7 @@ public class TextEditTests extends TestCase {
 		assertEquals(m1, 2, 2);
 		assertEquals(m2, 6, 2);
 		UndoEdit undo= fRoot.apply(fDocument);
-		assertEquals("Buffer content", "01aa23bb45cc67dd89", fDocument.get());
+		Assert.assertEquals("Buffer content", "01aa23bb45cc67dd89", fDocument.get());
 		assertEquals(e1, 2, 2);
 		assertEquals(e2, 6, 2);
 		assertEquals(e3, 10, 2);
@@ -499,48 +521,34 @@ public class TextEditTests extends TestCase {
 		assertEquals(fRoot, 2, 14);
 		doUndoRedo(undo, "01aa23bb45cc67dd89");
 	}
-
-	/* Disabled due to a problem with this check in AST rewrite
-	public void testDifferentTree1() throws Exception {
-		MultiTextEdit root2= new MultiTextEdit();
-		MoveSourceEdit s1= new MoveSourceEdit(2, 2);
-		MoveTargetEdit t1= new MoveTargetEdit(5, s1);
-		fRoot.addChild(s1);
-		root2.addChild(t1);
-		boolean exception= false;
-		try {
-			fRoot.apply(fDocument);
-		} catch (MalformedTreeException e) {
-			exception= true;
-		}
-		assertTrue(exception);
-	}
-	*/
-
+	
+	@Test
 	public void testMove1() throws Exception {
 		MoveSourceEdit s1= new MoveSourceEdit(2, 2);
 		MoveTargetEdit t1= new MoveTargetEdit(5, s1);
 		fRoot.addChild(s1);
 		fRoot.addChild(t1);
 		UndoEdit undo= fRoot.apply(fDocument);
-		assertEquals("Buffer content", "0142356789", fDocument.get());
+		Assert.assertEquals("Buffer content", "0142356789", fDocument.get());
 		assertEquals(s1, 2, 0);
 		assertEquals(t1, 3, 2);
 		doUndoRedo(undo, "0142356789");
 	}
-
+	
+	@Test
 	public void testMove2() throws Exception {
 		MoveSourceEdit s1= new MoveSourceEdit(5, 2);
 		MoveTargetEdit t1= new MoveTargetEdit(2, s1);
 		fRoot.addChild(s1);
 		fRoot.addChild(t1);
 		UndoEdit undo= fRoot.apply(fDocument);
-		assertEquals("Buffer content", "0156234789", fDocument.get());
+		Assert.assertEquals("Buffer content", "0156234789", fDocument.get());
 		assertEquals(s1, 7, 0);
 		assertEquals(t1, 2, 2);
 		doUndoRedo(undo, "0156234789");
 	}
-
+	
+	@Test
 	public void testMove3() throws Exception {
 		MoveSourceEdit s1= new MoveSourceEdit(2, 2);
 		MoveTargetEdit t1= new MoveTargetEdit(7, s1);
@@ -549,13 +557,14 @@ public class TextEditTests extends TestCase {
 		fRoot.addChild(t1);
 		fRoot.addChild(e2);
 		UndoEdit undo= fRoot.apply(fDocument);
-		assertEquals("Buffer content", "01x5623789", fDocument.get());
+		Assert.assertEquals("Buffer content", "01x5623789", fDocument.get());
 		assertEquals(s1, 2, 0);
 		assertEquals(t1, 5, 2);
 		assertEquals(e2, 2, 1);
 		doUndoRedo(undo, "01x5623789");
 	}
-
+	
+	@Test
 	public void testMove4() throws Exception {
 		MoveSourceEdit s1= new MoveSourceEdit(7, 2);
 		MoveTargetEdit t1= new MoveTargetEdit(2, s1);
@@ -564,13 +573,14 @@ public class TextEditTests extends TestCase {
 		fRoot.addChild(t1);
 		fRoot.addChild(e2);
 		UndoEdit undo= fRoot.apply(fDocument);
-		assertEquals("Buffer content", "0178234x69", fDocument.get());
+		Assert.assertEquals("Buffer content", "0178234x69", fDocument.get());
 		assertEquals(s1, 9, 0);
 		assertEquals(t1, 2, 2);
 		assertEquals(e2, 7, 1);
 		doUndoRedo(undo, "0178234x69");
 	}
-
+	
+	@Test
 	public void testMove5() throws Exception {
 		// Move onto itself
 		MoveSourceEdit s1= new MoveSourceEdit(2, 1);
@@ -583,10 +593,11 @@ public class TextEditTests extends TestCase {
 		assertEquals(s1, 2, 0);
 		assertEquals(t1, 2, 1);
 		assertEquals(e2, 2, 1);
-		assertEquals("Buffer content", "01x3456789", fDocument.get());
+		Assert.assertEquals("Buffer content", "01x3456789", fDocument.get());
 		doUndoRedo(undo, "01x3456789");
 	}
-
+	
+	@Test
 	public void testMove6() throws Exception {
 		// Move onto itself
 		MoveSourceEdit s1= new MoveSourceEdit(2, 1);
@@ -599,10 +610,11 @@ public class TextEditTests extends TestCase {
 		assertEquals(s1, 3, 0);
 		assertEquals(t1, 2, 1);
 		assertEquals(e2, 2, 1);
-		assertEquals("Buffer content", "01x3456789", fDocument.get());
+		Assert.assertEquals("Buffer content", "01x3456789", fDocument.get());
 		doUndoRedo(undo,"01x3456789");
 	}
-
+	
+	@Test
 	public void testMove7() throws Exception {
 		MoveSourceEdit s1= new MoveSourceEdit(2, 3);
 		MoveTargetEdit t1= new MoveTargetEdit(7, s1);
@@ -611,13 +623,14 @@ public class TextEditTests extends TestCase {
 		fRoot.addChild(s1);
 		fRoot.addChild(t1);
 		UndoEdit undo= fRoot.apply(fDocument);
-		assertEquals("Buffer content", "01562x4789", fDocument.get());
+		Assert.assertEquals("Buffer content", "01562x4789", fDocument.get());
 		assertEquals(s1, 2, 0);
 		assertEquals(t1, 4, 3);
 		assertEquals(e2, 5, 1);
 		doUndoRedo(undo, "01562x4789");
 	}
-
+	
+	@Test
 	public void testMove8() throws Exception {
 		MoveSourceEdit s1= new MoveSourceEdit(5, 3);
 		MoveTargetEdit t1= new MoveTargetEdit(1, s1);
@@ -626,13 +639,14 @@ public class TextEditTests extends TestCase {
 		fRoot.addChild(s1);
 		fRoot.addChild(t1);
 		UndoEdit undo= fRoot.apply(fDocument);
-		assertEquals("Buffer content", "05x7123489", fDocument.get());
+		Assert.assertEquals("Buffer content", "05x7123489", fDocument.get());
 		assertEquals(s1, 8, 0);
 		assertEquals(t1, 1, 3);
 		assertEquals(e2, 2, 1);
 		doUndoRedo(undo, "05x7123489");
 	}
-
+	
+	@Test
 	public void testMove9() throws Exception {
 		MoveSourceEdit s1= new MoveSourceEdit(1, 3);
 		MoveTargetEdit t1= new MoveTargetEdit(5, s1);
@@ -650,10 +664,11 @@ public class TextEditTests extends TestCase {
 
 		assertEquals(s2, 2, 0);
 		assertEquals(t2, 3, 1);
-		assertEquals("Buffer content", "0421356789", fDocument.get());
+		Assert.assertEquals("Buffer content", "0421356789", fDocument.get());
 		doUndoRedo(undo, "0421356789");
 	}
-
+	
+	@Test
 	public void testMove10() throws Exception {
 		MoveSourceEdit s1= new MoveSourceEdit(2, 2);
 		MoveTargetEdit t1= new MoveTargetEdit(8, s1);
@@ -670,10 +685,11 @@ public class TextEditTests extends TestCase {
 		assertEquals(t1, 6, 2);
 		assertEquals(s2, 5, 0);
 		assertEquals(t2, 1, 2);
-		assertEquals("Buffer content", "0561472389", fDocument.get());
+		Assert.assertEquals("Buffer content", "0561472389", fDocument.get());
 		doUndoRedo(undo, "0561472389");
 	}
-
+	
+	@Test
 	public void testMoveWithRangeMarker() throws Exception {
 		MoveSourceEdit s1= new MoveSourceEdit(2, 2);
 		MoveTargetEdit t1= new MoveTargetEdit(5, s1);
@@ -685,13 +701,14 @@ public class TextEditTests extends TestCase {
 		fRoot.addChild(t1);
 
 		UndoEdit undo= fRoot.apply(fDocument);
-		assertEquals("Buffer content", "0142356789", fDocument.get());
+		Assert.assertEquals("Buffer content", "0142356789", fDocument.get());
 		assertEquals(s1, 2, 0);
 		assertEquals(t1, 3, 2);
 		assertEquals(marker, 3, 2);
 		doUndoRedo(undo, "0142356789");
 	}
-
+	
+	@Test
 	public void testMoveWithTargetDelete() throws Exception {
 		MoveSourceEdit s1= new MoveSourceEdit(2, 3);
 		MoveTargetEdit t1= new MoveTargetEdit(7, s1);
@@ -700,13 +717,14 @@ public class TextEditTests extends TestCase {
 		fRoot.addChild(s1);
 		fRoot.addChild(e2);
 		UndoEdit undo= fRoot.apply(fDocument);
-		assertEquals("Buffer content", "01589", fDocument.get());
+		Assert.assertEquals("Buffer content", "01589", fDocument.get());
 		assertEquals(s1, 2, 0);
 		assertTrue(t1.isDeleted());
 		assertEquals(e2, 3, 0);
 		doUndoRedo(undo, "01589");
 	}
-
+	
+	@Test
 	public void testMoveUpWithSourceDelete() throws Exception {
 		MoveSourceEdit s1= new MoveSourceEdit(5, 2);
 		MoveTargetEdit t1= new MoveTargetEdit(2, s1);
@@ -721,14 +739,15 @@ public class TextEditTests extends TestCase {
 		fRoot.addChild(t1);
 
 		UndoEdit undo= fRoot.apply(fDocument);
-		assertEquals("Buffer content", "0156234789", fDocument.get());
+		Assert.assertEquals("Buffer content", "0156234789", fDocument.get());
 		assertEquals(t1, 2, 2);
 		assertEquals(marker, 2, 2);
 		assertTrue(s1.isDeleted());
 		assertEquals(d1, 7, 0);
 		doUndoRedo(undo, "0156234789");
 	}
-
+	
+	@Test
 	public void testMoveDown() throws Exception {
 		MoveSourceEdit s1= new MoveSourceEdit(2, 2);
 		TextEdit i1= new InsertEdit(5, "x");
@@ -744,7 +763,7 @@ public class TextEditTests extends TestCase {
 		fRoot.addChild(d1);
 
 		UndoEdit undo= fRoot.apply(fDocument);
-		assertEquals("Buffer content", "014x562378", fDocument.get());
+		Assert.assertEquals("Buffer content", "014x562378", fDocument.get());
 		assertEquals(s1, 2, 0);
 		assertEquals(i1, 3, 1);
 		assertEquals(t1, 6, 2);
@@ -752,7 +771,8 @@ public class TextEditTests extends TestCase {
 		assertEquals(d1, 10, 0);
 		doUndoRedo(undo, "014x562378");
 	}
-
+	
+	@Test
 	public void testMoveUp() throws Exception {
 		MoveSourceEdit s1= new MoveSourceEdit(7, 2);
 		MoveTargetEdit t1= new MoveTargetEdit(2, s1);
@@ -768,7 +788,7 @@ public class TextEditTests extends TestCase {
 		fRoot.addChild(d1);
 
 		UndoEdit undo= fRoot.apply(fDocument);
-		assertEquals("Buffer content", "0178234x56", fDocument.get());
+		Assert.assertEquals("Buffer content", "0178234x56", fDocument.get());
 		assertEquals(s1, 10, 0);
 		assertEquals(i1, 7, 1);
 		assertEquals(t1, 2, 2);
@@ -776,7 +796,8 @@ public class TextEditTests extends TestCase {
 		assertEquals(d1, 10, 0);
 		doUndoRedo(undo, "0178234x56");
 	}
-
+	
+	@Test
 	public void testMoveDownWithSourceDelete() throws Exception {
 		MoveSourceEdit s1= new MoveSourceEdit(2, 2);
 		MoveTargetEdit t1= new MoveTargetEdit(7, s1);
@@ -791,14 +812,15 @@ public class TextEditTests extends TestCase {
 		fRoot.addChild(d1);
 
 		UndoEdit undo= fRoot.apply(fDocument);
-		assertEquals("Buffer content", "0145623789", fDocument.get());
+		Assert.assertEquals("Buffer content", "0145623789", fDocument.get());
 		assertEquals(d1, 2, 0);
 		assertTrue(s1.isDeleted());
 		assertEquals(t1, 5, 2);
 		assertEquals(m1, 5, 2);
 		doUndoRedo(undo, "0145623789");
 	}
-
+	
+	@Test
 	public void testMoveUpWithInnerMark() throws Exception {
 		MoveSourceEdit s1= new MoveSourceEdit(7, 2);
 		MoveTargetEdit t1= new MoveTargetEdit(2, s1);
@@ -807,13 +829,14 @@ public class TextEditTests extends TestCase {
 		fRoot.addChild(m);
 		fRoot.addChild(s1);
 		UndoEdit undo= fRoot.apply(fDocument);
-		assertEquals("Buffer content", "017823yy569", fDocument.get());
+		Assert.assertEquals("Buffer content", "017823yy569", fDocument.get());
 		assertEquals(s1, 10, 0);
 		assertEquals(t1, 2, 2);
 		assertEquals(m, 6, 2);
 		doUndoRedo(undo, "017823yy569");
 	}
-
+	
+	@Test
 	public void testMoveDownWithInnerMark() throws Exception {
 		MoveSourceEdit s1= new MoveSourceEdit(2, 2);
 		MoveTargetEdit t1= new MoveTargetEdit(7, s1);
@@ -822,13 +845,14 @@ public class TextEditTests extends TestCase {
 		fRoot.addChild(m);
 		fRoot.addChild(s1);
 		UndoEdit undo= fRoot.apply(fDocument);
-		assertEquals("Buffer content", "01yy5623789", fDocument.get());
+		Assert.assertEquals("Buffer content", "01yy5623789", fDocument.get());
 		assertEquals(s1, 2, 0);
 		assertEquals(t1, 6, 2);
 		assertEquals(m, 2, 2);
 		doUndoRedo(undo, "01yy5623789");
 	}
-
+	
+	@Test
 	public void testMoveUpWithParentMark() throws Exception {
 		RangeMarker m= new RangeMarker(2, 6);
 		MoveSourceEdit s1= new MoveSourceEdit(4, 2);
@@ -837,13 +861,14 @@ public class TextEditTests extends TestCase {
 		m.addChild(t1);
 		fRoot.addChild(m);
 		UndoEdit undo= fRoot.apply(fDocument);
-		assertEquals("Buffer content", "0124536789", fDocument.get());
+		Assert.assertEquals("Buffer content", "0124536789", fDocument.get());
 		assertEquals(m, 2, 6);
 		assertEquals(t1, 3, 2);
 		assertEquals(s1, 6, 0);
 		doUndoRedo(undo, "0124536789");
 	}
-
+	
+	@Test
 	public void testMoveDownWithParentMark() throws Exception {
 		RangeMarker m= new RangeMarker(2, 6);
 		MoveSourceEdit s1= new MoveSourceEdit(2, 2);
@@ -852,13 +877,14 @@ public class TextEditTests extends TestCase {
 		m.addChild(t1);
 		fRoot.addChild(m);
 		UndoEdit undo= fRoot.apply(fDocument);
-		assertEquals("Buffer content", "0142356789", fDocument.get());
+		Assert.assertEquals("Buffer content", "0142356789", fDocument.get());
 		assertEquals(m, 2, 6);
 		assertEquals(t1, 3, 2);
 		assertEquals(s1, 2, 0);
 		doUndoRedo(undo, "0142356789");
 	}
-
+	
+	@Test
 	public void testNestedMoveSource() throws Exception {
 		MoveSourceEdit s1= new MoveSourceEdit(1, 5);
 		MoveSourceEdit s2= new MoveSourceEdit(2, 3);
@@ -880,10 +906,11 @@ public class TextEditTests extends TestCase {
 		assertEquals(t2, 4, 2);
 		assertEquals(t3, 2, 1);
 		String result= "0637248159";
-		assertEquals("Buffer content", result, fDocument.get());
+		Assert.assertEquals("Buffer content", result, fDocument.get());
 		doUndoRedo(undo, result);
 	}
-
+	
+	@Test
 	public void testNestedMoveSourceWithInsert() throws Exception {
 		MoveSourceEdit s1= new MoveSourceEdit(1, 5);
 		MoveSourceEdit s2= new MoveSourceEdit(2, 3);
@@ -908,10 +935,11 @@ public class TextEditTests extends TestCase {
 		assertEquals(t2, 5, 2);
 		assertEquals(t3, 2, 2);
 		String result= "063x7248159";
-		assertEquals("Buffer content", result, fDocument.get());
+		Assert.assertEquals("Buffer content", result, fDocument.get());
 		doUndoRedo(undo, result);
 	}
-
+	
+	@Test
 	public void testNestedMoveTarget() throws Exception {
 		MoveSourceEdit s1= new MoveSourceEdit(1, 2);
 		MoveSourceEdit s2= new MoveSourceEdit(5, 3);
@@ -927,10 +955,11 @@ public class TextEditTests extends TestCase {
 		assertEquals(t1, 5, 2);
 		assertEquals(t2, 4, 5);
 		String result= "0348512679";
-		assertEquals("Buffer content", result, fDocument.get());
+		Assert.assertEquals("Buffer content", result, fDocument.get());
 		doUndoRedo(undo, result);
 	}
-
+	
+	@Test
 	public void testCopyDown() throws Exception {
 		CopySourceEdit s1= new CopySourceEdit(2, 3);
 		CopyTargetEdit t1= new CopyTargetEdit(8, s1);
@@ -941,10 +970,11 @@ public class TextEditTests extends TestCase {
 		assertEquals(s1, 2, 3);
 		assertEquals(t1, 8, 3);
 		String result= "0123456723489";
-		assertEquals("Buffer content", result, fDocument.get());
+		Assert.assertEquals("Buffer content", result, fDocument.get());
 		doUndoRedo(undo, result);
 	}
-
+	
+	@Test
 	public void testCopyUp() throws Exception {
 		CopySourceEdit s1= new CopySourceEdit(7, 2);
 		CopyTargetEdit t1= new CopyTargetEdit(3, s1);
@@ -955,10 +985,11 @@ public class TextEditTests extends TestCase {
 		assertEquals(s1, 9, 2);
 		assertEquals(t1, 3, 2);
 		String result= "012783456789";
-		assertEquals("Buffer content", result, fDocument.get());
+		Assert.assertEquals("Buffer content", result, fDocument.get());
 		doUndoRedo(undo, result);
 	}
-
+	
+	@Test
 	public void testDoubleCopy() throws Exception {
 		CopySourceEdit s1= new CopySourceEdit(5, 2);
 		CopyTargetEdit t1= new CopyTargetEdit(8, s1);
@@ -975,10 +1006,11 @@ public class TextEditTests extends TestCase {
 		assertEquals(s2, 7, 2);
 		assertEquals(t2, 2, 2);
 		String result= "01562345675689";
-		assertEquals("Buffer content", result, fDocument.get());
+		Assert.assertEquals("Buffer content", result, fDocument.get());
 		doUndoRedo(undo, result);
 	}
-
+	
+	@Test
 	public void testNestedCopySource() throws Exception {
 		CopySourceEdit s1= new CopySourceEdit(1, 5);
 		CopySourceEdit s2= new CopySourceEdit(2, 3);
@@ -1000,10 +1032,11 @@ public class TextEditTests extends TestCase {
 		assertEquals(t2, 9, 3);
 		assertEquals(t3, 7, 1);
 		String result= "0123456372348123459";
-		assertEquals("Buffer content", result, fDocument.get());
+		Assert.assertEquals("Buffer content", result, fDocument.get());
 		doUndoRedo(undo, result);
 	}
-
+	
+	@Test
 	public void testNestedCopySourceWithInsert() throws Exception {
 		CopySourceEdit s1= new CopySourceEdit(1, 5);
 		CopySourceEdit s2= new CopySourceEdit(2, 3);
@@ -1028,10 +1061,11 @@ public class TextEditTests extends TestCase {
 		assertEquals(t2, 11, 4);
 		assertEquals(t3, 8, 2);
 		String result= "0123x4563x723x48123x459";
-		assertEquals("Buffer content", result, fDocument.get());
+		Assert.assertEquals("Buffer content", result, fDocument.get());
 		doUndoRedo(undo, result);
 	}
-
+	
+	@Test
 	public void testNestedCopyTarget() throws Exception {
 		CopySourceEdit s1= new CopySourceEdit(1, 2);
 		CopySourceEdit s2= new CopySourceEdit(5, 3);
@@ -1047,10 +1081,11 @@ public class TextEditTests extends TestCase {
 		assertEquals(t1, 6, 2);
 		assertEquals(t2, 11, 5);
 		String result= "01234512678512679";
-		assertEquals("Buffer content", result, fDocument.get());
+		Assert.assertEquals("Buffer content", result, fDocument.get());
 		doUndoRedo(undo, result);
 	}
-
+	
+	@Test
 	public void testSwap1() throws Exception {
 		IDocument document= new Document("foo(1, 2), 3");
 
@@ -1076,9 +1111,10 @@ public class TextEditTests extends TestCase {
 		root.apply(document);
 
 		String result= "3, foo(1, 2)";
-		assertEquals("Buffer content", result, document.get());
+		Assert.assertEquals("Buffer content", result, document.get());
 	}
-
+	
+	@Test
 	public void testSwap2() throws Exception {
 		IDocument document= new Document("foo(1, 2), 3");
 
@@ -1103,9 +1139,10 @@ public class TextEditTests extends TestCase {
 		root.apply(document);
 
 		String result= "foo(2, 1), 3";
-		assertEquals("Buffer content", result, document.get());
+		Assert.assertEquals("Buffer content", result, document.get());
 	}
-
+	
+	@Test
 	public void testSwap2InSwap1() throws Exception {
 		IDocument document= new Document("foo(1, 2), 3");
 
@@ -1146,9 +1183,10 @@ public class TextEditTests extends TestCase {
 		root.apply(document);
 
 		String result= "3, foo(2, 1)";
-		assertEquals("Buffer content", result, document.get());
+		Assert.assertEquals("Buffer content", result, document.get());
 	}
-
+	
+	@Test
 	public void testMoveTree1() {
 		TextEdit root= new MultiTextEdit();
 		TextEdit e1= new ReplaceEdit(0, 1, "");
@@ -1156,14 +1194,15 @@ public class TextEditTests extends TestCase {
 		TextEdit e2= new ReplaceEdit(2, 2, "");
 		root.addChild(e2);
 		root.moveTree(3);
-		assertEquals(3, root.getOffset());
-		assertEquals(4, root.getLength());
-		assertEquals(3, e1.getOffset());
-		assertEquals(1, e1.getLength());
-		assertEquals(5, e2.getOffset());
-		assertEquals(2, e2.getLength());
-	}
-
+		Assert.assertEquals(3, root.getOffset());
+		Assert.assertEquals(4, root.getLength());
+		Assert.assertEquals(3, e1.getOffset());
+		Assert.assertEquals(1, e1.getLength());
+		Assert.assertEquals(5, e2.getOffset());
+		Assert.assertEquals(2, e2.getLength());
+	}
+	
+	@Test
 	public void testMoveTree2() {
 		TextEdit root= new MultiTextEdit();
 		TextEdit e1= new ReplaceEdit(3, 1, "");
@@ -1171,14 +1210,15 @@ public class TextEditTests extends TestCase {
 		TextEdit e2= new ReplaceEdit(5, 2, "");
 		root.addChild(e2);
 		root.moveTree(-3);
-		assertEquals(0, root.getOffset());
-		assertEquals(4, root.getLength());
-		assertEquals(0, e1.getOffset());
-		assertEquals(1, e1.getLength());
-		assertEquals(2, e2.getOffset());
-		assertEquals(2, e2.getLength());
-	}
-
+		Assert.assertEquals(0, root.getOffset());
+		Assert.assertEquals(4, root.getLength());
+		Assert.assertEquals(0, e1.getOffset());
+		Assert.assertEquals(1, e1.getLength());
+		Assert.assertEquals(2, e2.getOffset());
+		Assert.assertEquals(2, e2.getLength());
+	}
+	
+	@Test
 	public void testMoveTree3() {
 		boolean exception= false;
 		try {
@@ -1189,7 +1229,8 @@ public class TextEditTests extends TestCase {
 		}
 		assertTrue(exception);
 	}
-
+	
+	@Test
 	public void testMoveTree4() {
 		boolean exception= false;
 		try {
@@ -1202,7 +1243,8 @@ public class TextEditTests extends TestCase {
 		}
 		assertTrue(exception);
 	}
-
+	
+	@Test
 	public void testComparator() throws Exception {
 		DeleteEdit d1= new DeleteEdit(1,3);
 		Accessor accessor= new Accessor(d1, TextEdit.class);
@@ -1214,13 +1256,14 @@ public class TextEditTests extends TestCase {
 		TextEdit edit3= new InsertEdit(57, "test3");
 
 		assertTrue(edit1.equals(edit1));
-		assertEquals(0, comparator.compare(edit1, edit1));
-		assertEquals(0, comparator.compare(edit1, edit2));
-		assertEquals(0, comparator.compare(edit2, edit1));
+		Assert.assertEquals(0, comparator.compare(edit1, edit1));
+		Assert.assertEquals(0, comparator.compare(edit1, edit2));
+		Assert.assertEquals(0, comparator.compare(edit2, edit1));
 		assertTrue(comparator.compare(edit1, edit3) == -comparator.compare(edit3, edit1));
 
 	}
-
+	
+	@Test
 	public void testSourceTransformationIncludes() throws Exception {
 		MoveSourceEdit ms= new MoveSourceEdit(2, 4);
 		MoveTargetEdit mt= new MoveTargetEdit(9, ms);
@@ -1240,11 +1283,12 @@ public class TextEditTests extends TestCase {
 		});
 		fRoot.apply(fDocument);
 		String result= "016782aa459";
-		assertEquals("Buffer content", result, fDocument.get());
+		Assert.assertEquals("Buffer content", result, fDocument.get());
 		assertEquals(r1, 6, 3);
 	}
 
-	// Regression test for 108672 [quick fix] Exception when applying Convert to enhanced for loop
+	// Regression test for 108672 [quick fix] Exception when applying Convert to enhanced for loop	
+	@Test
 	public void testSourceTranformationMultipleCovers() throws Exception {
 		MoveSourceEdit ms= new MoveSourceEdit(2, 4);
 		MoveTargetEdit mt= new MoveTargetEdit(9, ms);
@@ -1268,12 +1312,13 @@ public class TextEditTests extends TestCase {
 		});
 		fRoot.apply(fDocument);
 		String result= "01678aa459";
-		assertEquals("Buffer content", result, fDocument.get());
+		Assert.assertEquals("Buffer content", result, fDocument.get());
 		assertTrue(r1.isDeleted());
 		assertTrue(r2.isDeleted());
 		assertEquals(r3, 7, 2);
 	}
-
+	
+	@Test
 	public void testSourceTranformationSplit1() throws Exception {
 		MoveSourceEdit ms= new MoveSourceEdit(2, 4);
 		MoveTargetEdit mt= new MoveTargetEdit(9, ms);
@@ -1293,10 +1338,11 @@ public class TextEditTests extends TestCase {
 		});
 		fRoot.apply(fDocument);
 		String result= "01678aa459";
-		assertEquals("Buffer content", result, fDocument.get());
+		Assert.assertEquals("Buffer content", result, fDocument.get());
 		assertEquals(r1, 7, 1);
 	}
-
+	
+	@Test
 	public void testSourceTranformationSplit2() throws Exception {
 		MoveSourceEdit ms= new MoveSourceEdit(2, 4);
 		MoveTargetEdit mt= new MoveTargetEdit(9, ms);
@@ -1316,10 +1362,11 @@ public class TextEditTests extends TestCase {
 		});
 		fRoot.apply(fDocument);
 		String result= "0167823aa9";
-		assertEquals("Buffer content", result, fDocument.get());
+		Assert.assertEquals("Buffer content", result, fDocument.get());
 		assertEquals(r1, 6, 3);
 	}
-
+	
+	@Test
 	public void testIntersect() throws Exception {
 		IRegion result= MoveSourceEdit.intersect(new RangeMarker(0,1), new RangeMarker(2,1));
 		assertNull(result);
@@ -1347,23 +1394,23 @@ public class TextEditTests extends TestCase {
 		UndoEdit redo= undo.apply(fDocument);
 		assertBufferContent();
 		undo= redo.apply(fDocument);
-		assertEquals("Buffer content redo", redoResult, fDocument.get());
+		Assert.assertEquals("Buffer content redo", redoResult, fDocument.get());
 		undo.apply(fDocument);
 		assertBufferContent();
 	}
 
 	private void assertEquals(TextEdit edit, int offset, int length) {
-		assertEquals("Offset", offset, edit.getOffset());
-		assertEquals("Length", length, edit.getLength());
+		Assert.assertEquals("Offset", offset, edit.getOffset());
+		Assert.assertEquals("Length", length, edit.getLength());
 	}
 
 	private void assertEquals(IRegion region, int offset, int length) {
-		assertEquals("Offset", offset, region.getOffset());
-		assertEquals("Length", length, region.getLength());
+		Assert.assertEquals("Offset", offset, region.getOffset());
+		Assert.assertEquals("Length", length, region.getLength());
 	}
 
 	private void assertBufferContent() {
-		assertEquals("Buffer content restored", "0123456789", fDocument.get());
+		Assert.assertEquals("Buffer content restored", "0123456789", fDocument.get());
 	}
 }
 
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/TextStoreTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/TextStoreTest.java
index efb218b761b..f31626cf32b 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/TextStoreTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/TextStoreTest.java
@@ -10,7 +10,13 @@
  *******************************************************************************/
 package org.eclipse.text.tests;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.ConfigurableLineTracker;
@@ -23,13 +29,13 @@ import org.eclipse.jface.text.ITextStore;
  *
  * @since 3.3
  */
-public abstract class TextStoreTest extends TestCase {
+public abstract class TextStoreTest {
 
 	private ITextStore fTextStore;
 	private ILineTracker fTracker;
 
-	@Override
-	protected void setUp() {
+	@Before
+	public void setUp() {
 
 		fTextStore= createTextStore();
 		fTracker= createTracker();
@@ -52,12 +58,13 @@ public abstract class TextStoreTest extends TestCase {
 
 	abstract protected ITextStore createTextStore();
 
-	@Override
-	protected void tearDown() {
+	@After
+	public void tearDown() {
 		fTextStore= null;
 		fTracker= null;
 	}
-
+	
+	@Test
 	public void testGet1() throws Exception {
 		set("xxxxx");
 
@@ -70,7 +77,8 @@ public abstract class TextStoreTest extends TestCase {
 		}
 
 	}
-
+	
+	@Test
 	public void testGet2() throws Exception {
 		set("xxxxx");
 
@@ -83,6 +91,8 @@ public abstract class TextStoreTest extends TestCase {
 		}
 
 	}
+	
+	@Test
 	public void testEditScript1() throws Exception {
 		replace(0, fTextStore.getLength(), "x");
 		assertTextStoreContents("x");
@@ -111,7 +121,8 @@ public abstract class TextStoreTest extends TestCase {
 		} catch (IndexOutOfBoundsException e) {
 		}
 	}
-
+	
+	@Test
 	public void testEmptyLines() throws Exception {
 
 		replace(0, 10, null);
@@ -120,7 +131,8 @@ public abstract class TextStoreTest extends TestCase {
 		replace(0, 0, "\n\n\n\n\n");
 		assertTextStoreContents("\n\n\n\n\n");
 	}
-
+	
+	@Test
 	public void testInsert1() throws Exception {
 
 		replace(3, 0, "yyyy");
@@ -138,7 +150,8 @@ public abstract class TextStoreTest extends TestCase {
 		replace(11, 5, "y\nxyz");
 		assertTextStoreContents("x\nxyyyy\nxy\ny\nxyz\nx\n");
 	}
-
+	
+	@Test
 	public void testInsert2() throws Exception {
 		replace(3, 0, "yyyy");
 		assertTextStoreContents("x\nxyyyy\nx\nx\nx\n");
@@ -146,7 +159,8 @@ public abstract class TextStoreTest extends TestCase {
 		replace(9, 0, "y\ny\ny");
 		assertTextStoreContents("x\nxyyyy\nxy\ny\ny\nx\nx\n");
 	}
-
+	
+	@Test
 	public void testLinesNumbers() throws Exception {
 		replace(0, 10, "\na\nbb\nccc\ndddd\neeeee\n");
 		assertTextStoreContents("\na\nbb\nccc\ndddd\neeeee\n");
@@ -160,7 +174,8 @@ public abstract class TextStoreTest extends TestCase {
 			offset+= (i + 1);
 		}
 	}
-
+	
+	@Test
 	public void testOffsets() throws Exception {
 		for (int i= 0; i < 5; i++) {
 			IRegion line= fTracker.getLineInformation(i);
@@ -181,7 +196,8 @@ public abstract class TextStoreTest extends TestCase {
 			assertTrue("invalid line number " + line + " for position " + i + " should be " + l, l == line);
 		}
 	}
-
+	
+	@Test
 	public void testRemove() throws Exception {
 		replace(3, 1, null);
 		assertTextStoreContents("x\nxx\nx\nx\n");
@@ -195,12 +211,14 @@ public abstract class TextStoreTest extends TestCase {
 		replace(0, 3, null);
 		assertTextStoreContents("");
 	}
-
+	
+	@Test
 	public void testReplace() throws Exception {
 		replace(0, fTextStore.getLength(), "\tx\n\tx\n\tx\n\tx\n\tx\n");
 		assertTextStoreContents("\tx\n\tx\n\tx\n\tx\n\tx\n");
 	}
-
+	
+	@Test
 	public void testReplace2() throws Exception {
 		replace(0, fTextStore.getLength(), "x");
 		assertTextStoreContents("x");
@@ -208,12 +226,14 @@ public abstract class TextStoreTest extends TestCase {
 		replace(0, fTextStore.getLength(), "x\nx\nx\n");
 		assertTextStoreContents("x\nx\nx\n");
 	}
-
+	
+	@Test
 	public void testReplace3() throws Exception {
 		replace(1, 1, "\n");
 		assertTextStoreContents("x\nx\nx\nx\nx\n");
 	}
-
+	
+	@Test
 	public void testReplace4() throws Exception {
 		int lines= fTracker.getNumberOfLines();
 		IRegion previous= fTracker.getLineInformation(0);
@@ -225,7 +245,8 @@ public abstract class TextStoreTest extends TestCase {
 			previous= fTracker.getLineInformation(i);
 		}
 	}
-
+	
+	@Test
 	public void testShiftLeft() throws Exception {
 		replace(0, fTextStore.getLength(), "\tx\n\tx\n\tx\n\tx\n\tx\n");
 		assertTextStoreContents("\tx\n\tx\n\tx\n\tx\n\tx\n");
@@ -237,7 +258,8 @@ public abstract class TextStoreTest extends TestCase {
 
 		assertTextStoreContents("x\nx\nx\nx\nx\n");
 	}
-
+	
+	@Test
 	public void testShiftRight() throws Exception {
 		for (int i= 0; i < 5; i++) {
 			int pos= fTracker.getLineOffset(i);
@@ -246,7 +268,8 @@ public abstract class TextStoreTest extends TestCase {
 
 		assertTextStoreContents("\tx\n\tx\n\tx\n\tx\n\tx\n");
 	}
-
+	
+	@Test
 	public void testDeleteEmptyLine() throws Exception {
 		set("x\nx\n\nx\n\n");
 		assertTextStoreContents("x\nx\n\nx\n\n");
@@ -268,7 +291,8 @@ public abstract class TextStoreTest extends TestCase {
 		}
 
 	}
-
+	
+	@Test
 	public void testDeleteLines() throws Exception {
 		String content= "";
 		for (int i= 0; i < 50; i++) {
@@ -301,7 +325,8 @@ public abstract class TextStoreTest extends TestCase {
 			}
 		}
 	}
-
+	
+	@Test
 	public void testDeleteLines2() throws Exception {
 		String content= "";
 		for (int i= 0; i < 50; i++) {
@@ -334,7 +359,8 @@ public abstract class TextStoreTest extends TestCase {
 			}
 		}
 	}
-
+	
+	@Test
 	public void testSet() throws Exception {
 		String content= "";
 		for (int i= 0; i < 35; i++) {
@@ -350,7 +376,8 @@ public abstract class TextStoreTest extends TestCase {
 			content+= "\n";
 		}
 	}
-
+	
+	@Test
 	public void testFunnyLastLineCompatibility() throws Exception {
 		/* empty last line */
 		set("x\n");
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/TextUtilitiesTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/TextUtilitiesTest.java
index e8390adf42d..76791c3266b 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/TextUtilitiesTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/TextUtilitiesTest.java
@@ -10,15 +10,14 @@
  *******************************************************************************/
 package org.eclipse.text.tests;
 
+import static org.junit.Assert.*;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
 import org.junit.Assert;
+import org.junit.Test;
 
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.Document;
@@ -31,11 +30,7 @@ import org.eclipse.jface.text.TextUtilities;
 /**
  * A test case for text utilities.
  */
-public class TextUtilitiesTest extends TestCase {
-
-	public static Test suite() {
-		return new TestSuite(TextUtilitiesTest.class);
-	}
+public class TextUtilitiesTest {
 
 	/**
 	 * A document which is a copy of another document.
@@ -144,10 +139,6 @@ public class TextUtilitiesTest extends TestCase {
 	 * 
 	 * @param name the name
 	 */
-	public TextUtilitiesTest(String name) {
-		super(name);
-	}
-
 	private static DocumentEvent createRandomEvent(IDocument document, int maxLength, char character) {
 
 		int index0= (int) (Math.random() * (maxLength + 1));
@@ -163,7 +154,8 @@ public class TextUtilitiesTest extends TestCase {
 
 		return new DocumentEvent(document, offset, length, buffer.toString());
 	}
-
+	
+	@Test
 	public void testMergeEvents1() {
 		IDocument reference= new Document();
 		LazilyMirroredDocument testee= new LazilyMirroredDocument(reference);
@@ -180,7 +172,8 @@ public class TextUtilitiesTest extends TestCase {
 			Assert.fail("bad location exception");
 		}
 	}
-
+	
+	@Test
 	public void testMergeEvents() {
 		IDocument reference= new Document();
 		LazilyMirroredDocument testee= new LazilyMirroredDocument(reference);
@@ -232,7 +225,8 @@ public class TextUtilitiesTest extends TestCase {
 			Assert.fail("bad location exception");
 		}
 	}
-
+	
+	@Test
 	public void testMergeEvents2() {
 		IDocument reference= new Document();
 		LazilyMirroredDocument2 testee= new LazilyMirroredDocument2(reference);
@@ -281,7 +275,8 @@ public class TextUtilitiesTest extends TestCase {
 	private static void check(IDocument reference, IDocument testee) {
 		Assert.assertEquals(reference.get(), testee.get());
 	}
-
+	
+	@Test
 	public void testIndexOf() {
 		int[] result;
 		result= TextUtilities.indexOf(new String[] {"a", "ab", "abc"}, "xxxxxxxxxx", 0);
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/link/InclusivePositionUpdaterTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/link/InclusivePositionUpdaterTest.java
index c5f485eeb22..038f8616785 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/link/InclusivePositionUpdaterTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/link/InclusivePositionUpdaterTest.java
@@ -10,9 +10,10 @@
  *******************************************************************************/
 package org.eclipse.text.tests.link;
 
-import junit.framework.TestCase;
-
+import org.junit.After;
 import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.Document;
@@ -21,14 +22,15 @@ import org.eclipse.jface.text.IPositionUpdater;
 import org.eclipse.jface.text.Position;
 import org.eclipse.jface.text.link.InclusivePositionUpdater;
 
-public class InclusivePositionUpdaterTest extends TestCase {
+public class InclusivePositionUpdaterTest {
 
 	private IPositionUpdater fUpdater;
 	private static final String CATEGORY= "testcategory";
 	private Position fPos;
 	private IDocument fDoc;
-	@Override
-	protected void setUp() throws Exception {
+	
+	@Before
+	public void setUp() throws Exception {
 		fUpdater= new InclusivePositionUpdater(CATEGORY);
 		fDoc= new Document("ccccccccccccccccccccccccccccccccccccccccccccc");
 		fPos= new Position(5, 5);
@@ -37,101 +39,117 @@ public class InclusivePositionUpdaterTest extends TestCase {
 		fDoc.addPosition(CATEGORY, fPos);
 	}
 
-	@Override
-	protected void tearDown() throws Exception {
+	@After
+	public void tearDown() throws Exception{
 		fDoc.removePositionUpdater(fUpdater);
 		fDoc.removePositionCategory(CATEGORY);
 	}
-
+	
+	@Test
 	public void testDeleteAfter() throws BadLocationException {
 		fDoc.replace(20, 2, "");
 		Assert.assertEquals(5, fPos.offset);
 		Assert.assertEquals(5, fPos.length);
 	}
-
+	
+	@Test
 	public void testAddAfter() throws BadLocationException {
 		fDoc.replace(20, 0, "yy");
 		Assert.assertEquals(5, fPos.offset);
 		Assert.assertEquals(5, fPos.length);
 	}
-
+	
+	@Test
 	public void testDeleteBefore() throws BadLocationException {
 		fDoc.replace(2, 2, "");
 		Assert.assertEquals(3, fPos.offset);
 		Assert.assertEquals(5, fPos.length);
 	}
-
+	
+	@Test
 	public void testAddBefore() throws BadLocationException {
 		fDoc.replace(2, 0, "yy");
 		Assert.assertEquals(7, fPos.offset);
 		Assert.assertEquals(5, fPos.length);
 	}
-
+	
+	@Test
 	public void testAddRightBefore() throws BadLocationException {
 		fDoc.replace(5, 0, "yy");
 		Assert.assertEquals(5, fPos.offset);
 		Assert.assertEquals(7, fPos.length);
 	}
-
+	
+	@Test
 	public void testDeleteAtOffset() throws BadLocationException {
 		fDoc.replace(5, 2, "");
 		Assert.assertEquals(5, fPos.offset);
 		Assert.assertEquals(3, fPos.length);
 	}
-
+	
+	@Test
 	public void testDeleteRightBefore() throws BadLocationException {
 		fDoc.replace(3, 2, "");
 		Assert.assertEquals(3, fPos.offset);
 		Assert.assertEquals(5, fPos.length);
 	}
-
+	
+	@Test
 	public void testAddRightAfter() throws BadLocationException {
 		fDoc.replace(10, 0, "yy");
 		Assert.assertEquals(5, fPos.offset);
 		Assert.assertEquals(7, fPos.length);
 	}
-
+	
+	@Test
 	public void testDeleteRightAfter() throws BadLocationException {
 		fDoc.replace(10, 2, "");
 		Assert.assertEquals(5, fPos.offset);
 		Assert.assertEquals(5, fPos.length);
 	}
-
+	
+	@Test
 	public void testAddWithin() throws BadLocationException {
 		fDoc.replace(6, 0, "yy");
 		Assert.assertEquals(5, fPos.offset);
 		Assert.assertEquals(7, fPos.length);
 	}
-
+	
+	@Test
 	public void testDeleteWithin() throws BadLocationException {
 		fDoc.replace(6, 2, "");
 		Assert.assertEquals(5, fPos.offset);
 		Assert.assertEquals(3, fPos.length);
 	}
-
+	
+	@Test
 	public void testReplaceLeftBorder() throws BadLocationException {
 		fDoc.replace(4, 2, "yy");
 		Assert.assertEquals(4, fPos.offset);
 		Assert.assertEquals(6, fPos.length);
 	}
-
+	
+	@Test
 	public void testReplaceRightBorder() throws BadLocationException {
 		fDoc.replace(9, 2, "yy");
 		Assert.assertEquals(5, fPos.offset);
 		Assert.assertEquals(6, fPos.length);
 	}
-
+	
+	@Test
 	public void testDeleteOverRightBorder() throws BadLocationException {
 		fDoc.replace(9, 2, "");
 		Assert.assertEquals(5, fPos.offset);
 		Assert.assertEquals(4, fPos.length);
 	}
-
+	
+	@Test
 	public void testDeleted() throws BadLocationException {
 		fDoc.replace(4, 7, "");
 		Assert.assertTrue(fPos.isDeleted);
 	}
-
+	
+	@Test
 	public void testReplaced() throws BadLocationException {
 		fDoc.replace(4, 7, "yyyyyyy");
 		Assert.assertTrue(fPos.isDeleted);
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkTestSuite.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkTestSuite.java
index 29fb86be783..8aaeb10c5f5 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkTestSuite.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkTestSuite.java
@@ -11,8 +11,9 @@
 
 package org.eclipse.text.tests.link;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
 
 
 /**
@@ -20,16 +21,11 @@ import junit.framework.TestSuite;
  *
  * @since 3.0
  */
+@RunWith(Suite.class)
+@SuiteClasses({LinkedPositionGroupTest.class,
+	LinkedPositionTest.class,
+	InclusivePositionUpdaterTest.class,
+	LinkedModeModelTest.class})
 public class LinkTestSuite {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test Suite org.eclipse.text.tests.link"); //$NON-NLS-1$
-		//$JUnit-BEGIN$
-		suite.addTestSuite(LinkedPositionGroupTest.class);
-		suite.addTestSuite(LinkedPositionTest.class);
-		suite.addTestSuite(InclusivePositionUpdaterTest.class);
-		suite.addTestSuite(LinkedModeModelTest.class);
-		//$JUnit-END$
-		return suite;
-	}
+	//intentionally left blank
 }
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedModeModelTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedModeModelTest.java
index 6914890ac05..ffeae1f90f5 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedModeModelTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedModeModelTest.java
@@ -10,6 +10,9 @@
  *******************************************************************************/
 package org.eclipse.text.tests.link;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
@@ -17,6 +20,10 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
@@ -25,15 +32,14 @@ import org.eclipse.jface.text.link.LinkedModeModel;
 import org.eclipse.jface.text.link.LinkedPosition;
 import org.eclipse.jface.text.link.LinkedPositionGroup;
 
-import junit.framework.TestCase;
-
 
-public class LinkedModeModelTest extends TestCase {
+public class LinkedModeModelTest {
 
 	private List<LinkedPosition> fPositions= new LinkedList<>();
 
 	private List<IDocument[]> fDocumentMap= new ArrayList<>();
-
+	
+	@Test
 	public void testUpdate() throws BadLocationException {
 		IDocument doc1= new Document(GARTEN1);
 
@@ -50,7 +56,8 @@ public class LinkedModeModelTest extends TestCase {
 		assertEquals(group1, "GRETCHEN");
 		assertUnchanged(group1);
 	}
-
+	
+	@Test
 	public void testUpdateUnequalContent() throws BadLocationException {
 		IDocument doc1= new Document(GARTEN1);
 		
@@ -69,6 +76,7 @@ public class LinkedModeModelTest extends TestCase {
 		assertUnchanged(group1);
 	}
 	
+	@Test
 	public void testUpdateTwoGroups() throws BadLocationException {
 		IDocument doc1= new Document(GARTEN1);
 
@@ -93,7 +101,8 @@ public class LinkedModeModelTest extends TestCase {
 		assertEquals(group2, "FAUST");
 		assertUnchanged(group1, group2);
 	}
-
+	
+	@Test
 	public void testUpdateMultipleGroups() throws BadLocationException {
 		IDocument doc1= new Document(GARTEN1);
 
@@ -120,7 +129,8 @@ public class LinkedModeModelTest extends TestCase {
 		assertEquals(group2, "AUGE");
 		assertUnchanged(group1, group2);
 	}
-
+	
+	@Test
 	public void testUpdateMultiDocument() throws BadLocationException {
 		IDocument doc1= new Document(GARTEN1);
 		IDocument doc2= new Document(GARTEN2);
@@ -151,7 +161,8 @@ public class LinkedModeModelTest extends TestCase {
 		assertUnchanged(group1, group2);
 
 	}
-
+	
+	@Test
 	public void testAddCompatibleGroups() throws BadLocationException {
 		IDocument doc1= new Document(GARTEN1);
 
@@ -172,7 +183,8 @@ public class LinkedModeModelTest extends TestCase {
 		assertUnchanged(group1, group2);
 
 	}
-
+	
+	@Test
 	public void testAddIncompatibleGroups() throws BadLocationException {
 		IDocument doc1= new Document(GARTEN1);
 
@@ -192,7 +204,8 @@ public class LinkedModeModelTest extends TestCase {
 		}
 		assertFalse(true);
 	}
-
+	
+	@Test
 	public void testAddNullGroup() throws BadLocationException {
 		LinkedModeModel env= new LinkedModeModel();
 		try {
@@ -203,7 +216,8 @@ public class LinkedModeModelTest extends TestCase {
 
 		assertFalse(true);
 	}
-
+	
+	@Test
 	public void testAddGroupWhenSealed() throws BadLocationException {
 		IDocument doc1= new Document(GARTEN1);
 
@@ -224,7 +238,8 @@ public class LinkedModeModelTest extends TestCase {
 
 		assertFalse(true);
 	}
-
+	
+	@Test
 	public void testDoubleInstall() throws BadLocationException {
 		IDocument doc1= new Document(GARTEN1);
 
@@ -244,7 +259,8 @@ public class LinkedModeModelTest extends TestCase {
 
 		assertFalse(true);
 	}
-
+	
+	@Test
 	public void testEmptyInstall() throws BadLocationException {
 		LinkedModeModel env= new LinkedModeModel();
 
@@ -256,7 +272,8 @@ public class LinkedModeModelTest extends TestCase {
 
 		assertFalse(true);
 	}
-
+	
+	@Test
 	public void testNestedUpdate() throws BadLocationException {
 		IDocument doc1= new Document(GARTEN1);
 
@@ -295,7 +312,8 @@ public class LinkedModeModelTest extends TestCase {
 		assertEquals(group2, "FAUST");
 		assertUnchanged(group1, group2);
 	}
-
+	
+	@Test
 	public void testNestedForceInstall() throws BadLocationException {
 		IDocument doc1= new Document(GARTEN1);
 
@@ -340,7 +358,8 @@ public class LinkedModeModelTest extends TestCase {
 
 		assertEquals(group1_2, "INE");
 	}
-
+	
+	@Test
 	public void testNestedTryInstall() throws BadLocationException {
 		IDocument doc1= new Document(GARTEN1);
 
@@ -383,7 +402,8 @@ public class LinkedModeModelTest extends TestCase {
 		assertEquals(group1, "MARGARINE");
 		assertUnchanged(group1, group2);
 	}
-
+	
+	@Test
 	public void testOutsideUpdate() throws BadLocationException {
 		IDocument doc1= new Document(GARTEN1);
 
@@ -406,11 +426,12 @@ public class LinkedModeModelTest extends TestCase {
 
 		assertEquals(group1, "MARGARETE");
 		assertFalse(isExit[0]);
-		assertEquals("	MARGARETE:\n" +
+		Assert.assertEquals("	MARGARETE:\n" +
 				"	Verbrich mir, Heinrich!", doc1.get(0, 36));
 //		assertUnchanged(group1); // would fail, since it was changed outside
 	}
-
+	
+	@Test
 	public void testOverlappingUpdate() throws BadLocationException {
 		// a change partially touches a linked position, but also "in-between" text
 		IDocument doc1= new Document(GARTEN1);
@@ -434,11 +455,12 @@ public class LinkedModeModelTest extends TestCase {
 
 		assertEquals(group1, "MARGARINE-PLANTA");
 		assertFalse(isExit[0]);
-		assertEquals("	MARGARINE-PLANTA" +
+		Assert.assertEquals("	MARGARINE-PLANTA" +
 				"Versprich mir, Heinrich!", doc1.get(0, 41));
 //		assertUnchanged(group1); // would fail, since it was changed outside
 	}
-
+	
+	@Test
 	public void testOverlappingDelete() throws BadLocationException {
 		// a change partially touches a linked position, but also "in-between" text
 		IDocument doc1= new Document(GARTEN1);
@@ -462,11 +484,12 @@ public class LinkedModeModelTest extends TestCase {
 
 		assertEquals(group1, "MARGAR");
 		assertFalse(isExit[0]);
-		assertEquals("	MARGAR" +
+		Assert.assertEquals("	MARGAR" +
 				"Versprich mir, Heinrich!", doc1.get(0, 31));
 //		assertUnchanged(group1); // would fail, since it was changed outside
 	}
-
+	
+	@Test
 	public void testIllegalChange1() throws BadLocationException {
 		// linked mode does not exit if the documents change outside the linked
 		// positions, but it does exit if a change invalidates the constraints
@@ -494,7 +517,8 @@ public class LinkedModeModelTest extends TestCase {
 
 		assertTrue(isExit[0]);
 	}
-
+	
+	@Test
 	public void testIllegalChange2() throws BadLocationException {
 		// linked mode does not exit if the documents change outside the linked
 		// positions, but it does exit if a change invalidates the constraints
@@ -532,7 +556,7 @@ public class LinkedModeModelTest extends TestCase {
 		for (int i= 0; i < positions.length; i++) {
 			LinkedPosition pos= positions[i];
 			if (!pos.isDeleted())
-				assertEquals(expected, pos.getContent());
+				Assert.assertEquals(expected, pos.getContent());
 		}
 	}
 
@@ -550,7 +574,7 @@ public class LinkedModeModelTest extends TestCase {
 		Arrays.sort(act, new PositionComparator());
 		Arrays.sort(exp, new PositionComparator());
 
-		assertEquals(exp.length, act.length);
+		Assert.assertEquals(exp.length, act.length);
 
 		LinkedPosition e_prev= null, a_prev= null;
 		for (int i= 0; i <= exp.length; i++) {
@@ -560,10 +584,10 @@ public class LinkedModeModelTest extends TestCase {
 			IDocument e_doc= e_prev != null ? e_prev.getDocument() : e_next.getDocument();
 			if (e_next != null && e_next.getDocument() != e_doc) {
 				// split at document boundaries
-				assertEquals(getContentBetweenPositions(e_prev, null), getContentBetweenPositions(a_prev, null));
-				assertEquals(getContentBetweenPositions(null, e_next), getContentBetweenPositions(null, a_next));
+				Assert.assertEquals(getContentBetweenPositions(e_prev, null), getContentBetweenPositions(a_prev, null));
+				Assert.assertEquals(getContentBetweenPositions(null, e_next), getContentBetweenPositions(null, a_next));
 			} else {
-				assertEquals(getContentBetweenPositions(e_prev, e_next), getContentBetweenPositions(a_prev, a_next));
+				Assert.assertEquals(getContentBetweenPositions(e_prev, e_next), getContentBetweenPositions(a_prev, a_next));
 			}
 
 			e_prev= e_next;
@@ -589,8 +613,8 @@ public class LinkedModeModelTest extends TestCase {
 	}
 
 
-	@Override
-	protected void setUp() throws Exception {
+	@Before
+	public void setUp() {
 		fPositions.clear();
 		fDocumentMap.clear();
 	}
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedPositionGroupTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedPositionGroupTest.java
index 23278ff06f0..87858039e48 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedPositionGroupTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedPositionGroupTest.java
@@ -10,7 +10,12 @@
  *******************************************************************************/
 package org.eclipse.text.tests.link;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
 
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.Document;
@@ -20,33 +25,38 @@ import org.eclipse.jface.text.link.LinkedPosition;
 import org.eclipse.jface.text.link.LinkedPositionGroup;
 
 
-public class LinkedPositionGroupTest extends TestCase {
-
+public class LinkedPositionGroupTest {
+	
+	@Test
 	public void testIsEmpty() {
 		LinkedPositionGroup group= new LinkedPositionGroup();
 		assertTrue(group.isEmpty());
 	}
-
+	
+	@Test
 	public void testIsNotEmtpy() throws BadLocationException {
 		LinkedPositionGroup group= new LinkedPositionGroup();
 		group.addPosition(new LinkedPosition(new Document(), 0, 0));
 		assertFalse(group.isEmpty());
 	}
-
+	
+	@Test
 	public void testGetPositions() throws BadLocationException {
 		LinkedPositionGroup group= new LinkedPositionGroup();
 		group.addPosition(new LinkedPosition(new Document(), 0, 0));
 		group.addPosition(new LinkedPosition(new Document(), 0, 0));
 		assertEquals(2, group.getPositions().length);
 	}
-
+	
+	@Test
 	public void testAddPosition() throws BadLocationException {
 		LinkedPositionGroup group= new LinkedPositionGroup();
 		LinkedPosition p= new LinkedPosition(new Document(), 0, 0);
 		group.addPosition(p);
 		assertSame(p, group.getPositions()[0]);
 	}
-
+	
+	@Test
 	public void testAddIllegalState() throws BadLocationException {
 		LinkedPositionGroup group= new LinkedPositionGroup();
 		LinkedModeModel env= new LinkedModeModel();
@@ -61,7 +71,8 @@ public class LinkedPositionGroupTest extends TestCase {
 
 		assertFalse(true);
 	}
-
+	
+	@Test
 	public void testAddBadLocation() throws BadLocationException {
 		LinkedPositionGroup group= new LinkedPositionGroup();
 		IDocument doc= new Document(GARTEN);
@@ -74,7 +85,8 @@ public class LinkedPositionGroupTest extends TestCase {
 
 		assertFalse(true);
 	}
-
+	
+	@Test
 	public void testAddEqualContent() {
 		LinkedPositionGroup group= new LinkedPositionGroup();
 		IDocument doc= new Document(GARTEN);
@@ -85,7 +97,8 @@ public class LinkedPositionGroupTest extends TestCase {
 			assertFalse(true);
 		}
 	}
-
+	
+	@Test
 	public void testAddNotEqualContent() {
 		LinkedPositionGroup group= new LinkedPositionGroup();
 		IDocument doc= new Document(GARTEN);
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedPositionTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedPositionTest.java
index 8ff9df77420..69ed458f8a3 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedPositionTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedPositionTest.java
@@ -10,7 +10,11 @@
  *******************************************************************************/
 package org.eclipse.text.tests.link;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import org.junit.Before;
+import org.junit.Test;
 
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.Document;
@@ -21,19 +25,21 @@ import org.eclipse.jface.text.link.LinkedPosition;
 import org.eclipse.jface.text.link.LinkedPositionGroup;
 
 
-public class LinkedPositionTest extends TestCase {
+public class LinkedPositionTest {
 
-	@Override
+	@Before
 	public void setUp() {
 		fDoc= new Document(GARTEN1);
 		fPos= new LinkedPosition(fDoc, 3, 10);
 	}
-
+	
+	@Test
 	public void testCreate() {
 		new LinkedPosition(fDoc, 1, 9);
 		new LinkedPosition(new Document(), 123, 234);
 	}
-
+	
+	@Test
 	public void testNullCreate() {
 		try {
 			new LinkedPosition(null, 1, 9);
@@ -45,7 +51,8 @@ public class LinkedPositionTest extends TestCase {
 
 	/*
 	 * Class to test for boolean includes(int)
-	 */
+	 */	
+	@Test
 	public void testIncludesint() {
 		assertEquals(true, fPos.includes(3));
 		assertEquals(true, fPos.includes(6));
@@ -53,14 +60,16 @@ public class LinkedPositionTest extends TestCase {
 		assertEquals(false, fPos.includes(2));
 		assertEquals(false, fPos.includes(15));
 	}
-
+	
+	@Test
 	public void testGetDocument() {
 		assertEquals(fDoc, fPos.getDocument());
 	}
 
 	/*
 	 * Class to test for boolean overlapsWith(LinkedPosition)
-	 */
+	 */	
+	@Test
 	public void testOverlapsWithLinkedPosition() {
 		LinkedPosition pos= new LinkedPosition(fDoc, 0, 2);
 		assertEquals(false, fPos.overlapsWith(pos));
@@ -92,7 +101,8 @@ public class LinkedPositionTest extends TestCase {
 
 	/*
 	 * Class to test for boolean includes(DocumentEvent)
-	 */
+	 */	
+	@Test
 	public void testIncludesDocumentEvent() {
 		DocumentEvent de= new DocumentEvent(fDoc, 0, 2, "ignore");
 		assertEquals(false, fPos.includes(de));
@@ -124,7 +134,8 @@ public class LinkedPositionTest extends TestCase {
 
 	/*
 	 * Class to test for boolean includes(LinkedPosition)
-	 */
+	 */	
+	@Test
 	public void testIncludesLinkedPosition() {
 		LinkedPosition pos= new LinkedPosition(fDoc, 0, 2);
 		assertEquals(false, fPos.includes(pos));
@@ -153,7 +164,8 @@ public class LinkedPositionTest extends TestCase {
 		pos= new LinkedPosition(fDoc, 14, 4);
 		assertEquals(false, fPos.includes(pos));
 	}
-
+	
+	@Test
 	public void testGetContent() throws BadLocationException {
 		LinkedPosition p= new LinkedPosition(fDoc, 1, 9);
 		assertEquals("MARGARETE", p.getContent());
@@ -167,7 +179,8 @@ public class LinkedPositionTest extends TestCase {
 		fDoc.set(GARTEN1);
 		assertEquals("FAUST", p.getContent());
 	}
-
+	
+	@Test
 	public void testBadLocationContent() {
 		LinkedPosition p= new LinkedPosition(new Document(), 23, 3);
 		try {
@@ -186,7 +199,8 @@ public class LinkedPositionTest extends TestCase {
 		}
 		assertFalse(true);
 	}
-
+	
+	@Test
 	public void testGetSequenceNumber() {
 		LinkedPosition p= new LinkedPosition(fDoc, 1, 9);
 		assertEquals(LinkedPositionGroup.NO_STOP, p.getSequenceNumber());
@@ -194,41 +208,38 @@ public class LinkedPositionTest extends TestCase {
 		p= new LinkedPosition(fDoc, 1, 9, 18);
 		assertEquals(18, p.getSequenceNumber());
 	}
-
+	
+	@Test
 	public void testSetSequenceNumber() {
 		fPos.setSequenceNumber(28);
 		assertEquals(28, fPos.getSequenceNumber());
 	}
-
+	
+	@Test
 	public void testEquals() {
 		LinkedPosition p1= new LinkedPosition(fDoc, 1, 9);
 		LinkedPosition p2= new LinkedPosition(fDoc, 1, 9);
 
 		assertEquals(p1, p2);
 	}
-
+	
+	@Test
 	public void testNotEquals() {
 		LinkedPosition p1= new LinkedPosition(fDoc, 1, 9);
 		LinkedPosition p2= new LinkedPosition(fDoc, 1, 10);
 
 		assertFalse(p1.equals(p2));
 	}
-
+	
+	@Test
 	public void testNotEqualsPosition() {
 		LinkedPosition p1= new LinkedPosition(fDoc, 1, 9);
 		Position p2= new Position(1, 9);
 
 		assertFalse(p1.equals(p2));
 	}
-
-	public void testNotEqualsPositionSymmetry() {
-//		LinkedPosition p1= new LinkedPosition(fDoc, 1, 9);
-//		Position p2= new Position(1, 9);
-//
-//		// breaking equals contract
-//		assertFalse(p2.equals(p1));
-	}
-
+	
+	@Test
 	public void testNotEqualsDifferentDoc() {
 		LinkedPosition p1= new LinkedPosition(fDoc, 1, 9);
 		IDocument doc= new Document();