Changeset 807 for trunk/quest-core-tasktrees-test/src

Timestamp:

09/11/12 16:45:51 (12 years ago)

Author:

pharms

Message:

• improved node equality comparison to match the principle of lexical, syntactical and semantical node equality. As a result, more condensed task trees are created.

Location:

trunk/quest-core-tasktrees-test/src/test/java/de/ugoe/cs/quest/tasktrees/nodeequality

Files:

• EventTaskComparisonRuleTest.java (added)
• GUIEventTaskComparisonRuleTest.java (added)
• IterationComparisonRuleTest.java (added)
• NodeEqualityTest.java (modified) (1 diff)
• SelectionComparisonRuleTest.java (added)
• SequenceComparisonRuleTest.java (modified) (6 diffs)

trunk/quest-core-tasktrees-test/src/test/java/de/ugoe/cs/quest/tasktrees/nodeequality/NodeEqualityTest.java

@@ -6 +6 @@
 
 /**
- * TODO comment
- * 
- * @version $Revision: $ $Date: 15.08.2012$
- * @author 2012, last modified by $Author: pharms$
+ * @author Patrick Harms
  */
 public class NodeEqualityTest {
 
     /**
-     * TODO: comment
      *
      */

trunk/quest-core-tasktrees-test/src/test/java/de/ugoe/cs/quest/tasktrees/nodeequality/SequenceComparisonRuleTest.java

@@ -5 +5 @@
 import org.junit.Test;
 
+import de.ugoe.cs.quest.tasktrees.treeifc.ISelection;
 import de.ugoe.cs.quest.tasktrees.treeifc.ISequence;
 import de.ugoe.cs.quest.tasktrees.treeifc.ITaskTreeBuilder;
@@ -14 +15 @@
 
 /**
- * <p>
- * TODO comment
- * </p>
- * 
- * @version $Revision: $ $Date: 16.08.2012$
- * @author 2012, last modified by $Author: pharms$
+ * @author Patrick Harms
  */
 public class SequenceComparisonRuleTest {
 
     /**
-     * <p>
-     * TODO: comment
-     * </p>
-     *
+     * 
      */
     @Test
@@ -45 +38 @@
         
         ISequence sequence1 = treeNodeFactory.createNewSequence();
-        assertEquals(NodeEquality.LEXICALLY_EQUAL, rule.compare(sequence1, sequence1));
+        assertEquals(NodeEquality.IDENTICAL, rule.compare(sequence1, sequence1));
 
         ISequence sequence2 = treeNodeFactory.createNewSequence();
@@ -54 +47 @@
         treeBuilder.addChild(sequence1, task1);
         
-        assertNull(rule.compare(sequence1, sequence2));
-        assertNull(rule.compare(sequence2, sequence1));
+        assertEquals(NodeEquality.UNEQUAL, rule.compare(sequence1, sequence2));
+        assertEquals(NodeEquality.UNEQUAL, rule.compare(sequence2, sequence1));
         
         treeBuilder.addChild(sequence2, task1);
@@ -64 +57 @@
         treeBuilder.addChild(sequence1, task2);
         
-        assertNull(rule.compare(sequence1, sequence2));
-        assertNull(rule.compare(sequence2, sequence1));
+        assertEquals(NodeEquality.UNEQUAL, rule.compare(sequence1, sequence2));
+        assertEquals(NodeEquality.UNEQUAL, rule.compare(sequence2, sequence1));
         
         treeBuilder.addChild(sequence2, task2);
@@ -76 +69 @@
         treeBuilder.addChild(sequence3, task1);
         
-        assertNull(rule.compare(sequence1, sequence3));
-        assertNull(rule.compare(sequence3, sequence1));
+        assertEquals(NodeEquality.UNEQUAL, rule.compare(sequence1, sequence3));
+        assertEquals(NodeEquality.UNEQUAL, rule.compare(sequence3, sequence1));
+        assertEquals(NodeEquality.UNEQUAL, rule.compare(sequence2, sequence3));
+        assertEquals(NodeEquality.UNEQUAL, rule.compare(sequence3, sequence2));
+
+        ISelection selection = treeNodeFactory.createNewSelection();
+        assertNull(rule.compare(sequence1, selection));
+        assertNull(rule.compare(selection, sequence1));
+        assertNull(rule.compare(sequence2, selection));
+        assertNull(rule.compare(selection, sequence2));
+        assertNull(rule.compare(sequence3, selection));
+        assertNull(rule.compare(selection, sequence3));
     }