Index: trunk/quest-core-tasktrees-test/src/test/java/de/ugoe/cs/quest/tasktrees/temporalrelation/DefaultIterationDetectionRuleTest.java
===================================================================
--- trunk/quest-core-tasktrees-test/src/test/java/de/ugoe/cs/quest/tasktrees/temporalrelation/DefaultIterationDetectionRuleTest.java	(revision 452)
+++ trunk/quest-core-tasktrees-test/src/test/java/de/ugoe/cs/quest/tasktrees/temporalrelation/DefaultIterationDetectionRuleTest.java	(revision 468)
@@ -38,24 +38,24 @@
     Interaction interaction1 = new DummyInteraction("bla", 1);
     simulateInteraction(element1, interaction1);
-    new TaskTreeChecker().assertTaskMap
+    new TaskTreeChecker().assertTaskTree
       ("Sequence sequence1 {" +
        "  Interaction bla {}" +
-       "}", getTaskTree().getTaskMap());    
-
-    simulateInteraction(element1, interaction1);
-    new TaskTreeChecker().assertTaskMap
-      ("Sequence sequence1 {" +
-       "  Iteration iteration1 {" +
-       "    Interaction bla {}" +
-       "  }" +
-       "}", getTaskTree().getTaskMap());    
-
-    simulateInteraction(element1, interaction1);
-    new TaskTreeChecker().assertTaskMap
-      ("Sequence sequence1 {" +
-       "  Iteration iteration1 {" +
-       "    Interaction bla {}" +
-       "  }" +
-       "}", getTaskTree().getTaskMap());    
+       "}", getTaskTree());    
+
+    simulateInteraction(element1, interaction1);
+    new TaskTreeChecker().assertTaskTree
+      ("Sequence sequence1 {" +
+       "  Iteration iteration1 {" +
+       "    Interaction bla {}" +
+       "  }" +
+       "}", getTaskTree());    
+
+    simulateInteraction(element1, interaction1);
+    new TaskTreeChecker().assertTaskTree
+      ("Sequence sequence1 {" +
+       "  Iteration iteration1 {" +
+       "    Interaction bla {}" +
+       "  }" +
+       "}", getTaskTree());    
 
     for (int i = 0; i < 10; i++)
@@ -64,10 +64,10 @@
     }
     
-    new TaskTreeChecker().assertTaskMap
-      ("Sequence sequence1 {" +
-       "  Iteration iteration1 {" +
-       "    Interaction bla {}" +
-       "  }" +
-       "}", getTaskTree().getTaskMap());    
+    new TaskTreeChecker().assertTaskTree
+      ("Sequence sequence1 {" +
+       "  Iteration iteration1 {" +
+       "    Interaction bla {}" +
+       "  }" +
+       "}", getTaskTree());    
     
     // now test with preceding and trailing other interactions
@@ -84,5 +84,5 @@
     simulateInteraction(element1, interaction2);
     
-    new TaskTreeChecker().assertTaskMap
+    new TaskTreeChecker().assertTaskTree
       ("Sequence sequence1 {" +
        "  Iteration iteration1 {" +
@@ -96,5 +96,5 @@
        "  Interaction blup {}" +
        "  Interaction bli {}" +
-       "}", getTaskTree().getTaskMap());    
+       "}", getTaskTree());    
   
     // now test with iterations of iterations
@@ -116,5 +116,5 @@
     }
     
-    new TaskTreeChecker().assertTaskMap
+    new TaskTreeChecker().assertTaskTree
       ("Sequence sequence1 {" +
        "  Iteration iteration1 {" +
@@ -141,5 +141,5 @@
        "    }" +
        "  }" +
-       "}", getTaskTree().getTaskMap());    
+       "}", getTaskTree());    
   
   }
@@ -160,38 +160,38 @@
     simulateInteraction(element1, interaction2);
     simulateInteraction(element1, interaction3);
-    new TaskTreeChecker().assertTaskMap
+    new TaskTreeChecker().assertTaskTree
       ("Sequence sequence1 {" +
        "  Interaction bla {}" +
        "  Interaction bli {}" +
        "  Interaction blup {}" +
-       "}", getTaskTree().getTaskMap());    
-
-    simulateInteraction(element1, interaction1);
-    simulateInteraction(element1, interaction2);
-    simulateInteraction(element1, interaction3);
-    new TaskTreeChecker().assertTaskMap
-      ("Sequence sequence1 {" +
-       "  Iteration iteration1 {" +
-       "    Sequence sequence2 {" +
-       "      Interaction bla {}" +
-       "      Interaction bli {}" +
-       "      Interaction blup {}" +
-       "    }" +
-       "  }" +
-       "}", getTaskTree().getTaskMap());    
-
-    simulateInteraction(element1, interaction1);
-    simulateInteraction(element1, interaction2);
-    simulateInteraction(element1, interaction3);
-    new TaskTreeChecker().assertTaskMap
-      ("Sequence sequence1 {" +
-       "  Iteration iteration1 {" +
-       "    Sequence sequence2 {" +
-       "      Interaction bla {}" +
-       "      Interaction bli {}" +
-       "      Interaction blup {}" +
-       "    }" +
-       "  }" +
-       "}", getTaskTree().getTaskMap());    
+       "}", getTaskTree());    
+
+    simulateInteraction(element1, interaction1);
+    simulateInteraction(element1, interaction2);
+    simulateInteraction(element1, interaction3);
+    new TaskTreeChecker().assertTaskTree
+      ("Sequence sequence1 {" +
+       "  Iteration iteration1 {" +
+       "    Sequence sequence2 {" +
+       "      Interaction bla {}" +
+       "      Interaction bli {}" +
+       "      Interaction blup {}" +
+       "    }" +
+       "  }" +
+       "}", getTaskTree());    
+
+    simulateInteraction(element1, interaction1);
+    simulateInteraction(element1, interaction2);
+    simulateInteraction(element1, interaction3);
+    new TaskTreeChecker().assertTaskTree
+      ("Sequence sequence1 {" +
+       "  Iteration iteration1 {" +
+       "    Sequence sequence2 {" +
+       "      Interaction bla {}" +
+       "      Interaction bli {}" +
+       "      Interaction blup {}" +
+       "    }" +
+       "  }" +
+       "}", getTaskTree());    
 
     for (int i = 0; i < 10; i++)
@@ -202,14 +202,14 @@
     }
     
-    new TaskTreeChecker().assertTaskMap
-      ("Sequence sequence1 {" +
-       "  Iteration iteration1 {" +
-       "    Sequence sequence2 {" +
-       "      Interaction bla {}" +
-       "      Interaction bli {}" +
-       "      Interaction blup {}" +
-       "    }" +
-       "  }" +
-       "}", getTaskTree().getTaskMap());    
+    new TaskTreeChecker().assertTaskTree
+      ("Sequence sequence1 {" +
+       "  Iteration iteration1 {" +
+       "    Sequence sequence2 {" +
+       "      Interaction bla {}" +
+       "      Interaction bli {}" +
+       "      Interaction blup {}" +
+       "    }" +
+       "  }" +
+       "}", getTaskTree());    
     
     // now test with preceding and trailing other interactions
@@ -230,5 +230,5 @@
     simulateInteraction(element1, interaction4);
     
-    new TaskTreeChecker().assertTaskMap
+    new TaskTreeChecker().assertTaskTree
       ("Sequence sequence1 {" +
        "  Iteration iteration1 {" +
@@ -252,5 +252,5 @@
        "  Interaction blo {}" +
        "  Interaction ble {}" +
-       "}", getTaskTree().getTaskMap());    
+       "}", getTaskTree());    
   
     // now test with iterations of iterations
@@ -277,5 +277,5 @@
     }
     
-    new TaskTreeChecker().assertTaskMap
+    new TaskTreeChecker().assertTaskTree
       ("Sequence sequence1 {" +
        "  Iteration iteration1 {" +
@@ -324,5 +324,5 @@
        "    }" +
        "  }" +
-       "}", getTaskTree().getTaskMap());    
+       "}", getTaskTree());    
   }
   
