Changeset 1058 for trunk

Timestamp:

02/01/13 12:16:47 (12 years ago)

Author:

fglaser

Message:

• Bug in JFCSimplifiedLogParser fixed, which caused violation of event order during parsing
• Test of JFCSimplifiedLogParser extended to cover handling of events that have no registered target while being parsed.

Location:

trunk

Files:

• autoquest-plugin-jfc-test/src/test/java/de/ugoe/cs/autoquest/plugin/jfc/JFCSimplifiedLogParserTest.java (modified) (2 diffs)
• autoquest-plugin-jfc-test/src/test/resources/argouml_traceEventsWithoutTargets.xml (added)
• autoquest-plugin-jfc-test/src/test/resources/freemind_regularTrace.xml (added)
• autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/JFCSimplifiedLogParser.java (modified) (4 diffs)

trunk/autoquest-plugin-jfc-test/src/test/java/de/ugoe/cs/autoquest/plugin/jfc/JFCSimplifiedLogParserTest.java

@@ +1 @@
+
 package de.ugoe.cs.autoquest.plugin.jfc;
 
@@ -35 +36 @@
 
     /**
-     *
+     * Test that parses regular log file.
      */
     @Test
-    public void test() throws Exception {
+    public void testParseRegularLog() throws Exception {
         JFCSimplifiedLogParser parser = new JFCSimplifiedLogParser(null);
-        parser.parseFile(new File(ClassLoader.getSystemResource("newtrace2.log").getFile()));
+        parser.parseFile(new File(ClassLoader.getSystemResource("freemind_regularTrace.xml")
+                                  .getFile()));
+        Collection<List<Event>> events = parser.getSequences();
+
+        assertNotNull(events);
+        assertTrue(events.size() > 0);
+
+        System.err.println("{");
+        for (List<Event> session : events) {
+            System.err.println("  {");
+            for (Event event : session) {
+                System.err.print("    ");
+                System.err.print(event);
+                System.err.println(",");
+            }
+            System.err.println("  }");
+        }
+        System.err.println("}");
+        System.err.println("\n\n");
+
+        GUIModel guiModel = parser.getGuiModel();
+        assertNotNull(guiModel);
+
+        for (IGUIElement root : guiModel.getRootElements()) {
+            dumpGUIElement(root, guiModel, "");
+        }
+    }
+
+    /**
+     * Test that parses a log file that contains events that have no registered targets when parsed.
+     */
+    @Test
+    public void testParseLogEventsWithoutTargets() throws Exception {
+        JFCSimplifiedLogParser parser = new JFCSimplifiedLogParser(null);
+        parser.parseFile(new File(ClassLoader
+                                  .getSystemResource("argouml_traceEventsWithoutTargets.xml").getFile()));
         Collection<List<Event>> events = parser.getSequences();
 

trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/JFCSimplifiedLogParser.java

@@ -274 +274 @@
         }
         if (!eventsWithoutTargets.isEmpty()) {
-            Console.printerr("Some events reference GUI elments that are not part of logfile. +"
-                + "These events have been ignored.");
+            Console.printerr("Some events reference GUI elements that are not part of logfile. " +
+                        "These events have been parsed without target.");
         }
     }
@@ -406 +406 @@
                     event.setTarget(guiElement);
                     guiElement.markUsed();
-                    currentSequence.add(event);
                 }
                 eventsWithoutTargets.remove(currentGUIElementHash);
@@ -419 +418 @@
                 IGUIElement currentGUIElement;
                 currentGUIElement = currentGUIElementTree.find(currentEventSource);
-
+                Event event;
                 // in some rare cases the target GUI element of the event is not
                 // known yet
                 if (currentGUIElement == null) {
-                    Event event =
-                        new Event(instantiateInteraction(currentEventId, currentEventParameters));
-                    event.setTimestamp(currentEventTimestamp);
-
+                    event = new Event(instantiateInteraction(currentEventId, currentEventParameters));
                     List<Event> eventList = eventsWithoutTargets.get(currentEventSource);
                     if (eventList == null) {
@@ -435 +431 @@
                 }
                 else {
-                    Event event =
-                        new Event(instantiateInteraction(currentEventId, currentEventParameters),
+                    event = new Event(instantiateInteraction(currentEventId, currentEventParameters),
                                   currentGUIElement);
-                    event.setTimestamp(currentEventTimestamp);
                     JFCGUIElement currentEventTarget = (JFCGUIElement) event.getTarget();
                     currentEventTarget.markUsed();
-
-                    currentSequence.add(event);
-                }
+                }
+                event.setTimestamp(currentEventTimestamp);
+                currentSequence.add(event);
 
                 currentEventParameters = null;