Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Keller2016-02-15 07:25:21 -0500
committerMarkus Keller2016-04-04 16:12:23 -0400
commitbf92a4cb5abe8883e4e875a2e841279558dc657b (patch)
treee81b79d5c0de87b44e13120e7cb559122d7c2f34 /org.eclipse.jface.text.tests
parent6820a987eaf2d9ee917064486a01eeff5339b906 (diff)
downloadeclipse.platform.text-bf92a4cb5abe8883e4e875a2e841279558dc657b.tar.gz
eclipse.platform.text-bf92a4cb5abe8883e4e875a2e841279558dc657b.tar.xz
eclipse.platform.text-bf92a4cb5abe8883e4e875a2e841279558dc657b.zip
Bug 487095: Move test bundles to JUnit 4Y20160407-1000I20160405-0800
- implement JUnitSourceSetup as ExternalResource - clean up test suites - update manifests - use @Rule TestName to access test method names FindReplaceDialogTest: - fix test order - fix wrong @Before tearDown() Change-Id: Ibae60f592ea81dbbf2fab0db8daf64f92301dcdd
Diffstat (limited to 'org.eclipse.jface.text.tests')
-rw-r--r--org.eclipse.jface.text.tests/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/AbstractPairMatcherTest.java2
-rw-r--r--org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/JFaceTextTestSuite.java34
3 files changed, 20 insertions, 18 deletions
diff --git a/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF b/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF
index c706fce5f..3fdcd1f40 100644
--- a/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Export-Package:
Require-Bundle:
org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)",
org.eclipse.jface;bundle-version="[3.5.0,4.0.0)",
- org.junit;bundle-version="3.8.2",
+ org.junit;bundle-version="4.12.0",
org.eclipse.text.tests;bundle-version="[3.5.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/AbstractPairMatcherTest.java b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/AbstractPairMatcherTest.java
index 1e26325de..43f56757f 100644
--- a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/AbstractPairMatcherTest.java
+++ b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/AbstractPairMatcherTest.java
@@ -44,7 +44,7 @@ import org.eclipse.jface.text.source.ICharacterPairMatcherExtension;
*/
public abstract class AbstractPairMatcherTest {
- private boolean fCaretEitherSideOfBracket;
+ private final boolean fCaretEitherSideOfBracket;
public AbstractPairMatcherTest(boolean caretEitherSideOfBracket) {
fCaretEitherSideOfBracket= caretEitherSideOfBracket;
diff --git a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/JFaceTextTestSuite.java b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/JFaceTextTestSuite.java
index a58187309..b8a47db32 100644
--- a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/JFaceTextTestSuite.java
+++ b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/JFaceTextTestSuite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2014 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
@@ -29,21 +29,23 @@ import org.eclipse.jface.text.tests.rules.WordRuleTest;
*/
@RunWith(Suite.class)
@SuiteClasses({
- HTML2TextReaderTest.class,
- TextHoverPopupTest.class,
- TextPresentationTest.class,
- DefaultUndoManagerTest.class,
- TextViewerTest.class,
- TextViewerUndoManagerTest.class,
- DefaultPairMatcherTest.class,
- DefaultPairMatcherTest2.class,
- AbstractReconcilerTest.class,
- DefaultPartitionerTest.class,
- DefaultPartitionerZeroLengthTest.class,
- FastPartitionerTest.class,
- ScannerColumnTest.class,
- WordRuleTest.class
+ HTML2TextReaderTest.class,
+ TextHoverPopupTest.class,
+ TextPresentationTest.class,
+ DefaultUndoManagerTest.class,
+ TextViewerTest.class,
+ TextViewerUndoManagerTest.class,
+ DefaultPairMatcherTest.class,
+ DefaultPairMatcherTest2.class,
+
+ AbstractReconcilerTest.class,
+
+ DefaultPartitionerTest.class,
+ DefaultPartitionerZeroLengthTest.class,
+ FastPartitionerTest.class,
+ ScannerColumnTest.class,
+ WordRuleTest.class
})
public class JFaceTextTestSuite {
-// intentionally left empty
+ // see @SuiteClasses
}

Back to the top