Changeset 1123 for trunk/autoquest-test-utils/src/main/java/de/ugoe

Timestamp:

03/18/13 11:44:54 (12 years ago)

Author:

pharms

Message:

• improved testing support for task trees

Location:

trunk/autoquest-test-utils/src/main/java/de/ugoe/cs/autoquest/tasktrees

Files:

• TaskTreeChecker.java (modified) (5 diffs)
• TaskTreeInstantiator.java (added)

trunk/autoquest-test-utils/src/main/java/de/ugoe/cs/autoquest/tasktrees/TaskTreeChecker.java

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.tasktrees;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 import java.io.FileNotFoundException;
@@ -108 +107 @@
 
     /**
+     * <p>
+     * TODO: comment
+     * </p>
+     *
+     * @param oracle
+     * @param result
+     */
+    public void assertTaskNodesEqual(ITaskTreeNode expected, ITaskTreeNode checked) {
+        if (expected == null) {
+            assertNull("null", checked);
+        }
+        else {
+            assertNotNull(expected.toString(), checked);
+            
+            assertEquals(expected.toString() + ": types do not match",
+                         expected.getClass(), checked.getClass());
+            assertEquals(expected.toString() + ": names do not match",
+                         expected.getName(), checked.getName());
+            
+            List<ITaskTreeNode> expectedChildren = expected.getChildren();
+            List<ITaskTreeNode> checkedChildren = checked.getChildren();
+            
+            if ((expectedChildren != null) && (expectedChildren.size() > 0)) {
+                assertNotNull(expected.toString() + ": children not there", checkedChildren);
+                assertEquals(expected.toString() + ": different number of children",
+                             expectedChildren.size(), checkedChildren.size());
+                
+                if (expected instanceof ISequence) {
+                    for (int i = 0; i < expectedChildren.size(); i++) {
+                        assertTaskNodesEqual(expectedChildren.get(i), checkedChildren.get(i));
+                    }
+                }
+                else {
+                    for (int i = 0; i < expectedChildren.size(); i++) {
+                        boolean found = false;
+                        for (int j = 0; j < checkedChildren.size(); j++) {
+                            try {
+                                assertTaskNodesEqual
+                                    (expectedChildren.get(i), checkedChildren.get(j));
+                                found = true;
+                                break;
+                            }
+                            catch (AssertionError e) {
+                                // try next
+                            }
+                        }
+                        
+                        assertTrue("one of the children not found", found);
+                    }
+                }
+            }
+            else {
+                assertTrue(expected.toString() + ": unexpected children",
+                           (checkedChildren == null) || (checkedChildren.size() == 0));
+            }
+        }
+    }
+
+    /**
      * TODO: comment
      * 
@@ -200 +258 @@
             }
             out.print(indent);
-            out.print("Sequence");
-            if (node.getDescription() != null) {
-                out.print("(");
-                out.print(node.getDescription());
-                out.print(")");
-            }
+            out.print(node.toString());
             out.println(" {");
         }
@@ -213 +266 @@
             }
             out.print(indent);
-            out.print("Iteration");
-            if (node.getDescription() != null) {
-                out.print("(");
-                out.print(node.getDescription());
-                out.print(")");
-            }
+            out.print(node.toString());
             out.println(" {");
         }
@@ -226 +274 @@
             }
             out.print(indent);
-            out.print("Selection");
-            if (node.getDescription() != null) {
-                out.print("(");
-                out.print(node.getDescription());
-                out.print(")");
-            }
+            out.print(node.toString());
             out.println(" {");
         }
         else if (node instanceof IEventTask) {
             out.print(indent);
-            out.print(((IEventTask) node).getEventType().getName());
+            out.print(((IEventTask) node).getEventType());
             out.print(" ");
             out.print(((IEventTask) node).getEventTarget().getStringIdentifier());