Changeset 1315 for trunk/autoquest-htmlmonitor-test/src/test/java/de/ugoe/cs

Timestamp:

10/07/13 16:10:45 (11 years ago)

Author:

pharms

Message:

• corrected HTML monitor to log only those GUI elements effectively used by the events including their parent hierarchy

Location:

trunk/autoquest-htmlmonitor-test/src/test/java/de/ugoe/cs/autoquest/htmlmonitor

Files:

• HtmlMonitorServerTest.java (modified) (1 diff)
• HtmlMonitorTest.java (modified) (3 diffs)

trunk/autoquest-htmlmonitor-test/src/test/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorServerTest.java

@@ -614 +614 @@
         
         if (parent != null) {
-            assertEquals(parent.getId(), element.getParentId());
+            assertNotNull(element.getParent());
+            assertEquals(parent.getId(), element.getParent().getId());
         }
         else {
-            assertNull(element.getParentId());
+            assertNull(element.getParent());
         }
         

trunk/autoquest-htmlmonitor-test/src/test/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorTest.java

@@ -421 +421 @@
         nodes = guiModel.getChildren(body);
         assertNotNull(nodes);
-        assertEquals(10, nodes.size());
+        
+        // wait for only 9 nodes. The directly used GUI elements are 10, but one (the body) is the
+        // parent of the others. input9 is unused and must, therefore, not be logged.
+        assertEquals(9, nodes.size());
         
         // get input nodes
@@ -429 +432 @@
             assertTrue(node instanceof HTMLPageElement);
             assertEquals("HTML", node.getPlatform());
-            
-            if (i != 8) {
-                assertTrue(node.isUsed());
-            }
-            else {
-                assertFalse(node.isUsed());
-            }
+            assertTrue(node.isUsed());
 
             assertNotNull(guiModel.getChildren(node));
@@ -464 +461 @@
         assertEvent(sequence.get(7), 8, MouseClick.class, nodes.get(7), 255, 4);
         assertEvent(sequence.get(8), 9, Scroll.class, body, 0, 0);
-        assertEvent(sequence.get(9), 10, MouseClick.class, nodes.get(9), 516, 154);
+        assertEvent(sequence.get(9), 10, MouseClick.class, nodes.get(8), 516, 154);
 
     }