Changeset 1294 for trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/AbstractTemporalRelationshipTC.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-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/AbstractTemporalRelationshipTC.java (modified) (5 diffs)

trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/AbstractTemporalRelationshipTC.java

@@ -33 +33 @@
 import de.ugoe.cs.autoquest.tasktrees.TaskTreeValidator;
 import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskEquality;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstanceList;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskBuilder;
@@ -74 +75 @@
      *
      */
-    protected void applyRule(Class<? extends ITaskInstanceListScopeRule> ruleClass,
-                             String                                      inputSpec,
-                             String                                      expectedOutputSpec)
+    protected void applyRule(Class<? extends ITaskInstanceScopeRule> ruleClass,
+                             String                                  inputSpec,
+                             String                                  expectedOutputSpec)
     {
-        ITaskInstanceListScopeRule rule = null;
+        ITaskInstanceScopeRule rule = null;
         
         CONSTRUCTOR_ITERATION:
@@ -100 +101 @@
             
             try {
-                rule = (ITaskInstanceListScopeRule) constructor.newInstance(parameters.toArray());
+                rule = (ITaskInstanceScopeRule) constructor.newInstance(parameters.toArray());
             }
             catch (IllegalArgumentException e) {
@@ -127 +128 @@
         RuleApplicationStatus status;
         
-        ITaskInstanceList inputList = decoder.decode(inputSpec);
-        
-        Stack<ITaskInstanceList> toBeAppliedOn = new Stack<ITaskInstanceList>();
+        ITaskInstance inputList = (ITaskInstance) decoder.decode(inputSpec);
+        
+        Stack<ITaskInstance> toBeAppliedOn = new Stack<ITaskInstance>();
         toBeAppliedOn.push(inputList);
         
@@ -156 +157 @@
         while ((!toBeAppliedOn.isEmpty()) || (status == RuleApplicationStatus.FINISHED));
 
-        ITaskInstanceList expectedList = decoder.decode(expectedOutputSpec);
-        
-        new TaskTreeChecker().assertTaskInstanceListsEqual(expectedList, inputList);
+        ITaskInstance expectedList = (ITaskInstance) decoder.decode(expectedOutputSpec);
+        
+        new TaskTreeChecker().assertTaskInstancesEqual(expectedList, inputList);
     }