summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Aubry2012-07-20 05:22:23 (EDT)
committer sbernard2012-07-24 08:40:59 (EDT)
commit672c70087538d1906e3d8bdb401f3e4628f59125 (patch)
tree42a6ec14e56640ce24bacb11afafd37e415ed78c
parent7b7d638951eed8403f9865c59e9f6a4c6f0abeb9 (diff)
downloadorg.eclipse.koneki.ldt-672c70087538d1906e3d8bdb401f3e4628f59125.zip
org.eclipse.koneki.ldt-672c70087538d1906e3d8bdb401f3e4628f59125.tar.gz
org.eclipse.koneki.ldt-672c70087538d1906e3d8bdb401f3e4628f59125.tar.bz2
Add JUnit tests for multi-line strings, comments and lua doc
-rw-r--r--tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/AllUITests.java3
-rw-r--r--tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/rules/AbstractRuleTestCase.java1
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/AllUITests.java b/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/AllUITests.java
index 9ca50a4..6f0c54a 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/AllUITests.java
+++ b/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/AllUITests.java
@@ -11,8 +11,9 @@
package org.eclipse.koneki.ldt.ui.tests;
+
import org.eclipse.koneki.ldt.ui.tests.internal.LuaWordFinderTest;
-import org.eclipse.koneki.ldt.ui.tests.internal.autoedit.LuaDocumentorCommentAutoEditStrategyTest;
+import org.eclipse.koneki.ldt.ui.tests.internal.autoedit.LuaDocumentorCommentAutoEditStrategyTest;
import org.eclipse.koneki.ldt.ui.tests.internal.rules.LuaDocMultLineCommentTest;
import org.eclipse.koneki.ldt.ui.tests.internal.rules.LuaDocSingleCommentSeriesRuleTest;
import org.eclipse.koneki.ldt.ui.tests.internal.rules.LuaMultLineCommentRuleTest;
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/rules/AbstractRuleTestCase.java b/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/rules/AbstractRuleTestCase.java
index a19dda3..5ca4b61 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/rules/AbstractRuleTestCase.java
+++ b/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/rules/AbstractRuleTestCase.java
@@ -25,6 +25,7 @@ import org.eclipse.jface.text.rules.RuleBasedScanner;
import org.eclipse.jface.text.rules.Token;
/**
+<<<<<<< OURS
* An abstract class to perform JUnit tests on rules
*/
public abstract class AbstractRuleTestCase extends TestCase {