Changeset 698 for trunk

Timestamp:

08/29/12 16:12:43 (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-usability-test/src/test/java/de/ugoe/cs/quest/usability/AbstractUsabilityEvaluationTC.java (modified) (5 diffs)

trunk/quest-core-usability-test/src/test/java/de/ugoe/cs/quest/usability/AbstractUsabilityEvaluationTC.java

@@ -4 +4 @@
 import static org.junit.Assert.fail;
 
+import java.util.ArrayList;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
@@ -10 +11 @@
 import org.junit.Before;
 
-import de.ugoe.cs.quest.tasktrees.testutils.DummyGUIElement;
-import de.ugoe.cs.quest.tasktrees.testutils.DummyInteraction;
-import de.ugoe.cs.quest.tasktrees.testutils.DummyTextField;
+import de.ugoe.cs.quest.eventcore.Event;
+import de.ugoe.cs.quest.eventcore.gui.TextInput;
 import de.ugoe.cs.quest.tasktrees.testutils.SimpleLogFormatter;
+import de.ugoe.cs.quest.tasktrees.treeifc.IEventTask;
 import de.ugoe.cs.quest.tasktrees.treeifc.IIteration;
 import de.ugoe.cs.quest.tasktrees.treeifc.ISelection;
@@ -21 +22 @@
 import de.ugoe.cs.quest.tasktrees.treeifc.ITaskTreeNode;
 import de.ugoe.cs.quest.tasktrees.treeifc.ITaskTreeNodeFactory;
-import de.ugoe.cs.quest.tasktrees.treeifc.ITextInputEventTask;
 import de.ugoe.cs.quest.tasktrees.treeimpl.TaskTreeBuilder;
 import de.ugoe.cs.quest.tasktrees.treeimpl.TaskTreeNodeFactory;
+import de.ugoe.cs.quest.test.DummyGUIElement;
+import de.ugoe.cs.quest.test.DummyInteraction;
+import de.ugoe.cs.quest.test.DummyTextField;
 
 /**
@@ -165 +168 @@
             }
 
-            ITextInputEventTask task =
-                taskTreeNodeFactory.createNewTextInputEventTask(new DummyTextField(additionalInfo));
-
-            task.setEnteredText(additionalInfo);
+            TextInput textInput = new TextInput(additionalInfo, new ArrayList<Event>());
+            
+            IEventTask task = taskTreeNodeFactory.createNewEventTask
+                (textInput, new DummyTextField(additionalInfo));
+
             return task;
         }
@@ -198 +202 @@
             taskTreeBuilder.addChild((ISelection) parent, child);
         }
-        else if (parent instanceof ITextInputEventTask) {
-            taskTreeBuilder.addChild((ITextInputEventTask) parent, child);
-        }
         else {
             fail("can not add children to parent task tree node of type " +