Bug 487180 - Adapt to platform text tests moving to JUnit 4

Make JavaPairMatcherTest JUnit 4 one and use JUnit4TestAdapter in
JdtTextTestSuite to run it.

Change-Id: Ic1e15242da2fd574bfcc8857c1ff2effecac9754
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

2 files changed, 11 insertions, 13 deletions

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaPairMatcherTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaPairMatcherTest.java
index 901a4f6ba7..93c08ebe17 100644
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaPairMatcherTest.java
+++ b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaPairMatcherTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 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
@@ -11,8 +11,9 @@
  *******************************************************************************/
 package org.eclipse.jdt.text.tests;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.After;
+import org.junit.Before;
+import static org.junit.Assert.*;
 
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
@@ -52,8 +53,8 @@ public class JavaPairMatcherTest extends AbstractPairMatcherTest {
 		return new JavaPairMatcher(chars.toCharArray());
 	}
 
-	@Override
-	protected void setUp() {
+	@Before
+	public void setUp() {
 		Document document= new Document("xx(yy(xx)yy)xx()/*  */");
 		String[] types= new String[] {
 				IJavaPartitions.JAVA_DOC,
@@ -71,12 +72,8 @@ public class JavaPairMatcherTest extends AbstractPairMatcherTest {
 		fPairMatcher= new JavaPairMatcher(new char[] { '(', ')' });
 	}
 
-	public static Test suite() {
-		return new TestSuite(JavaPairMatcherTest.class);
-	}
-
-	@Override
-	protected void tearDown () {
+	@After
+	public void tearDown () {
 		fDocument= null;
 		fPairMatcher= null;
 	}
diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JdtTextTestSuite.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JdtTextTestSuite.java
index 044a9ffbaf..356378c20f 100644
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JdtTextTestSuite.java
+++ b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JdtTextTestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 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
@@ -15,6 +15,7 @@ import org.eclipse.jdt.text.tests.contentassist.ContentAssistTestSuite;
 import org.eclipse.jdt.text.tests.spelling.SpellingTestSuite;
 import org.eclipse.jdt.text.tests.templates.TemplatesTestSuite;
 
+import junit.framework.JUnit4TestAdapter;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
@@ -35,7 +36,7 @@ public class JdtTextTestSuite {
 		suite.addTestSuite(JavaBreakIteratorTest.class);
 		suite.addTest(JavaParameterListValidatorTest.suite());
 		suite.addTest(JavaDoc2HTMLTextReaderTester.suite());
-		suite.addTest(JavaPairMatcherTest.suite());
+		suite.addTest(new JUnit4TestAdapter(JavaPairMatcherTest.class));
 		suite.addTest(JavaPartitionerExtensionTest.suite());
 		suite.addTest(JavaColoringTest.suite());
 		suite.addTest(SmartSemicolonAutoEditStrategyTest.suite());