Changeset 1803

Timestamp:

10/22/14 14:25:14 (10 years ago)

Author:

funger

Message:

• bug fix: format of onClick position adapted to mouseClick

File:

• trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/AndroidLogParser.java (modified) (11 diffs)

trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/AndroidLogParser.java

@@ -26 +26 @@
 import java.util.List;
 import java.util.Map;
+import java.util.logging.Level;
 
 import javax.xml.parsers.ParserConfigurationException;
@@ -108 +109 @@
         /**
          * <p>
-         * internal handle to the parsed GUI structure, stored in a GUIElementTree
+         * Internal handle to the parsed GUI structure, stored in a GUIElementTree
          * </p>
          */
@@ -115 +116 @@
         /**
          * <p>
-         * internal handle to the specification currently parsed for a GUI element
+         * Internal handle to the specification currently parsed for a GUI element
          * </p>
          */
@@ -136 +137 @@
         private List<Event> currentSequence;
 
-        /**
-         * <p>
-         * Internal handle to the event sequence that is currently being parsed.
-         * </p>
-         */
-        // private List<Event> currentSequence;
+        
 
         /**
@@ -159 +155 @@
         private Collection<List<Event>> sequences;
 
+        /**
+         * 
+         */
+        private Boolean showSteps = false;
+        
         /**
          * <p>
@@ -288 +289 @@
         public void startElement(String uri, String localName, String qName,
                         Attributes atts) throws SAXException {
+                showSteps("start element: " + qName, true);
                 if (qName.equals("sessions")) {
-                         currentSequence = new LinkedList<Event>();
+                        currentSequence = new LinkedList<Event>();
                         if (currentGUIElementTree == null) {
                                 currentGUIElementTree = new GUIElementTree<Long>();
                         }
-                        
+
                 }
 
@@ -301 +303 @@
                         currentGUIElementSpec.setHashCode((int) currentGUIElementHash
                                         .longValue());
-                        
+
                 } else if (qName.equals("event")) {
                         currentEventId = atts.getValue("id");
                         currentEventParameters = new HashMap<String, String>();
-                        
 
                 } else if (qName.equals("param")) {
@@ -346 +347 @@
         public void endElement(String uri, String localName, String qName)
                         throws SAXException {
-                
+
+                showSteps("end element: " + qName, true);
+
                 if (qName.equals("sessions")) {
                         if (currentSequence != null) {
@@ -365 +368 @@
                         currentParentHash = null;
                 } else if (currentEventId != null && qName.equals("event")) {
-                        
+
                         IGUIElement currentGUIElement;
                         currentGUIElement = currentGUIElementTree.find(currentEventSource);
@@ -373 +376 @@
                         // onclick event is processed as a mouse click
                         if (currentGUIElement == null) {
-                                
+
                         } else {
-                                
-                                event = new Event(instantiateInteraction(currentEventId, currentEventParameters), currentGUIElement);   
-                                ANDROIDGUIElement currentEventTarget = (ANDROIDGUIElement) event.getTarget();
+
+                                event = new Event(instantiateInteraction(currentEventId,
+                                                currentEventParameters), currentGUIElement);
+                                ANDROIDGUIElement currentEventTarget = (ANDROIDGUIElement) event
+                                                .getTarget();
                                 currentEventTarget.markUsed();
                                 event.setTimestamp(currentEventTimestamp);
@@ -406 +411 @@
          */
         private IInteraction instantiateInteraction(String event,
-                                                        Map<String, String> eventParameters) 
-                        throws SAXException 
-                {
-                
-                switch(event)
-                {
+                        Map<String, String> eventParameters) throws SAXException {
+
+                switch (event) {
                 case "onClick":
-                        int x = Integer.parseInt(currentEventParameters.get("X"));
-                        int y = Integer.parseInt(currentEventParameters.get("Y"));
+                        /*
+                         * due to the reason that android uses float instead of integer it
+                         * is necessary to parse the float values to integer values
+                         * this is simply done by removing the dot
+                         */
+
+                        int x = Integer.parseInt(currentEventParameters.get("X").replace(".", ""));
+                        int y = Integer.parseInt(currentEventParameters.get("Y").replace(".", ""));
                         MouseButtonInteraction.Button button = null;
                         button = MouseButtonInteraction.Button.LEFT;
 
                         return new MouseClick(button, x, y);
-                        
+
                 default:
-            throw new SAXException("unhandled event id " + event);
-                }
-
+                        throw new SAXException("unhandled event id " + event);
+                }
+
+        }
+
+        private void showSteps(String message, Boolean ln) {
+                if (showSteps) {
+                        if (ln) {
+                                Console.traceln(Level.INFO, message);
+                        } else {
+                                Console.trace(Level.INFO, message);
+                        }
+
+                }
+        }
+
+        public void setShowSteps(Boolean showSteps) {
+                this.showSteps = showSteps;
         }