Changeset 1768 for trunk

Timestamp:

09/26/14 10:46:28 (10 years ago)

Author:

pharms

Message:

• first version of merging similar task trees

Location:

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

Files:

• AbstractTemporalRelationshipTC.java (modified) (7 diffs)
• CondenseSimilarTasksRuleTest.java (added)

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

@@ -54 +54 @@
     /** */
     private ITaskFactory taskFactory = new TaskFactory();
-    
-    /** */
-    private TaskTreeDecoder decoder = null;
 
     /** */
@@ -68 +65 @@
         Console.reset();
         new TextConsole(Level.FINEST);
-        
-        decoder = new TaskTreeDecoder(taskFactory, taskBuilder);
     }
 
@@ -128 +123 @@
         RuleApplicationStatus status;
         
+        TaskTreeDecoder decoder = new TaskTreeDecoder(taskFactory, taskBuilder);
         ITaskInstance inputList = (ITaskInstance) decoder.decode(inputSpec);
         
@@ -169 +165 @@
                                          String                             expectedOutputSpec)
     {
+        System.out.println("#####################################################################");
         ISessionScopeRule rule = null;
         
@@ -215 +212 @@
         }
         
+        TaskTreeDecoder decoder = new TaskTreeDecoder(taskFactory, taskBuilder);
         ITaskInstanceList inputList = decoder.decode(inputSpec);
-        
         assertTrue(inputList instanceof IUserSession);
+        
+        ITaskInstanceList expectedList = decoder.decode(expectedOutputSpec);
+        assertTrue(expectedList instanceof IUserSession);
+        
+        new TaskTreeChecker().assertEventTaskInstancesEqual(expectedList, inputList);
+        
+        // reparse the input list to ensure that no doublings of task instances occurs
+        decoder = new TaskTreeDecoder(taskFactory, taskBuilder);
+        inputList = decoder.decode(inputSpec);
         
         List<IUserSession> sessionList = new LinkedList<IUserSession>();
@@ -230 +236 @@
         assertNotNull(result.getRuleApplicationStatus());
             
-        ITaskInstanceList expectedList = decoder.decode(expectedOutputSpec);
+        // reparse the expected list to ensure that no doublings of tasks occur
+        expectedList = decoder.decode(expectedOutputSpec);
         
         System.out.println("\nExpected Result:");
@@ -238 +245 @@
 
         new TaskTreeChecker().assertTaskInstanceListsEqual(expectedList, inputList);
-        new TaskTreeValidator().validate(inputList);
+        List<IUserSession> sessions = new LinkedList<IUserSession>();
+        sessions.add((IUserSession) inputList);
+        sessions.add((IUserSession) expectedList);
+        new TaskTreeValidator().validate(sessions, true);
     }