use JUnit 4 for all tests

Signed-off-by: Florian Thienel <florian@thienel.org>

30 files changed, 212 insertions, 905 deletions

diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/PropertyTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/PropertyTest.java
index 55376136..abfffa32 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/PropertyTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/PropertyTest.java
@@ -10,23 +10,26 @@
  *******************************************************************************/
 package org.eclipse.vex.core.internal.css;
 
-import java.io.StringReader;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
-import junit.framework.TestCase;
+import java.io.StringReader;
 
 import org.eclipse.vex.core.internal.core.DisplayDevice;
 import org.eclipse.vex.core.internal.dom.Document;
 import org.eclipse.vex.core.internal.dom.Element;
 import org.eclipse.vex.core.internal.io.DocumentReader;
+import org.junit.Test;
 import org.w3c.css.sac.InputSource;
 import org.w3c.css.sac.LexicalUnit;
 import org.w3c.css.sac.Parser;
 
-public class PropertyTest extends TestCase {
+public class PropertyTest {
 
 	/**
 	 * From CSS2.1 section 8.5.3
 	 */
+	@Test
 	public void testBorderStyleProperty() throws Exception {
 		final Styles styles = new Styles();
 		final Styles parentStyles = new Styles();
@@ -59,6 +62,7 @@ public class PropertyTest extends TestCase {
 	/**
 	 * From CSS2.1 section 8.5.1
 	 */
+	@Test
 	public void testBorderWidthProperty() throws Exception {
 
 		final Styles styles = new Styles();
@@ -95,12 +99,7 @@ public class PropertyTest extends TestCase {
 		assertEquals(Integer.valueOf(10), prop.calculate(MockLU.createFloat(LexicalUnit.SAC_INCH, 0.2f), parentStyles, styles, null));
 	}
 
-	/**
-	 * From CSS2.1 section 8.5.2 (border-XXX-color), section 14.1 (color), and section 14.2.1 (background-color)
-	 */
-	public void testColorProperty() throws Exception {
-	}
-
+	@Test
 	public void testStringBackgroundImage() throws Exception {
 		final Styles styles = new Styles();
 		final Styles parentStyles = new Styles();
@@ -108,6 +107,7 @@ public class PropertyTest extends TestCase {
 		assertEquals("http://www.eclipse.org", property.calculate(MockLU.createString("http://www.eclipse.org"), parentStyles, styles, null));
 	}
 
+	@Test
 	public void testAttrBackgroundImage() throws Exception {
 		final LexicalUnit attrSrc = MockLU.createAttr("src");
 		final Styles styles = new Styles();
@@ -123,12 +123,13 @@ public class PropertyTest extends TestCase {
 		assertNull(property.calculate(attrSrc, parentStyles, styles, emptyAttribute));
 	}
 
+	@Test
 	public void testParsePropertyValue() throws Exception {
 		final Parser parser = StyleSheetReader.createParser();
 		final InputSource source = new InputSource(new StringReader("300px"));
 		final LexicalUnit lexicalUnit = parser.parsePropertyValue(source);
 		assertEquals(LexicalUnit.SAC_PIXEL, lexicalUnit.getLexicalUnitType());
-		assertEquals(300f, lexicalUnit.getFloatValue());
+		assertEquals(300f, lexicalUnit.getFloatValue(), 0f);
 	}
 
 	private static class DummyDisplayDevice extends DisplayDevice {
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/RuleTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/RuleTest.java
index d555061e..91f3ea45 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/RuleTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/RuleTest.java
@@ -10,20 +10,23 @@
  *******************************************************************************/
 package org.eclipse.vex.core.internal.css;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import java.net.URL;
 import java.util.List;
 
-import junit.framework.TestCase;
-
 import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.vex.core.internal.dom.Document;
 import org.eclipse.vex.core.internal.dom.Element;
+import org.junit.Test;
 
 /**
  * Test rule matching.
  */
-public class RuleTest extends TestCase {
+public class RuleTest {
 
+	@Test
 	public void testRuleMatching() throws Exception {
 		final URL url = RuleTest.class.getResource("testRules.css");
 		final StyleSheetReader reader = new StyleSheetReader();
@@ -260,6 +263,7 @@ public class RuleTest extends TestCase {
 		assertFalse(rule.matches(d));
 	}
 
+	@Test
 	public void testWithNamespace() throws Exception {
 		final URL url = RuleTest.class.getResource("testRules.css");
 		final StyleSheetReader reader = new StyleSheetReader();
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/BlockElementBoxTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/BlockElementBoxTest.java
index e8459c02..95047201 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/BlockElementBoxTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/BlockElementBoxTest.java
@@ -10,12 +10,13 @@
  *******************************************************************************/
 package org.eclipse.vex.core.internal.dom;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.List;
 
-import junit.framework.TestCase;
-
 import org.eclipse.vex.core.internal.core.Graphics;
 import org.eclipse.vex.core.internal.css.StyleSheet;
 import org.eclipse.vex.core.internal.css.StyleSheetReader;
@@ -27,8 +28,9 @@ import org.eclipse.vex.core.internal.layout.FakeGraphics;
 import org.eclipse.vex.core.internal.layout.LayoutContext;
 import org.eclipse.vex.core.internal.layout.RootBox;
 import org.eclipse.vex.core.tests.TestResources;
+import org.junit.Test;
 
-public class BlockElementBoxTest extends TestCase {
+public class BlockElementBoxTest {
 
 	private final Graphics g;
 	private final LayoutContext context;
@@ -47,6 +49,7 @@ public class BlockElementBoxTest extends TestCase {
 
 	}
 
+	@Test
 	public void testPositioning() throws Exception {
 
 		final String docString = "<root><small/><medium/><large/></root>";
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/DTDValidatorTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/DTDValidatorTest.java
index 76063df3..5a23556b 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/DTDValidatorTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/DTDValidatorTest.java
@@ -12,25 +12,29 @@
  *******************************************************************************/
 package org.eclipse.vex.core.internal.dom;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import junit.framework.TestCase;
-
 import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.vex.core.internal.validator.AttributeDefinition;
 import org.eclipse.vex.core.internal.validator.WTPVEXValidator;
 import org.eclipse.vex.core.tests.TestResources;
+import org.junit.Before;
+import org.junit.Test;
 
-public class DTDValidatorTest extends TestCase {
+public class DTDValidatorTest {
 
 	private Validator validator = null;
 
-	@Override
-	protected void setUp() {
+	@Before
+	public void setUp() {
 		try {
 			validator = new WTPVEXValidator(TestResources.TEST_DTD);
 		} catch (final Exception ex) {
@@ -38,6 +42,7 @@ public class DTDValidatorTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void testAttributeDefinition() throws Exception {
 		final Document doc = new Document(new QualifiedName(null, "section"));
 		doc.setValidator(validator);
@@ -48,6 +53,7 @@ public class DTDValidatorTest extends TestCase {
 		assertSame(adType, adType2);
 	}
 
+	@Test
 	public void testEnumAttribute() throws Exception {
 		final Document doc = new Document(new QualifiedName(null, "section"));
 		doc.setValidator(validator);
@@ -86,6 +92,7 @@ public class DTDValidatorTest extends TestCase {
 	//		
 	// }
 
+	@Test
 	public void testSectionElement() {
 		// <section> <title> a b </title> <para> </para> </section>
 		// 1 2 3 4 5 6 7
@@ -106,6 +113,7 @@ public class DTDValidatorTest extends TestCase {
 		assertValidItemsAt(doc, 8, "title", "para");
 	}
 
+	@Test
 	public void testOneKindOfChild() {
 		final Document doc = new Document(new QualifiedName(null, "one-kind-of-child"));
 		doc.setValidator(validator);
@@ -132,6 +140,7 @@ public class DTDValidatorTest extends TestCase {
 		assertEquals(expected, validItems);
 	}
 
+	@Test
 	public void testSequences() {
 		assertFullyValidSequence("title", "#PCDATA");
 		assertFullyValidSequence("para", "#PCDATA");
@@ -161,6 +170,7 @@ public class DTDValidatorTest extends TestCase {
 		assertInvalidSequence("document", "preface", "index");
 	}
 
+	@Test
 	public void testValidateDocumentWithDTDAndNamespaces() throws Exception {
 		final Document doc = new Document(new QualifiedName("http://namespace/uri/is/not/registered", "section"));
 		doc.setValidator(validator);
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/io/SpaceNormalizerTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/io/SpaceNormalizerTest.java
index c07aec16..de87f6c4 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/io/SpaceNormalizerTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/io/SpaceNormalizerTest.java
@@ -11,6 +11,10 @@
  *******************************************************************************/
 package org.eclipse.vex.core.internal.io;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -22,8 +26,6 @@ import java.util.List;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
 
-import junit.framework.TestCase;
-
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
@@ -50,21 +52,22 @@ import org.eclipse.vex.core.internal.dom.Node;
 import org.eclipse.vex.core.internal.dom.Text;
 import org.eclipse.vex.core.internal.widget.CssWhitespacePolicy;
 import org.eclipse.vex.core.tests.VEXCoreTestPlugin;
+import org.junit.Before;
+import org.junit.Test;
 import org.osgi.framework.Bundle;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 
-public class SpaceNormalizerTest extends TestCase {
+public class SpaceNormalizerTest {
 
 	protected static IProject fTestProject;
 	private static boolean fTestProjectInitialized;
 	private static final String TEST_PROJECT_NAME = "testproject";
 	private static final String PROJECT_FILES_FOLDER_NAME = "testResources";
 
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
+	@Before
+	public void setUp() throws Exception {
 		DisplayDevice.setCurrent(new MockDisplayDevice(90, 90));
 		if (fTestProjectInitialized) {
 			return;
@@ -171,6 +174,7 @@ public class SpaceNormalizerTest extends TestCase {
 	 * <li>no extraneous spaces before or after elements added</li>
 	 * </ul>
 	 */
+	@Test
 	public void testNormalize() throws Exception {
 
 		final String input = "<doc>\n\t  " + "<block>\n\t foo\n\t <inline>foo\n\t bar</inline>\n\t baz\n\t </block>\n\t " + "<block>\n\t foo\n\t <block>bar</block>\n\t baz</block>"
@@ -212,6 +216,7 @@ public class SpaceNormalizerTest extends TestCase {
 
 	}
 
+	@Test
 	public void testPreNormalize1() throws ParserConfigurationException, SAXException, IOException {
 		// ========= Now test with a PRE element =========
 
@@ -226,6 +231,7 @@ public class SpaceNormalizerTest extends TestCase {
 		assertContent(pre, "\n foo\n");
 	}
 
+	@Test
 	public void testPreNormalize2() throws Exception {
 		// ========= Now test with a PRE element =========
 
@@ -239,6 +245,7 @@ public class SpaceNormalizerTest extends TestCase {
 		assertContent(inline, "\n foo\n bar\n ");
 	}
 
+	@Test
 	public void testPreElementNormalize() throws ParserConfigurationException, SAXException, IOException {
 		// ========= Now test with a PRE element =========
 
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/LayoutTestSuite.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/LayoutTestSuite.java
index cf9b0c5f..c74de8a9 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/LayoutTestSuite.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/LayoutTestSuite.java
@@ -35,6 +35,8 @@ import org.eclipse.vex.core.internal.dom.IWhitespacePolicy;
 import org.eclipse.vex.core.internal.dom.Node;
 import org.eclipse.vex.core.internal.io.DocumentReader;
 import org.eclipse.vex.core.internal.widget.CssWhitespacePolicy;
+import org.junit.runner.RunWith;
+import org.junit.runners.AllTests;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -45,6 +47,7 @@ import org.xml.sax.helpers.DefaultHandler;
  * Runs several suites of layout tests. Each suite is defined in an XML file. The XML files to run are registered in the
  * suite() method.
  */
+@RunWith(AllTests.class)
 public class LayoutTestSuite extends TestCase {
 
 	public String id;
@@ -71,7 +74,7 @@ public class LayoutTestSuite extends TestCase {
 		xmlReader.parse(new InputSource(url.toString()));
 
 		final TestSuite suite = new TestSuite(filename);
-		for (final TestCase test : builder.testCases) {
+		for (final LayoutTestSuite test : builder.testCases) {
 			suite.addTest(test);
 		}
 		return suite;
@@ -87,7 +90,6 @@ public class LayoutTestSuite extends TestCase {
 	}
 
 	public void testLayout() throws Exception {
-
 		final URL url = LayoutTestSuite.class.getResource(css);
 		final StyleSheetReader reader = new StyleSheetReader();
 		final StyleSheet ss = reader.read(url);
@@ -178,7 +180,7 @@ public class LayoutTestSuite extends TestCase {
 
 	private static class TestCaseBuilder extends DefaultHandler {
 
-		private List<TestCase> testCases;
+		private List<LayoutTestSuite> testCases;
 		private String css;
 		private LayoutTestSuite testCase;
 		private BoxSpec boxSpec;
@@ -215,7 +217,7 @@ public class LayoutTestSuite extends TestCase {
 		public void startElement(final String uri, final String localName, final String qName, final Attributes attributes) throws SAXException {
 
 			if (qName.equals("testcases")) {
-				testCases = new ArrayList<TestCase>();
+				testCases = new ArrayList<LayoutTestSuite>();
 				css = attributes.getValue("css");
 				if (css == null) {
 					css = "test.css";
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TableLayoutTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TableLayoutTest.java
index ed3faae8..268483d2 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TableLayoutTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TableLayoutTest.java
@@ -11,19 +11,22 @@
  *******************************************************************************/
 package org.eclipse.vex.core.internal.layout;
 
+import static org.junit.Assert.assertEquals;
+
 import java.util.Arrays;
 import java.util.Stack;
 
-import junit.framework.TestCase;
-
 import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.vex.core.internal.core.DisplayDevice;
 import org.eclipse.vex.core.internal.css.MockDisplayDevice;
 import org.eclipse.vex.core.internal.css.StyleSheet;
 import org.eclipse.vex.core.internal.css.StyleSheetReader;
 import org.eclipse.vex.core.internal.dom.Document;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
-public class TableLayoutTest extends TestCase {
+public class TableLayoutTest {
 
 	private static interface StackVisitor {
 		void visit(StackElement element);
@@ -44,8 +47,8 @@ public class TableLayoutTest extends TestCase {
 	private RootBox rootBox;
 	private int caretPosition;
 
-	@Override
-	protected void setUp() throws Exception {
+	@Before
+	public void setUp() throws Exception {
 
 		// display dummy
 		DisplayDevice.setCurrent(new MockDisplayDevice(90, 90));
@@ -65,8 +68,8 @@ public class TableLayoutTest extends TestCase {
 		resetDocument();
 	}
 
-	@Override
-	protected void tearDown() throws Exception {
+	@After
+	public void tearDown() throws Exception {
 		rootBox = null;
 		document = null;
 		context = null;
@@ -90,6 +93,7 @@ public class TableLayoutTest extends TestCase {
 		caretPosition += text.length();
 	}
 
+	@Test
 	public void testValidTable() throws Exception {
 
 		// single cell Table
@@ -129,73 +133,89 @@ public class TableLayoutTest extends TestCase {
 
 	// table elements outside table (separately tested to improve tracing if
 	// StackOverflowError will be thrown)
+	@Test
 	public void testCaptionOutsideTable() {
 		test("tcap");
 	}
 
+	@Test
 	public void testCellOutsideTable() {
 		test("td");
 	}
 
+	@Test
 	public void testColumnOutsideTable() {
 		test("tc");
 	}
 
+	@Test
 	public void testColumnGroupOutsideTable() {
 		test("tcg");
 	}
 
+	@Test
 	public void testFooterGroupOutsideTable() {
 		test("tfg");
 	}
 
+	@Test
 	public void testHeaderGroupOutsideTable() {
 		test("thg");
 	}
 
+	@Test
 	public void testRowOutsideTable() {
 		test("tr");
 	}
 
+	@Test
 	public void testRowGroupOutsideTable() {
 		test("trg");
 	}
 
 	// invalid nested table elements (separately tested to improve tracing if
 	// StackOverflowError will be thrown)
+	@Test
 	public void testInvalidNesting1() {
 		test("inline", "tcap");
 	}
 
+	@Test
 	public void testInvalidNesting2() {
 		test("table", "td");
 	}
 
+	@Test
 	public void testInvalidNesting3() {
 		test("td", "tr");
 	}
 
+	@Test
 	public void testInvalidNesting4() {
 		test("trg", "trg");
 	}
 
+	@Test
 	public void testInvalidNesting5() {
 		test("tr", "tfg");
 	}
 
+	@Test
 	public void testInvalidNesting6() {
 		test("td", "thg");
 	}
 
+	@Test
 	public void testInvalidNesting7() {
 		test("table", "tc");
 	}
 
+	@Test
 	public void testInvalidNesting8() {
 		test("thg", "tcg");
 	}
 
-	public void test(final String... elements) {
+	private void test(final String... elements) {
 		resetDocument();
 		insertElement("inline");
 		for (final String element : elements) {
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestBlockElementBox.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestBlockElementBox.java
index b9891a5e..c389950f 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestBlockElementBox.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestBlockElementBox.java
@@ -10,17 +10,18 @@
  *******************************************************************************/
 package org.eclipse.vex.core.internal.layout;
 
-import java.net.URL;
+import static org.junit.Assert.assertEquals;
 
-import junit.framework.TestCase;
+import java.net.URL;
 
 import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.vex.core.internal.css.StyleSheet;
 import org.eclipse.vex.core.internal.css.StyleSheetReader;
 import org.eclipse.vex.core.internal.dom.Document;
 import org.eclipse.vex.core.internal.dom.Element;
+import org.junit.Test;
 
-public class TestBlockElementBox extends TestCase {
+public class TestBlockElementBox {
 
 	FakeGraphics g;
 	LayoutContext context;
@@ -38,6 +39,7 @@ public class TestBlockElementBox extends TestCase {
 		context.setStyleSheet(ss);
 	}
 
+	@Test
 	public void testBeforeAfter() throws Exception {
 		final Document doc = new Document(new QualifiedName(null, "root"));
 		final Element root = doc.getRootElement();
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestBlocksInInlines.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestBlocksInInlines.java
index 028accab..e5090129 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestBlocksInInlines.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestBlocksInInlines.java
@@ -12,27 +12,26 @@ package org.eclipse.vex.core.internal.layout;
 
 import java.net.URL;
 
-import junit.framework.TestCase;
-
 import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.vex.core.internal.core.DisplayDevice;
 import org.eclipse.vex.core.internal.css.MockDisplayDevice;
 import org.eclipse.vex.core.internal.css.StyleSheet;
 import org.eclipse.vex.core.internal.css.StyleSheetReader;
 import org.eclipse.vex.core.internal.dom.Document;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * Tests proper function of a block-level element within an inline element. These must be layed out as a block child of
  * the containing block element.
  */
-public class TestBlocksInInlines extends TestCase {
+public class TestBlocksInInlines {
 
 	FakeGraphics g;
 	LayoutContext context;
 
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
+	@Before
+	public void setUp() throws Exception {
 		DisplayDevice.setCurrent(new MockDisplayDevice(90, 90));
 	}
 
@@ -49,6 +48,7 @@ public class TestBlocksInInlines extends TestCase {
 		context.setStyleSheet(ss);
 	}
 
+	@Test
 	public void testBlockInInline() throws Exception {
 		final Document doc = new Document(new QualifiedName(null, "root"));
 		context.setDocument(doc);
@@ -61,6 +61,5 @@ public class TestBlocksInInlines extends TestCase {
 
 		final RootBox rootBox = new RootBox(context, doc, 500);
 		rootBox.layout(context, 0, Integer.MAX_VALUE);
-
 	}
 }
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestDocumentTextBox.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestDocumentTextBox.java
index fa6482aa..cb0a6903 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestDocumentTextBox.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestDocumentTextBox.java
@@ -10,9 +10,11 @@
  *******************************************************************************/
 package org.eclipse.vex.core.internal.layout;
 
-import java.net.URL;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
-import junit.framework.TestCase;
+import java.net.URL;
 
 import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.vex.core.internal.css.StyleSheet;
@@ -21,18 +23,18 @@ import org.eclipse.vex.core.internal.css.Styles;
 import org.eclipse.vex.core.internal.dom.ContentRange;
 import org.eclipse.vex.core.internal.dom.Document;
 import org.eclipse.vex.core.internal.dom.Element;
+import org.junit.Test;
 
 /**
  * Tests the DocumentTestBox class. We focus here on proper offsets, since text splitting is tested thoroughly in
  * TestStaticTextBox.
  */
-public class TestDocumentTextBox extends TestCase {
+public class TestDocumentTextBox {
 
 	FakeGraphics g;
 	LayoutContext context;
 
 	public TestDocumentTextBox() throws Exception {
-
 		final URL url = this.getClass().getResource("test.css");
 		final StyleSheetReader reader = new StyleSheetReader();
 		final StyleSheet ss = reader.read(url);
@@ -45,6 +47,7 @@ public class TestDocumentTextBox extends TestCase {
 		context.setStyleSheet(ss);
 	}
 
+	@Test
 	public void testSplit() throws Exception {
 		final Document doc = new Document(new QualifiedName(null, "root"));
 		final Element root = doc.getRootElement();
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestStaticTextBox.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestStaticTextBox.java
index 41e7a86f..ef662d96 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestStaticTextBox.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestStaticTextBox.java
@@ -10,9 +10,11 @@
  *******************************************************************************/
 package org.eclipse.vex.core.internal.layout;
 
-import java.net.URL;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
-import junit.framework.TestCase;
+import java.net.URL;
 
 import org.eclipse.vex.core.internal.core.DisplayDevice;
 import org.eclipse.vex.core.internal.css.MockDisplayDevice;
@@ -20,18 +22,18 @@ import org.eclipse.vex.core.internal.css.StyleSheet;
 import org.eclipse.vex.core.internal.css.StyleSheetReader;
 import org.eclipse.vex.core.internal.css.Styles;
 import org.eclipse.vex.core.internal.dom.Element;
+import org.junit.Before;
+import org.junit.Test;
 
-public class TestStaticTextBox extends TestCase {
+public class TestStaticTextBox {
 
 	FakeGraphics g;
 	LayoutContext context;
 	Element root = new Element("root");
 	Styles styles;
 
-	@Override
-	protected void setUp() throws Exception {
-		// TODO Auto-generated method stub
-		super.setUp();
+	@Before
+	public void setUp() throws Exception {
 		DisplayDevice.setCurrent(new MockDisplayDevice(90, 90));
 		final URL url = this.getClass().getResource("test.css");
 		final StyleSheetReader reader = new StyleSheetReader();
@@ -48,12 +50,8 @@ public class TestStaticTextBox extends TestCase {
 
 	}
 
-	public TestStaticTextBox() throws Exception {
-
-	}
-
+	@Test
 	public void testSplit() throws Exception {
-
 		final int width = g.getCharWidth();
 
 		final StaticTextBox box = new StaticTextBox(context, root, "baggy orange trousers");
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/tests/ListenerListTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/tests/ListenerListTest.java
index 85f7f139..46d68f47 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/tests/ListenerListTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/tests/ListenerListTest.java
@@ -11,22 +11,25 @@
  *******************************************************************************/
 package org.eclipse.vex.core.tests;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import java.lang.reflect.InvocationTargetException;
 import java.util.EventListener;
 import java.util.EventObject;
 
-import junit.framework.TestCase;
-
 import org.eclipse.vex.core.internal.core.ListenerList;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
-public class ListenerListTest extends TestCase {
+public class ListenerListTest {
 
 	private ListenerList<MockEventListener, EventObject> listenerList;
 	private Exception handledException;
 
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
+	@Before
+	public void setUp() throws Exception {
 		listenerList = new ListenerList<MockEventListener, EventObject>(MockEventListener.class) {
 			@Override
 			public void handleException(final Exception e) {
@@ -35,11 +38,10 @@ public class ListenerListTest extends TestCase {
 		};
 	}
 
-	@Override
-	protected void tearDown() throws Exception {
+	@After
+	public void tearDown() throws Exception {
 		listenerList = null;
 		handledException = null;
-		super.tearDown();
 	}
 
 	public static class MockEventListener implements EventListener {
@@ -63,6 +65,7 @@ public class ListenerListTest extends TestCase {
 
 	}
 
+	@Test
 	public void testListenerInvocation() throws Exception {
 		final MockEventListener eventListener = new MockEventListener();
 
@@ -84,6 +87,7 @@ public class ListenerListTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void testAddRemove() throws Exception {
 		final MockEventListener listener = new MockEventListener();
 		final MockEventListener anotherListener = new MockEventListener();
@@ -105,12 +109,14 @@ public class ListenerListTest extends TestCase {
 		}
 	}
 
+	@Test
 	public void testNoSuchMethod() throws Exception {
 		listenerList.add(new MockEventListener());
 		listenerList.fireEvent("unknownMethod", new EventObject(""));
 		assertTrue(handledException instanceof NoSuchMethodException);
 	}
 
+	@Test
 	public void testExceptionWhileFireEvent() throws Exception {
 		final MockEventListener eventListener = new MockEventListener();
 
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/tests/VEXCoreTestSuite.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/tests/VEXCoreTestSuite.java
index 9f362338..7f6b8bcb 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/tests/VEXCoreTestSuite.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/tests/VEXCoreTestSuite.java
@@ -12,15 +12,6 @@
  *******************************************************************************/
 package org.eclipse.vex.core.tests;
 
-import java.io.IOException;
-
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.eclipse.vex.core.internal.core.AfterNIteratorTest;
 import org.eclipse.vex.core.internal.core.FilterIteratorTest;
 import org.eclipse.vex.core.internal.core.FirstNIteratorTest;
@@ -62,56 +53,17 @@ import org.eclipse.vex.core.internal.widget.L2CommentEditingTest;
 import org.eclipse.vex.core.internal.widget.L2SelectionTest;
 import org.eclipse.vex.core.internal.widget.L2SimpleEditingTest;
 import org.eclipse.vex.core.internal.widget.VexWidgetTest;
-import org.xml.sax.SAXException;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
-public class VEXCoreTestSuite extends TestSuite {
-	public static Test suite() throws ParserConfigurationException, FactoryConfigurationError, IOException, SAXException {
-		return new VEXCoreTestSuite();
-	}
+@RunWith(Suite.class)
+@Suite.SuiteClasses({ FilterIteratorTest.class, FirstNIteratorTest.class, AfterNIteratorTest.class, AxisTest.class, NamespaceStackTest.class, NamespaceTest.class, DocumentReaderTest.class,
+		DocumentContentModelTest.class, SchemaValidatorTest.class, CssTest.class, BatikBehaviorTest.class, RangeTest.class, BasicNodeTest.class, ParentTest.class, DocumentTest.class,
+		L1TextHandlingTest.class, L1CommentHandlingTest.class, L1ElementHandlingTest.class, L1FragmentHandlingTest.class, DocumentFragmentTest.class, CopyVisitorTest.class, DeepCopyTest.class,
+		PropertyTest.class, RuleTest.class, BlockElementBoxTest.class, ImageBoxTest.class, DocumentWriterTest.class, DTDValidatorTest.class, GapContentTest.class, SpaceNormalizerTest.class,
+		TextWrapperTest.class, TestBlockElementBox.class, TestBlocksInInlines.class, TestDocumentTextBox.class, TestStaticTextBox.class, TableLayoutTest.class, LayoutTestSuite.class,
+		ListenerListTest.class, VexWidgetTest.class, L2SimpleEditingTest.class, L2SelectionTest.class, L2CommentEditingTest.class
 
-	public VEXCoreTestSuite() throws ParserConfigurationException, FactoryConfigurationError, IOException, SAXException {
-		super("Vex Core Tests");
-		addTest(new JUnit4TestAdapter(FilterIteratorTest.class));
-		addTest(new JUnit4TestAdapter(FirstNIteratorTest.class));
-		addTest(new JUnit4TestAdapter(AfterNIteratorTest.class));
-		addTest(new JUnit4TestAdapter(AxisTest.class));
-		addTest(new JUnit4TestAdapter(NamespaceStackTest.class));
-		addTest(new JUnit4TestAdapter(NamespaceTest.class));
-		addTest(new JUnit4TestAdapter(DocumentReaderTest.class));
-		addTest(new JUnit4TestAdapter(DocumentContentModelTest.class));
-		addTest(new JUnit4TestAdapter(SchemaValidatorTest.class));
-		addTest(new JUnit4TestAdapter(CssTest.class));
-		addTest(new JUnit4TestAdapter(BatikBehaviorTest.class));
-		addTest(new JUnit4TestAdapter(RangeTest.class));
-		addTest(new JUnit4TestAdapter(BasicNodeTest.class));
-		addTest(new JUnit4TestAdapter(ParentTest.class));
-		addTest(new JUnit4TestAdapter(DocumentTest.class));
-		addTest(new JUnit4TestAdapter(L1TextHandlingTest.class));
-		addTest(new JUnit4TestAdapter(L1CommentHandlingTest.class));
-		addTest(new JUnit4TestAdapter(L1ElementHandlingTest.class));
-		addTest(new JUnit4TestAdapter(L1FragmentHandlingTest.class));
-		addTest(new JUnit4TestAdapter(DocumentFragmentTest.class));
-		addTest(new JUnit4TestAdapter(CopyVisitorTest.class));
-		addTest(new JUnit4TestAdapter(DeepCopyTest.class));
-		addTestSuite(PropertyTest.class);
-		addTestSuite(RuleTest.class);
-		addTestSuite(BlockElementBoxTest.class);
-		addTest(new JUnit4TestAdapter(ImageBoxTest.class));
-		addTest(new JUnit4TestAdapter(DocumentWriterTest.class));
-		addTestSuite(DTDValidatorTest.class);
-		addTest(new JUnit4TestAdapter(GapContentTest.class));
-		addTestSuite(SpaceNormalizerTest.class);
-		addTest(new JUnit4TestAdapter(TextWrapperTest.class));
-		addTestSuite(TestBlockElementBox.class);
-		addTestSuite(TestBlocksInInlines.class);
-		addTestSuite(TestDocumentTextBox.class);
-		addTestSuite(TestStaticTextBox.class);
-		addTestSuite(TableLayoutTest.class);
-		addTest(LayoutTestSuite.suite());
-		addTestSuite(ListenerListTest.class);
-		addTest(new JUnit4TestAdapter(VexWidgetTest.class));
-		addTest(new JUnit4TestAdapter(L2SimpleEditingTest.class));
-		addTest(new JUnit4TestAdapter(L2SelectionTest.class));
-		addTest(new JUnit4TestAdapter(L2CommentEditingTest.class));
-	}
+})
+public class VEXCoreTestSuite {
 }
diff --git a/org.eclipse.vex.releng/vex.psf b/org.eclipse.vex.releng/vex.psf
index 9ae6236c..67638d00 100644
--- a/org.eclipse.vex.releng/vex.psf
+++ b/org.eclipse.vex.releng/vex.psf
@@ -12,7 +12,6 @@
 <project reference="1.0,http://git.eclipse.org/gitroot/mylyn/org.eclipse.mylyn.docs.vex.git,master,org.eclipse.vex.releng"/>

 <project reference="1.0,http://git.eclipse.org/gitroot/mylyn/org.eclipse.mylyn.docs.vex.git,master,org.eclipse.vex.repository"/>

 <project reference="1.0,http://git.eclipse.org/gitroot/mylyn/org.eclipse.mylyn.docs.vex.git,master,org.eclipse.vex.sdk.feature"/>

-<project reference="1.0,http://git.eclipse.org/gitroot/mylyn/org.eclipse.mylyn.docs.vex.git,master,org.eclipse.vex.tests"/>

 <project reference="1.0,http://git.eclipse.org/gitroot/mylyn/org.eclipse.mylyn.docs.vex.git,master,org.eclipse.vex.ui"/>

 <project reference="1.0,http://git.eclipse.org/gitroot/mylyn/org.eclipse.mylyn.docs.vex.git,master,org.eclipse.vex.ui.tests"/>

 <project reference="1.0,http://git.eclipse.org/gitroot/mylyn/org.eclipse.mylyn.docs.vex.git,master,org.eclipse.vex.xhtml"/>

diff --git a/org.eclipse.vex.tests/.classpath b/org.eclipse.vex.tests/.classpath
deleted file mode 100644
index 64c5e31b..00000000
--- a/org.eclipse.vex.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.vex.tests/.gitignore b/org.eclipse.vex.tests/.gitignore
deleted file mode 100644
index 092357e4..00000000
--- a/org.eclipse.vex.tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-bin

diff --git a/org.eclipse.vex.tests/.project b/org.eclipse.vex.tests/.project
deleted file mode 100644
index fa93c293..00000000
--- a/org.eclipse.vex.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.vex.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/org.eclipse.vex.tests/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index ef7ecb54..00000000
--- a/org.eclipse.vex.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Nov 01 00:53:02 GMT 2009
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/org.eclipse.vex.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.vex.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e32a8bcc..00000000
--- a/org.eclipse.vex.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,286 +0,0 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=false

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=120

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=true

-org.eclipse.jdt.core.formatter.join_wrapped_lines=true

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=200

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

diff --git a/org.eclipse.vex.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.vex.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index cf62e3f3..00000000
--- a/org.eclipse.vex.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,109 +0,0 @@
-cleanup.add_default_serial_version_id=true

-cleanup.add_generated_serial_version_id=false

-cleanup.add_missing_annotations=true

-cleanup.add_missing_deprecated_annotations=true

-cleanup.add_missing_methods=true

-cleanup.add_missing_nls_tags=false

-cleanup.add_missing_override_annotations=true

-cleanup.add_missing_override_annotations_interface_methods=true

-cleanup.add_serial_version_id=true

-cleanup.always_use_blocks=true

-cleanup.always_use_parentheses_in_expressions=false

-cleanup.always_use_this_for_non_static_field_access=false

-cleanup.always_use_this_for_non_static_method_access=false

-cleanup.convert_to_enhanced_for_loop=true

-cleanup.correct_indentation=true

-cleanup.format_source_code=true

-cleanup.format_source_code_changes_only=false

-cleanup.make_local_variable_final=true

-cleanup.make_parameters_final=true

-cleanup.make_private_fields_final=true

-cleanup.make_type_abstract_if_missing_method=false

-cleanup.make_variable_declarations_final=true

-cleanup.never_use_blocks=false

-cleanup.never_use_parentheses_in_expressions=true

-cleanup.organize_imports=true

-cleanup.qualify_static_field_accesses_with_declaring_class=false

-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true

-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true

-cleanup.qualify_static_member_accesses_with_declaring_class=true

-cleanup.qualify_static_method_accesses_with_declaring_class=false

-cleanup.remove_private_constructors=true

-cleanup.remove_trailing_whitespaces=true

-cleanup.remove_trailing_whitespaces_all=true

-cleanup.remove_trailing_whitespaces_ignore_empty=false

-cleanup.remove_unnecessary_casts=true

-cleanup.remove_unnecessary_nls_tags=true

-cleanup.remove_unused_imports=true

-cleanup.remove_unused_local_variables=false

-cleanup.remove_unused_private_fields=true

-cleanup.remove_unused_private_members=false

-cleanup.remove_unused_private_methods=true

-cleanup.remove_unused_private_types=true

-cleanup.sort_members=false

-cleanup.sort_members_all=false

-cleanup.use_blocks=true

-cleanup.use_blocks_only_for_return_and_throw=false

-cleanup.use_parentheses_in_expressions=true

-cleanup.use_this_for_non_static_field_access=true

-cleanup.use_this_for_non_static_field_access_only_if_necessary=true

-cleanup.use_this_for_non_static_method_access=true

-cleanup.use_this_for_non_static_method_access_only_if_necessary=true

-cleanup_profile=_Vex

-cleanup_settings_version=2

-eclipse.preferences.version=1

-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true

-formatter_profile=_Vex

-formatter_settings_version=12

-sp_cleanup.add_default_serial_version_id=true

-sp_cleanup.add_generated_serial_version_id=false

-sp_cleanup.add_missing_annotations=true

-sp_cleanup.add_missing_deprecated_annotations=true

-sp_cleanup.add_missing_methods=false

-sp_cleanup.add_missing_nls_tags=false

-sp_cleanup.add_missing_override_annotations=true

-sp_cleanup.add_missing_override_annotations_interface_methods=true

-sp_cleanup.add_serial_version_id=false

-sp_cleanup.always_use_blocks=true

-sp_cleanup.always_use_parentheses_in_expressions=false

-sp_cleanup.always_use_this_for_non_static_field_access=false

-sp_cleanup.always_use_this_for_non_static_method_access=false

-sp_cleanup.convert_to_enhanced_for_loop=true

-sp_cleanup.correct_indentation=true

-sp_cleanup.format_source_code=true

-sp_cleanup.format_source_code_changes_only=false

-sp_cleanup.make_local_variable_final=true

-sp_cleanup.make_parameters_final=true

-sp_cleanup.make_private_fields_final=true

-sp_cleanup.make_type_abstract_if_missing_method=false

-sp_cleanup.make_variable_declarations_final=true

-sp_cleanup.never_use_blocks=false

-sp_cleanup.never_use_parentheses_in_expressions=true

-sp_cleanup.on_save_use_additional_actions=true

-sp_cleanup.organize_imports=true

-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false

-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true

-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true

-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true

-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false

-sp_cleanup.remove_private_constructors=true

-sp_cleanup.remove_trailing_whitespaces=true

-sp_cleanup.remove_trailing_whitespaces_all=true

-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false

-sp_cleanup.remove_unnecessary_casts=true

-sp_cleanup.remove_unnecessary_nls_tags=true

-sp_cleanup.remove_unused_imports=true

-sp_cleanup.remove_unused_local_variables=false

-sp_cleanup.remove_unused_private_fields=true

-sp_cleanup.remove_unused_private_members=false

-sp_cleanup.remove_unused_private_methods=true

-sp_cleanup.remove_unused_private_types=true

-sp_cleanup.sort_members=false

-sp_cleanup.sort_members_all=false

-sp_cleanup.use_blocks=true

-sp_cleanup.use_blocks_only_for_return_and_throw=false

-sp_cleanup.use_parentheses_in_expressions=true

-sp_cleanup.use_this_for_non_static_field_access=true

-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true

-sp_cleanup.use_this_for_non_static_method_access=true

-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

diff --git a/org.eclipse.vex.tests/META-INF/MANIFEST.MF b/org.eclipse.vex.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index d6fc4a6d..00000000
--- a/org.eclipse.vex.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.vex.tests;singleton:=true
-Bundle-Version: 1.1.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Localization: plugin
-Require-Bundle: org.junit;bundle-version="3.8.1",
- org.eclipse.vex.core.tests;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.vex.ui.tests;bundle-version="[1.0.0,2.0.0)"
-Export-Package: org.eclipse.vex.tests
-Bundle-ClassPath: .
diff --git a/org.eclipse.vex.tests/about.html b/org.eclipse.vex.tests/about.html
deleted file mode 100644
index 2199df3f..00000000
--- a/org.eclipse.vex.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/org.eclipse.vex.tests/build.properties b/org.eclipse.vex.tests/build.properties
deleted file mode 100644
index 74f90d93..00000000
--- a/org.eclipse.vex.tests/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties,\
-               test.xml,\
-               about.html
-source.. = src/
diff --git a/org.eclipse.vex.tests/plugin.properties b/org.eclipse.vex.tests/plugin.properties
deleted file mode 100644
index fd079445..00000000
--- a/org.eclipse.vex.tests/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 David Carver and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     David Carver - initial API and implementation
-###############################################################################
-pluginName= Vex Tests
-providerName= Eclipse.org
diff --git a/org.eclipse.vex.tests/src/org/eclipse/vex/tests/AllTestsSuite.java b/org.eclipse.vex.tests/src/org/eclipse/vex/tests/AllTestsSuite.java
deleted file mode 100644
index f8038917..00000000
--- a/org.eclipse.vex.tests/src/org/eclipse/vex/tests/AllTestsSuite.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail and others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Carver (STAR) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.vex.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.vex.ui.tests.VexUiTestSuite;
-
-/**
- * This class specifies all the bundles of this component that provide a test suite to run during automated testing.
- */
-public class AllTestsSuite extends TestSuite {
-
-	public AllTestsSuite() {
-		super("All Vex Test Suites"); //$NON-NLS-1$
-		//		addTest(VEXCoreTestSuite.suite());
-		addTest(VexUiTestSuite.suite());
-	}
-
-	/**
-	 * This is just need to run in a development environment workbench.
-	 */
-	public void testAll() {
-		// this method needs to exist, but doesn't really do anything
-		// other than to signal to create an instance of this class.
-		// The rest it automatic from the tests added in constructor.
-	}
-
-	/**
-	 * Enable tests to run under JUnit 4 (see bug 300951).
-	 * 
-	 * @return all Vex tests (only required by JUnit 4)
-	 */
-	public static Test suite() {
-		return new AllTestsSuite();
-	}
-
-}
diff --git a/org.eclipse.vex.tests/test.xml b/org.eclipse.vex.tests/test.xml
deleted file mode 100644
index f9978428..00000000
--- a/org.eclipse.vex.tests/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
-    name="testsuite"
-    default="run"
-    basedir=".">
-    
-    <!-- The following properties should be passed into this script -->
-    <!-- ${eclipse-home}   -->
-    <!-- ${buildDirectory}  -->
-    <!-- ${buildLabel}        -->
-
-    <!-- should be little need to change what's above  -->
-    
-    <property
-        name="plugin-name"
-        value="org.eclipse.vex.tests" />
-    <property
-        name="classname"
-        value="org.eclipse.vex.tests.AllTestsSuite" />
-    <property
-        name="testType"
-        value="ui-test" />
-
-    <!-- should be little need to change what's below -->
-
-    <echo message="basedir: ${basedir}" />
-    <echo message="eclipse-home: ${eclipse-home}" />
-    <echo message="buildDirectory: ${buildDirectory}" />
-    <echo message="plugin-name: ${plugin-name}" />
-    <echo message="classname: ${classname}" />
-    <echo message="testType ${testType}" />
-
-
-    <property
-        name="library-file"
-        value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-    <property
-        name="workspace"
-        value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-        
-    <!-- This target holds all initialization code that needs to be done for -->
-    <!-- all tests that are to be run. Initialization for individual tests -->
-    <!-- should be done within the body of the suite target. -->
-    <target name="init">
-        <tstamp />
-        <delete>
-            <fileset
-                dir="${eclipse-home}"
-                includes="${plugin-name}.*xml" />
-        </delete>
-        <!-- make directory, in case path doesn't exist yet -->
-        <mkdir dir="${workspace}" />
-        <!--  but delete to make sure fresh contents-->
-        <delete
-            dir="${workspace}"
-            quiet="true" />
-
-    </target>
-
-    <!-- This target defines the tests that need to be run. -->
-    <target name="suite">
-
-        <ant
-            target="${testType}"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="data-dir"
-                value="${workspace}" />
-            <property
-                name="plugin-name"
-                value="${plugin-name}" />
-            <property
-                name="classname"
-                value="${classname}" />
-            <property
-                name="plugin-path"
-                value="${eclipse-home}/plugins/${plugin-name}" />
-        </ant>
-
-        <copy
-            failonerror="false"
-            file="${workspace}/.metadata/.log"
-            tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
-    </target>
-
-    <!-- This target holds code to cleanup the testing environment after -->
-    <!-- after all of the tests have been run. You can use this target to -->
-    <!-- delete temporary files that have been created. -->
-    <target name="cleanup">
-        <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
-        <!-- <delete dir="${workspace}" quiet="true" /> -->
-    </target>
-
-    <!-- This target runs the test suite. Any actions that need to happen -->
-    <!-- after all the tests have been run should go here. -->
-    <target
-        name="run"
-        depends="init,suite,cleanup">
-        <ant
-            target="collect"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="includes"
-                value="${plugin-name}.*xml" />
-            <property
-                name="output-file"
-                value="${plugin-name}.xml" />
-        </ant>
-    </target>
-
-</project>
\ No newline at end of file
diff --git a/org.eclipse.vex.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.vex.ui.tests/META-INF/MANIFEST.MF
index 289d6bdd..838b08a8 100644
--- a/org.eclipse.vex.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.vex.ui.tests/META-INF/MANIFEST.MF
@@ -15,7 +15,6 @@ Require-Bundle: org.eclipse.ui,
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.vex.ui.internal.config.tests;x-internal:=true,
  org.eclipse.vex.ui.internal.editor.tests;x-internal:=true,
- org.eclipse.vex.ui.internal.tests;x-internal:=true,
  org.eclipse.vex.ui.tests
 Bundle-Localization: plugin
 Bundle-ClassPath: .
diff --git a/org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/internal/editor/tests/FindReplaceTargetTest.java b/org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/internal/editor/tests/FindReplaceTargetTest.java
index a43d35df..39b2f058 100644
--- a/org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/internal/editor/tests/FindReplaceTargetTest.java
+++ b/org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/internal/editor/tests/FindReplaceTargetTest.java
@@ -10,15 +10,20 @@
  *******************************************************************************/

 package org.eclipse.vex.ui.internal.editor.tests;

 

-import java.util.regex.PatternSyntaxException;

+import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.assertFalse;

+import static org.junit.Assert.assertTrue;

+import static org.junit.Assert.fail;

 

-import junit.framework.TestCase;

+import java.util.regex.PatternSyntaxException;

 

 import org.eclipse.swt.graphics.Point;

 import org.eclipse.vex.ui.internal.editor.AbstractRegExFindReplaceTarget;

+import org.junit.After;

+import org.junit.Assert;

+import org.junit.Test;

 

-@SuppressWarnings("restriction")

-public class FindReplaceTargetTest extends TestCase {

+public class FindReplaceTargetTest {

 

 	private static enum Direction {

 		FORWARD, BACKWARD

@@ -75,8 +80,8 @@ public class FindReplaceTargetTest extends TestCase {
 

 	}

 

-	@Override

-	protected void tearDown() throws Exception {

+	@After

+	public void tearDown() throws Exception {

 		finder = null;

 		findString = null;

 		content = null;

@@ -114,9 +119,9 @@ public class FindReplaceTargetTest extends TestCase {
 	 *            content with the expected selection which is market by square brackets; example: {code

 	 *            "xyz [selected] ..."}

 	 */

-	private void findAndAssertEquals(final String expected) {

+	private void findAndAssertSelectedTextEquals(final String expected) {

 		find();

-		assertEquals(expected);

+		assertSelectedTextEquals(expected);

 	}

 

 	/**

@@ -124,7 +129,7 @@ public class FindReplaceTargetTest extends TestCase {
 	 *            content with the expected selection which is market by square brackets; example: {code

 	 *            "xyz [selected] ..."}

 	 */

-	private void assertEquals(final String expected) {

+	private void assertSelectedTextEquals(final String expected) {

 		final int start = expected.indexOf('[');

 		final int end = expected.indexOf(']') - 1;

 		assertTrue("selection must marked by square brackets: [...]", start >= 0 && end >= 0 && end >= start);

@@ -146,6 +151,7 @@ public class FindReplaceTargetTest extends TestCase {
 		return result >= 0;

 	}

 

+	@Test

 	public void testSelection() throws Exception {

 		Point selection = null;

 

@@ -164,145 +170,154 @@ public class FindReplaceTargetTest extends TestCase {
 		assertEquals("BB", finder.getSelectionText());

 	}

 

+	@Test

 	public void testEnablement() throws Exception {

 		setUp("abc");

 		assertTrue(finder.canPerformFind());

 		assertTrue(finder.isEditable());

 	}

 

+	@Test

 	public void testFind() throws Exception {

 		setUp("aAa.bBb.cCc");

 		setFindOptions("a", Direction.FORWARD, Case.SENSITVE, WholeWord.OFF);

 

-		findAndAssertEquals("[a]Aa.bBb.cCc");

-		findAndAssertEquals("aA[a].bBb.cCc");

+		findAndAssertSelectedTextEquals("[a]Aa.bBb.cCc");

+		findAndAssertSelectedTextEquals("aA[a].bBb.cCc");

 		assertFalse(find());

 		direction = Direction.BACKWARD;

-		findAndAssertEquals("[a]Aa.bBb.cCc");

+		findAndAssertSelectedTextEquals("[a]Aa.bBb.cCc");

 		assertFalse(find());

 

 		// in 'Wrap search' offset may be -1 ...

 		setUp("abba", -1, -1);

 		setFindOptions("a", Direction.FORWARD, Case.SENSITVE, WholeWord.OFF);

-		findAndAssertEquals("[a]bba");

-		findAndAssertEquals("abb[a]");

+		findAndAssertSelectedTextEquals("[a]bba");

+		findAndAssertSelectedTextEquals("abb[a]");

 		assertFalse(find());

 

 		// ... and in backward -1 means find from the end

 		setUp("abba", -1, -1);

 		setFindOptions("a", Direction.BACKWARD, Case.SENSITVE, WholeWord.OFF);

-		findAndAssertEquals("abb[a]");

-		findAndAssertEquals("[a]bba");

+		findAndAssertSelectedTextEquals("abb[a]");

+		findAndAssertSelectedTextEquals("[a]bba");

 		assertFalse(find());

 	}

 

+	@Test

 	public void testFindWithSpecialChars() throws Exception {

 		// '.' (in regular expression a special char):

 		setUp("aAa.bBb.cCc");

 		setFindOptions(".", Direction.FORWARD, Case.SENSITVE, WholeWord.OFF);

-		findAndAssertEquals("aAa[.]bBb.cCc");

-		findAndAssertEquals("aAa.bBb[.]cCc");

+		findAndAssertSelectedTextEquals("aAa[.]bBb.cCc");

+		findAndAssertSelectedTextEquals("aAa.bBb[.]cCc");

 		assertFalse(find());

 		direction = Direction.BACKWARD;

-		findAndAssertEquals("aAa[.]bBb.cCc");

+		findAndAssertSelectedTextEquals("aAa[.]bBb.cCc");

 		assertFalse(find());

 	}

 

+	@Test

 	public void testFindCaseInsensitive() throws Exception {

 		setUp("ab1 AB1 xxx Ab1 aB1 yyy");

 		setFindOptions("Ab1", Direction.FORWARD, Case.INSENSITVE, WholeWord.OFF);

-		findAndAssertEquals("[ab1] AB1 xxx Ab1 aB1 yyy");

-		findAndAssertEquals("ab1 [AB1] xxx Ab1 aB1 yyy");

-		findAndAssertEquals("ab1 AB1 xxx [Ab1] aB1 yyy");

-		findAndAssertEquals("ab1 AB1 xxx Ab1 [aB1] yyy");

+		findAndAssertSelectedTextEquals("[ab1] AB1 xxx Ab1 aB1 yyy");

+		findAndAssertSelectedTextEquals("ab1 [AB1] xxx Ab1 aB1 yyy");

+		findAndAssertSelectedTextEquals("ab1 AB1 xxx [Ab1] aB1 yyy");

+		findAndAssertSelectedTextEquals("ab1 AB1 xxx Ab1 [aB1] yyy");

 		assertFalse(find());

 

 		// crosscheck: case-sensitive

 		setFindOptions("Ab1", Direction.BACKWARD, Case.SENSITVE, WholeWord.OFF);

-		findAndAssertEquals("ab1 AB1 xxx [Ab1] aB1 yyy");

+		findAndAssertSelectedTextEquals("ab1 AB1 xxx [Ab1] aB1 yyy");

 		assertFalse(find());

 	}

 

+	@Test

 	public void testFindWholeWord() throws Exception {

 

 		// including special chars and German umlauts: sharp s = \u00df

 		//                                             ae      = \u00e4

 		setUp("xx aa xx xyx xx-cc a-xx%c \u00e4xx xx\u00df xx");

 		setFindOptions("xx", Direction.FORWARD, Case.SENSITVE, WholeWord.ON);

-		findAndAssertEquals("[xx] aa xx xyx xx-cc a-xx%c \u00e4xx xx\u00df xx");

-		findAndAssertEquals("xx aa [xx] xyx xx-cc a-xx%c \u00e4xx xx\u00df xx");

-		findAndAssertEquals("xx aa xx xyx [xx]-cc a-xx%c \u00e4xx xx\u00df xx");

-		findAndAssertEquals("xx aa xx xyx xx-cc a-[xx]%c \u00e4xx xx\u00df xx");

-		findAndAssertEquals("xx aa xx xyx xx-cc a-xx%c \u00e4xx xx\u00df [xx]");

+		findAndAssertSelectedTextEquals("[xx] aa xx xyx xx-cc a-xx%c \u00e4xx xx\u00df xx");

+		findAndAssertSelectedTextEquals("xx aa [xx] xyx xx-cc a-xx%c \u00e4xx xx\u00df xx");

+		findAndAssertSelectedTextEquals("xx aa xx xyx [xx]-cc a-xx%c \u00e4xx xx\u00df xx");

+		findAndAssertSelectedTextEquals("xx aa xx xyx xx-cc a-[xx]%c \u00e4xx xx\u00df xx");

+		findAndAssertSelectedTextEquals("xx aa xx xyx xx-cc a-xx%c \u00e4xx xx\u00df [xx]");

 		assertFalse(find());

 

 		// crosscheck: backward; 'Whole word' disabled

 		setFindOptions("xx", Direction.BACKWARD, Case.SENSITVE, WholeWord.OFF);

-		findAndAssertEquals("xx aa xx xyx xx-cc a-xx%c \u00e4xx [xx]\u00df xx");

-		findAndAssertEquals("xx aa xx xyx xx-cc a-xx%c \u00e4[xx] xx\u00df xx");

-		findAndAssertEquals("xx aa xx xyx xx-cc a-[xx]%c \u00e4xx xx\u00df xx");

-		findAndAssertEquals("xx aa xx xyx [xx]-cc a-xx%c \u00e4xx xx\u00df xx");

-		findAndAssertEquals("xx aa [xx] xyx xx-cc a-xx%c \u00e4xx xx\u00df xx");

+		findAndAssertSelectedTextEquals("xx aa xx xyx xx-cc a-xx%c \u00e4xx [xx]\u00df xx");

+		findAndAssertSelectedTextEquals("xx aa xx xyx xx-cc a-xx%c \u00e4[xx] xx\u00df xx");

+		findAndAssertSelectedTextEquals("xx aa xx xyx xx-cc a-[xx]%c \u00e4xx xx\u00df xx");

+		findAndAssertSelectedTextEquals("xx aa xx xyx [xx]-cc a-xx%c \u00e4xx xx\u00df xx");

+		findAndAssertSelectedTextEquals("xx aa [xx] xyx xx-cc a-xx%c \u00e4xx xx\u00df xx");

 	}

 

+	@Test

 	public void testFindRegEx() throws Exception {

 		setUp("h2o h5o h42o hoo h234o h3O");

 		setRegExOptions("h[2-4]{1,2}o", Direction.FORWARD, Case.SENSITVE);

-		findAndAssertEquals("[h2o] h5o h42o hoo h234o h3O");

-		findAndAssertEquals("h2o h5o [h42o] hoo h234o h3O");

+		findAndAssertSelectedTextEquals("[h2o] h5o h42o hoo h234o h3O");

+		findAndAssertSelectedTextEquals("h2o h5o [h42o] hoo h234o h3O");

 		assertFalse(find());

 

 		// case-insensitive

 		caseSensitiveness = Case.INSENSITVE;

-		findAndAssertEquals("h2o h5o h42o hoo h234o [h3O]");

+		findAndAssertSelectedTextEquals("h2o h5o h42o hoo h234o [h3O]");

 		assertFalse(find());

 

 		// backward

 		direction = Direction.BACKWARD;

 		caseSensitiveness = Case.SENSITVE;

-		findAndAssertEquals("h2o h5o [h42o] hoo h234o h3O");

-		findAndAssertEquals("[h2o] h5o h42o hoo h234o h3O");

+		findAndAssertSelectedTextEquals("h2o h5o [h42o] hoo h234o h3O");

+		findAndAssertSelectedTextEquals("[h2o] h5o h42o hoo h234o h3O");

 		assertFalse(find());

 	}

 

+	@Test

 	public void testReplace() throws Exception {

 		setUp("He__o W____!");

 		setFindOptions("__", Direction.FORWARD, Case.SENSITVE, WholeWord.OFF);

 

 		// a) replacement of same length than selection

-		findAndAssertEquals("He[__]o W____!");

+		findAndAssertSelectedTextEquals("He[__]o W____!");

 		finder.replaceSelection("ll");

-		assertEquals("He[ll]o W____!");

+		assertSelectedTextEquals("He[ll]o W____!");

 

 		// b) replacement shorter than selection

-		findAndAssertEquals("Hello W[__]__!");

+		findAndAssertSelectedTextEquals("Hello W[__]__!");

 		finder.replaceSelection("o");

-		assertEquals("Hello W[o]__!");

+		assertSelectedTextEquals("Hello W[o]__!");

 

 		// c) replacement longer than selection

-		findAndAssertEquals("Hello Wo[__]!");

+		findAndAssertSelectedTextEquals("Hello Wo[__]!");

 		finder.replaceSelection("rld");

-		assertEquals("Hello Wo[rld]!");

+		assertSelectedTextEquals("Hello Wo[rld]!");

 

 		// nothing selected: nothing must be happen

 		setUp("abc", -1, -1);

 		finder.replaceSelection("x");

-		assertEquals(-1, selectionStart);

-		assertEquals(-1, selectionEnd);

-		assertEquals("abc", content);

+		Assert.assertEquals(-1, selectionStart);

+		Assert.assertEquals(-1, selectionEnd);

+		Assert.assertEquals("abc", content);

 	}

 

+	@Test

 	public void testRegExReplace() throws Exception {

 		setUp("Hello World!", 0, 1);

 		setRegExOptions("(.)(l+)", Direction.FORWARD, Case.SENSITVE);

 

-		findAndAssertEquals("H[ell]o World!");

+		findAndAssertSelectedTextEquals("H[ell]o World!");

 		finder.replaceSelection("$1_$2", true);

-		assertEquals("H[e_ll]o World!");

-		findAndAssertEquals("He_llo Wo[rl]d!");

+		assertSelectedTextEquals("H[e_ll]o World!");

+		findAndAssertSelectedTextEquals("He_llo Wo[rl]d!");

 		finder.replaceSelection("$2$1", true);

 	}

 

+	@Test

 	public void testRegExReplaceThrowsIllegalStateException() throws Exception {

 		setUp("Hello World!", 0, 1);

 		setRegExOptions("(.)(l+)", Direction.FORWARD, Case.SENSITVE);

@@ -337,6 +352,7 @@ public class FindReplaceTargetTest extends TestCase {
 		}

 	}

 

+	@Test

 	public void testRegExReplaceThrowsPatternSyntaxException() throws Exception {

 		setUp("abcde", 0, 1);

 		setRegExOptions("(.)", Direction.FORWARD, Case.SENSITVE);

diff --git a/org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/internal/tests/ResourceTrackerTest.java b/org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/internal/tests/ResourceTrackerTest.java
deleted file mode 100644
index 5c1256bf..00000000
--- a/org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/internal/tests/ResourceTrackerTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 John Krasnay and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     John Krasnay - initial API and implementation
- *******************************************************************************/
-package org.eclipse.vex.ui.internal.tests;
-
-import junit.framework.TestCase;
-
-/**
- * Test the ResourceTracker class.
- */
-public class ResourceTrackerTest extends TestCase {
-
-	public void testAll() throws Exception {
-		// as a placeholder, always return "passed", until real tests filled in
-		assertTrue(true);
-	}
-}
diff --git a/org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/tests/VexUiTestSuite.java b/org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/tests/VexUiTestSuite.java
index e5f7e020..55f138ba 100644
--- a/org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/tests/VexUiTestSuite.java
+++ b/org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/tests/VexUiTestSuite.java
@@ -10,32 +10,15 @@
  *******************************************************************************/
 package org.eclipse.vex.ui.tests;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.eclipse.vex.ui.internal.config.tests.ConfigLoaderJobTest;
 import org.eclipse.vex.ui.internal.config.tests.ConfigurationRegistryTest;
 import org.eclipse.vex.ui.internal.editor.tests.FindReplaceTargetTest;
 import org.eclipse.vex.ui.internal.namespace.tests.EditNamespacesControllerTest;
 import org.eclipse.vex.ui.internal.swt.tests.DocumentFragmentTransferTest;
-import org.eclipse.vex.ui.internal.tests.ResourceTrackerTest;
-
-public class VexUiTestSuite extends TestSuite {
-
-	public static Test suite() {
-		return new VexUiTestSuite();
-	}
-
-	public VexUiTestSuite() {
-		super("Vex UI Tests"); //$NON-NLS-1$
-		addTest(new JUnit4TestAdapter(ConfigLoaderJobTest.class));
-		addTest(new JUnit4TestAdapter(ConfigurationRegistryTest.class));
-		addTest(new JUnit4TestAdapter(EditNamespacesControllerTest.class));
-		addTest(new JUnit4TestAdapter(DocumentFragmentTransferTest.class));
-		//		addTestSuite(IconTest.class);
-		addTestSuite(FindReplaceTargetTest.class);
-		addTestSuite(ResourceTrackerTest.class);
-	}
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
+@RunWith(Suite.class)
+@Suite.SuiteClasses({ ConfigLoaderJobTest.class, ConfigurationRegistryTest.class, EditNamespacesControllerTest.class, DocumentFragmentTransferTest.class, FindReplaceTargetTest.class })
+public class VexUiTestSuite {
 }