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

Timestamp:

08/14/13 17:04:42 (11 years ago)

Author:

pharms

Message:

• rework of task model to move event instance stuff to task instances
• introduction of sequence, selection, iteration and optional instances

File:

• trunk/autoquest-test-utils/src/main/java/de/ugoe/cs/autoquest/tasktrees/TaskTreeValidator.java (modified) (7 diffs)

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

@@ -20 +20 @@
 
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTaskInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IIteration;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IIterationInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IOptional;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IOptionalInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISelection;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ISelectionInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequence;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequenceInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstance;
@@ -66 +71 @@
             
             assertEquals("number of children of sequence instance must match sequence model",
-                         taskInstance.size(), task.getChildren().size());
+                         ((ISequenceInstance) taskInstance).size(), task.getChildren().size());
             
-            for (int i = 0; i < taskInstance.size(); i++) {
-                assertNotNull("sequence instance child " + i + " was null", taskInstance.get(i));
-                ITask childTask = taskInstance.get(i).getTask();
+            for (int i = 0; i < ((ISequenceInstance) taskInstance).size(); i++) {
+                assertNotNull("sequence instance child " + i + " was null",
+                              ((ISequenceInstance) taskInstance).get(i));
+                ITask childTask = ((ISequenceInstance) taskInstance).get(i).getTask();
                 assertSame("task of sequence child " + i + " does not match sequence model",
                            childTask, task.getChildren().get(i));
@@ -78 +84 @@
             ISelection task = (ISelection) taskInstance.getTask();
             
-            assertEquals
-                ("number of children of selection instance must be 1", 1, taskInstance.size());
+            assertNotNull("number of children of selection instance must be 1",
+                          ((ISelectionInstance) taskInstance).getChild());
             assertTrue
                 ("number of children of selection must be larger 0", task.getChildren().size() > 0);
@@ -90 +96 @@
                 assertFalse("child of selection model must not be an optional",
                             childTask instanceof IOptional);
-                if (childTask.equals(taskInstance.get(0).getTask())) {
+                if (childTask.equals(((ISelectionInstance) taskInstance).getChild().getTask())) {
                     found = true;
                     break;
@@ -107 +113 @@
                         childTask instanceof IOptional);
             
-            for (int i = 0; i < taskInstance.size(); i++) {
-                assertNotNull("iteration instance child " + i + " was null", taskInstance.get(i));
+            for (int i = 0; i < ((IIterationInstance) taskInstance).size(); i++) {
+                assertNotNull("iteration instance child " + i + " was null",
+                              ((IIterationInstance) taskInstance).get(i));
                 assertSame("task of iteration child " + i + " does not match iteration model",
-                           childTask, taskInstance.get(i).getTask());
+                           childTask, ((IIterationInstance) taskInstance).get(i).getTask());
             }
         }
@@ -119 +126 @@
                         childTask instanceof IOptional);
             
-            assertEquals
-                ("number of children of optional instance must be 1", 1, taskInstance.size());
+            assertNotNull("number of children of optional instance must be 1",
+                          ((IOptionalInstance) taskInstance).getChild());
             
             assertEquals("task of optional child does not match optional model",
-                         childTask, taskInstance.get(0).getTask());
+                         childTask, ((IOptionalInstance) taskInstance).getChild().getTask());
         }
         else if (taskInstance.getTask() instanceof IEventTask) {
             IEventTask task = (IEventTask) taskInstance.getTask();
             assertNotNull("event task model must not be null", task);
-            assertNotNull("event type of event task model must not be null", task.getEventType());
-            assertNotNull
-                ("event target of event task model must not be null", task.getEventTarget());
-
-            assertEquals("event task instance must not have children", 0, taskInstance.size());
+            assertNotNull("event of event task instance must not be null",
+                          ((IEventTaskInstance) taskInstance).getEvent());
         }
         else {
@@ -138 +142 @@
         }
         
-        for (ITaskInstance child : taskInstance) {
-            validate(child);
+        if (taskInstance instanceof ITaskInstanceList) {
+            for (ITaskInstance child : (ITaskInstanceList) taskInstance) {
+                validate(child);
+            }
+        }
+        else if (taskInstance instanceof ISelectionInstance) {
+            validate(((ISelectionInstance) taskInstance).getChild());
+        }
+        else if (taskInstance instanceof IOptionalInstance) {
+            validate(((IOptionalInstance) taskInstance).getChild());
         }
     }