Changeset 1146 for trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/taskequality/TaskAndSelectionComparisonRuleTest.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)
• TaskAndSelectionComparisonRuleTest.java (copied) (copied from trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/nodeequality/NodeAndSelectionComparisonRuleTest.java) (4 diffs)

trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/taskequality/TaskAndSelectionComparisonRuleTest.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.NodeAndSelectionComparisonRule;
-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.TaskAndSelectionComparisonRule;
+import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskEquality;
+import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskEqualityRuleManager;
 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 NodeAndSelectionComparisonRuleTest {
+public class TaskAndSelectionComparisonRuleTest {
 
     /**
@@ -40 +43 @@
     @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();
         
-        NodeAndSelectionComparisonRule rule = new NodeAndSelectionComparisonRule(manager);
+        TaskAndSelectionComparisonRule rule = new TaskAndSelectionComparisonRule(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));
         
-        ISelection selection1 = treeNodeFactory.createNewSelection();
+        ISelection selection1 = taskFactory.createNewSelection();
         assertNull(rule.compare(selection1, selection1));
         assertNull(rule.compare(task1, selection1));
@@ -59 +64 @@
         treeBuilder.addChild(selection1, task1);
         
-        assertEquals(NodeEquality.LEXICALLY_EQUAL, rule.compare(selection1, task1));
-        assertEquals(NodeEquality.LEXICALLY_EQUAL, rule.compare(task1, selection1));
+        assertEquals(TaskEquality.LEXICALLY_EQUAL, rule.compare(selection1, task1));
+        assertEquals(TaskEquality.LEXICALLY_EQUAL, rule.compare(task1, selection1));
         
-        selection1 = treeNodeFactory.createNewSelection();
-        ISelection selection2 = treeNodeFactory.createNewSelection();
+        selection1 = taskFactory.createNewSelection();
+        ISelection selection2 = taskFactory.createNewSelection();
         treeBuilder.addChild(selection2, task1);
         treeBuilder.addChild(selection1, selection2);
         
-        assertEquals(NodeEquality.LEXICALLY_EQUAL, rule.compare(selection1, task1));
-        assertEquals(NodeEquality.LEXICALLY_EQUAL, rule.compare(task1, selection1));
+        assertEquals(TaskEquality.LEXICALLY_EQUAL, rule.compare(selection1, task1));
+        assertEquals(TaskEquality.LEXICALLY_EQUAL, rule.compare(task1, selection1));
     }