Changeset 1333 for trunk/autoquest-test-utils/src/main/java/de/ugoe

Timestamp:

01/24/14 13:48:25 (10 years ago)

Author:

pharms

Message:

• improvement and correction of the task tree decoder to handle optionals correctly

Location:

trunk/autoquest-test-utils/src/main/java/de/ugoe/cs/autoquest/tasktrees

Files:

• TaskTreeDecoder.java (modified) (6 diffs)
• TaskTreeValidator.java (modified) (2 diffs)

trunk/autoquest-test-utils/src/main/java/de/ugoe/cs/autoquest/tasktrees/TaskTreeDecoder.java

@@ -29 +29 @@
 import de.ugoe.cs.autoquest.eventcore.IEventType;
 import de.ugoe.cs.autoquest.eventcore.StringEventType;
+import de.ugoe.cs.autoquest.eventcore.gui.Scroll;
 import de.ugoe.cs.autoquest.eventcore.gui.TextInput;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask;
@@ -103 +104 @@
         correctTargets(taskInstanceList);
         
+        // validate the instance list
+        try {
+            new TaskTreeValidator().validate(taskInstanceList);
+        }
+        catch (java.lang.AssertionError e) {
+            throw new IllegalArgumentException(e.getMessage(), e);
+        }
+        
         return taskInstanceList;
     }
@@ -226 +235 @@
         }
 
-        // validate the instance
-        try {
-            new TaskTreeValidator().validate(instance);
-        }
-        catch (java.lang.AssertionError e) {
-            throw new IllegalArgumentException(e.getMessage(), e);
-        }
-        
         return instance;
     }
@@ -318 +319 @@
             }
         }
+        else if ("Optional".equals(type)) {
+            // update the optional with what is optional if available
+            if (children.size() == 1) {
+                ITask newChildTask = children.get(0).getTask();
+                
+                if (((IOptional) task).getMarkedTask() == null) {
+                    taskBuilder.setMarkedTask((IOptional) task, newChildTask);
+                }
+                else if (!((IOptional) task).getMarkedTask().equals(newChildTask)) {
+                    throw new IllegalArgumentException("all children of the same optional must " +
+                                                       "be of an identical task model.");
+                }
+            }
+        }
 
         return task;
@@ -349 +364 @@
      * @return
      */
-    private IEventType determineType(String type, String enteredText) {
+    private IEventType determineType(String type, String additionalInfo) {
         if ("TextInput".equals(type)) {
-            return new TextInput(enteredText, new ArrayList<Event>());
+            return new TextInput(additionalInfo, new ArrayList<Event>());
+        }
+        else if ("Scroll".equals(type)) {
+            int x = 0;
+            int y = 0;
+            if (additionalInfo != null) {
+                String[] parts = additionalInfo.split(" ");
+                if (parts.length > 0) {
+                    try {
+                        x = Integer.parseInt(parts[0]);
+                    }
+                    catch (NumberFormatException e) {
+                        throw new IllegalArgumentException("could not parse scroll coordinates", e);
+                    }
+                }
+                if (parts.length > 1) {
+                    try {
+                        y = Integer.parseInt(parts[1]);
+                    }
+                    catch (NumberFormatException e) {
+                        throw new IllegalArgumentException("could not parse scroll coordinates", e);
+                    }
+                }
+            }
+            return new Scroll(x, y);
         }
         else {
@@ -428 +467 @@
         else if (instance instanceof IOptionalInstance) {
             IOptionalInstance optInst = (IOptionalInstance) instance;
-            taskBuilder.setChild(optInst, replaceTargets(optInst.getChild(), replacements));
+            if (optInst.getChild() != null) {
+                taskBuilder.setChild(optInst, replaceTargets(optInst.getChild(), replacements));
+            }
         }
         else if ((instance instanceof IEventTaskInstance) &&

trunk/autoquest-test-utils/src/main/java/de/ugoe/cs/autoquest/tasktrees/TaskTreeValidator.java

@@ -126 +126 @@
                         childTask instanceof IOptional);
             
-            assertNotNull("number of children of optional instance must be 1",
-                          ((IOptionalInstance) taskInstance).getChild());
-            
-            assertEquals("task of optional child does not match optional model",
-                         childTask, ((IOptionalInstance) taskInstance).getChild().getTask());
+            if (((IOptionalInstance) taskInstance).getChild() != null) {
+                assertEquals("task of optional child does not match optional model",
+                             childTask, ((IOptionalInstance) taskInstance).getChild().getTask());
+            }
         }
         else if (taskInstance.getTask() instanceof IEventTask) {
@@ -151 +150 @@
         }
         else if (taskInstance instanceof IOptionalInstance) {
-            validate(((IOptionalInstance) taskInstance).getChild());
+            if (((IOptionalInstance) taskInstance).getChild() != null) {
+                validate(((IOptionalInstance) taskInstance).getChild());
+            }
         }
     }