Changeset 694

Timestamp:

08/29/12 16:11:17 (12 years ago)

Author:

pharms

Message:

• moved text input detection from task tree generation to dedicated command to be run on sequences

File:

• trunk/quest-core-tasktrees-test/src/test/java/de/ugoe/cs/quest/tasktrees/testutils/TaskTreeChecker.java (modified) (8 diffs)

trunk/quest-core-tasktrees-test/src/test/java/de/ugoe/cs/quest/tasktrees/testutils/TaskTreeChecker.java

@@ -14 +14 @@
 import java.util.regex.Pattern;
 
+import de.ugoe.cs.quest.eventcore.gui.TextInput;
 import de.ugoe.cs.quest.eventcore.guimodel.IGUIElement;
 import de.ugoe.cs.quest.tasktrees.treeifc.IEventTask;
@@ -22 +23 @@
 import de.ugoe.cs.quest.tasktrees.treeifc.ITaskTree;
 import de.ugoe.cs.quest.tasktrees.treeifc.ITaskTreeNode;
-import de.ugoe.cs.quest.tasktrees.treeifc.ITextInputEventTask;
 
 /**
@@ -129 +129 @@
             System.err.println(" {\" +");
         }
-        else if (node instanceof ITextInputEventTask) {
-            System.err.print("TextInputEvent textInput");
-            System.err.print(typeCounters[3]++);
-            System.err.print(" ");
-            System.err.print(((ITextInputEventTask) node).getEnteredText());
-            System.err.println(" {\" +");
-        }
         else if (node instanceof IEventTask) {
-            System.err.print("Event ");
-            System.err.print(((IEventTask) node).getEventType().getName());
+            if (((IEventTask) node).getEventType() instanceof TextInput) {
+                System.err.print("TextInputEvent textInput");
+                System.err.print(typeCounters[3]++);
+                System.err.print(" \"");
+                System.err.print(((TextInput) ((IEventTask) node).getEventType()).getEnteredText());
+                System.err.print("\"");
+            }
+            else {
+                System.err.print("Event ");
+                System.err.print(((IEventTask) node).getEventType().getName());
+            }
             System.err.print(" {}\" +");
         }
@@ -149 +151 @@
         }
 
-        if (!(node instanceof IEventTask) || (node instanceof ITextInputEventTask)) {
+        if (!(node instanceof IEventTask)) {
             System.err.print("       \"");
             System.err.print(indent);
@@ -197 +199 @@
             out.println("{");
         }
-        else if (node instanceof ITextInputEventTask) {
-            out.print("TextInputEvent");
-            out.print(" ");
-            out.println(((ITextInputEventTask) node).getEnteredText());
-            out.print(indent);
-            out.println("{");
-        }
         else if (node instanceof IEventTask) {
             out.print(((IEventTask) node).getEventType().getName());
             out.print(" ");
+            if (((IEventTask) node).getEventType() instanceof TextInput) {
+                out.print("\"");
+                out.print(((TextInput) ((IEventTask) node).getEventType()).getEnteredText());
+                out.print("\" ");
+            }
             out.print(((IEventTask) node).getEventTarget());
             if (((IEventTask) node).getEventTarget() instanceof IGUIElement)
@@ -222 +222 @@
         }
 
-        if (!(node instanceof IEventTask) || (node instanceof ITextInputEventTask)) {
+        if (!(node instanceof IEventTask)) {
             out.print(indent);
             out.print("}");
@@ -326 +326 @@
 
         if (("Event".equals(taskSpec.type) && (!(task instanceof IEventTask))) ||
-            ("TextInputEvent".equals(taskSpec.type) && (!(task instanceof ITextInputEventTask))) ||
+            ("TextInputEvent".equals(taskSpec.type) &&
+             (!(task instanceof IEventTask)) &&
+             (!(((IEventTask) task).getEventType() instanceof TextInput))) ||
             ("Sequence".equals(taskSpec.type) && (!(task instanceof ISequence))) ||
             ("Selection".equals(taskSpec.type) && (!(task instanceof ISelection))) ||
@@ -347 +349 @@
 
         if ("TextInputEvent".equals(taskSpec.type)) {
+            TextInput eventType = (TextInput) ((IEventTask) task).getEventType();
             if (!"".equals(taskSpec.additionalInfo) &&
-                !(taskSpec.additionalInfo.equals(((ITextInputEventTask) task).getEnteredText())))
+                !(taskSpec.additionalInfo.equals(eventType.getEnteredText())))
             {
                 if (doTrace) {
                     System.err.println("expected text \"" + taskSpec.additionalInfo +
                                        "\" is not equal to the text " + "provided by the task \"" +
-                                       ((ITextInputEventTask) task).getEnteredText() + "\"\n");
+                                       eventType.getEnteredText() + "\"\n");
                 }
                 return false;