Changeset 1058 for trunk/autoquest-plugin-jfc/src/main/java

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.

File:

• trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/JFCSimplifiedLogParser.java (modified) (4 diffs)

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;