summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Aubry2012-07-23 12:17:20 (EDT)
committer sbernard2012-07-25 12:35:27 (EDT)
commit080361e6302027df08c4036fb0b9eb0447d9522f (patch)
tree951a80b4096590b45a740213983ad65921697818
parentbdee39ddc2140dc5838ee0e214528b535db19f7f (diff)
downloadorg.eclipse.koneki.ldt-080361e6302027df08c4036fb0b9eb0447d9522f.zip
org.eclipse.koneki.ldt-080361e6302027df08c4036fb0b9eb0447d9522f.tar.gz
org.eclipse.koneki.ldt-080361e6302027df08c4036fb0b9eb0447d9522f.tar.bz2
Intial commit of Scanner JUnit tests
and some enhancements of all ui tests
-rw-r--r--tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/AllUITests.java10
-rw-r--r--tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/rules/AbstractRuleTestCase.java4
2 files changed, 5 insertions, 9 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 a000de0..754cc54 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
@@ -15,16 +15,8 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
-
-
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.rules.LuaDocMultLineCommentTest;
-import org.eclipse.koneki.ldt.ui.tests.internal.rules.LuaDocSingleCommentSeriesRuleTest;
-import org.eclipse.koneki.ldt.ui.tests.internal.rules.LuaMultLineCommentRuleTest;
-import org.eclipse.koneki.ldt.ui.tests.internal.rules.LuaMultLineStringRuleTest;
-import org.eclipse.koneki.ldt.ui.tests.internal.rules.LuaNumberRuleTest;
+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 e7d95a6..06666f0 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
@@ -26,7 +26,11 @@ import org.eclipse.jface.text.rules.Token;
import org.eclipse.koneki.ldt.ui.tests.internal.ScannerResult;
/**
+<<<<<<< OURS
* An abstract class to perform JUnit tests on rules
+=======
+ * An abstract class to perform junit test on rules
+>>>>>>> THEIRS
*/
public abstract class AbstractRuleTestCase extends TestCase {