Changeset 1146 for trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/taskequality/TaskAndIterationComparisonRuleTest.java

Timestamp:

04/04/13 16:06:07 (11 years ago)

Author:

pharms

Message:

• complete refactoring of task tree model with a separation of task models and task instances
• appropriate adaptation of task tree generation process
• appropriate adaptation of commands and task tree visualization

Location:

trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/taskequality

Files:

• . (copied) (copied from trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/nodeequality)
• TaskAndIterationComparisonRuleTest.java (copied) (copied from trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/nodeequality/NodeAndIterationComparisonRuleTest.java) (3 diffs)

trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/taskequality/TaskAndIterationComparisonRuleTest.java

@@ -13 +13 @@
 //   limitations under the License.
 
-package de.ugoe.cs.autoquest.tasktrees.nodeequality;
+package de.ugoe.cs.autoquest.tasktrees.taskequality;
 
 import static org.junit.Assert.*;
@@ -19 +19 @@
 import org.junit.Test;
 
-import de.ugoe.cs.autoquest.tasktrees.nodeequality.NodeAndIterationComparisonRule;
-import de.ugoe.cs.autoquest.tasktrees.nodeequality.NodeEquality;
-import de.ugoe.cs.autoquest.tasktrees.nodeequality.NodeEqualityRuleManager;
+import de.ugoe.cs.autoquest.eventcore.IEventTarget;
+import de.ugoe.cs.autoquest.eventcore.IEventType;
+import de.ugoe.cs.autoquest.eventcore.StringEventType;
+import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskAndIterationComparisonRule;
+import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskEquality;
+import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskEqualityRuleManager;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IIteration;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISelection;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeBuilder;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNode;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNodeFactory;
-import de.ugoe.cs.autoquest.tasktrees.treeimpl.TaskTreeBuilder;
-import de.ugoe.cs.autoquest.tasktrees.treeimpl.TaskTreeNode;
-import de.ugoe.cs.autoquest.tasktrees.treeimpl.TaskTreeNodeFactory;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskFactory;
+import de.ugoe.cs.autoquest.tasktrees.treeimpl.TaskBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeimpl.TaskFactory;
+import de.ugoe.cs.autoquest.test.DummyGUIElement;
 
 /**
  * @author Patrick Harms
  */
-public class NodeAndIterationComparisonRuleTest {
+public class TaskAndIterationComparisonRuleTest {
 
     /**
@@ -41 +44 @@
     @Test
     public void test() {
-        NodeEqualityRuleManager manager = new NodeEqualityRuleManager();
+        TaskEqualityRuleManager manager = new TaskEqualityRuleManager();
         manager.init();
         
-        ITaskTreeNodeFactory treeNodeFactory = new TaskTreeNodeFactory();
-        ITaskTreeBuilder treeBuilder = new TaskTreeBuilder();
+        ITaskFactory taskFactory = new TaskFactory();
+        ITaskBuilder treeBuilder = new TaskBuilder();
         
-        NodeAndIterationComparisonRule rule = new NodeAndIterationComparisonRule(manager);
+        TaskAndIterationComparisonRule rule = new TaskAndIterationComparisonRule(manager);
         
-        ITaskTreeNode task1 = new TaskTreeNode("task1");
+        IEventType eventType1 = new StringEventType("eventType1");
+        IEventTarget eventTarget1 = new DummyGUIElement("elem1");
+        ITask task1 = taskFactory.createNewEventTask(eventType1, eventTarget1);
         
         assertNull(rule.compare(task1, task1));
         
-        IIteration iteration1 = treeNodeFactory.createNewIteration();
+        IIteration iteration1 = taskFactory.createNewIteration();
         assertNull(rule.compare(iteration1, iteration1));
         assertNull(rule.compare(task1, iteration1));
         assertNull(rule.compare(iteration1, task1));
 
-        treeBuilder.setChild(iteration1, task1);
+        treeBuilder.setMarkedTask(iteration1, task1);
         
-        assertEquals(NodeEquality.LEXICALLY_EQUAL, rule.compare(iteration1, task1));
-        assertEquals(NodeEquality.LEXICALLY_EQUAL, rule.compare(task1, iteration1));
+        assertEquals(TaskEquality.LEXICALLY_EQUAL, rule.compare(iteration1, task1));
+        assertEquals(TaskEquality.LEXICALLY_EQUAL, rule.compare(task1, iteration1));
         
-        ISelection selection1 = treeNodeFactory.createNewSelection();
+        ISelection selection1 = taskFactory.createNewSelection();
         treeBuilder.addChild(selection1, task1);
-        treeBuilder.setChild(iteration1, selection1);
+        treeBuilder.setMarkedTask(iteration1, selection1);
         
-        assertEquals(NodeEquality.LEXICALLY_EQUAL, rule.compare(iteration1, task1));
-        assertEquals(NodeEquality.LEXICALLY_EQUAL, rule.compare(task1, iteration1));
+        assertEquals(TaskEquality.LEXICALLY_EQUAL, rule.compare(iteration1, task1));
+        assertEquals(TaskEquality.LEXICALLY_EQUAL, rule.compare(task1, iteration1));
     }