Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorteicher2006-09-15 14:55:03 +0000
committerteicher2006-09-15 14:55:03 +0000
commit8d1c95221d19e41b3245ea0edc0dcc4156be10d1 (patch)
tree64fc2003e8446ddb05ae4fec34b251d3e2ac3e47 /org.eclipse.ui.workbench.texteditor.tests
parent4d938b3bf0ebd3a7428822fbf7b46a0d2c2ac017 (diff)
downloadeclipse.platform.text-8d1c95221d19e41b3245ea0edc0dcc4156be10d1.tar.gz
eclipse.platform.text-8d1c95221d19e41b3245ea0edc0dcc4156be10d1.tar.xz
eclipse.platform.text-8d1c95221d19e41b3245ea0edc0dcc4156be10d1.zip
128171 Enable or remove DiffApplierTest - re-enable the test once more
Diffstat (limited to 'org.eclipse.ui.workbench.texteditor.tests')
-rw-r--r--org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java3
-rw-r--r--org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/DiffApplierTest.java6
2 files changed, 3 insertions, 6 deletions
diff --git a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java
index fe6387ddb1c..f770c50bc10 100644
--- a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java
+++ b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java
@@ -15,6 +15,7 @@ import junit.framework.TestSuite;
import org.eclipse.ui.workbench.texteditor.quickdiff.tests.DiffTestSuite;
import org.eclipse.ui.workbench.texteditor.tests.revisions.ChangeRegionTest;
+import org.eclipse.ui.workbench.texteditor.tests.revisions.DiffApplierTest;
import org.eclipse.ui.workbench.texteditor.tests.revisions.RangeTest;
import org.eclipse.ui.workbench.texteditor.tests.rulers.RulerTestSuite;
@@ -36,7 +37,7 @@ public class WorkbenchTextEditorTestSuite extends TestSuite {
suite.addTest(RulerTestSuite.suite());
// XXX: see https://bugs.eclipse.org/bugs/show_bug.cgi?id=128171
-// suite.addTest(DiffApplierTest.suite());
+ suite.addTest(DiffApplierTest.suite());
//$JUnit-END$
return suite;
diff --git a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/DiffApplierTest.java b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/DiffApplierTest.java
index c1a27ab1691..71017fe7e65 100644
--- a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/DiffApplierTest.java
+++ b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/DiffApplierTest.java
@@ -263,10 +263,6 @@ public class DiffApplierTest extends TestCase {
differ.setReferenceProvider(fReferenceProvider);
}
- static boolean equals(ILineRange one, ILineRange two) {
- return one.getStartLine() == two.getStartLine() && one.getNumberOfLines() == two.getNumberOfLines();
- }
-
private static class MyRevision extends Revision {
public String getId() {
return null;
@@ -314,7 +310,7 @@ public class DiffApplierTest extends TestCase {
}
/**
- * Returns true if the differ becomes synchronized before MAX_WAITelapses, false otherwise.
+ * Returns true if the differ becomes synchronized before MAX_WAIT elapses, false otherwise.
*
* @return the true if the differ synchronized
* @throws InterruptedException

Back to the top