Changeset 1880

Timestamp:

02/25/15 12:44:56 (9 years ago)

Author:

funger

Message:

• Add the position of the element in the original GUI.
• getSimilarity extended (path + title, path + position now compared)

Location:

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

Files:

• AndroidLogParser.java (modified) (1 diff)
• guimodel/ANDROIDGUIElementSpec.java (modified) (11 diffs)

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

@@ -328 +328 @@
                     currentParentHash = Long.parseLong(atts.getValue("value"));
                 }
+                else if ("position".equals(atts.getValue("name"))) {
+                    currentGUIElementSpec.setElementPosition(Integer.parseInt(atts.getValue("value")));
+                }
             }
             else if (currentEventId != null) {

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

@@ -53 +53 @@
      * <p>
      * Path to an element in an activity. e.g. a path of a button could look like
-     * MainActivity/DecorView/ActionBarOverlayLayout/FrameLayout/ RelativeLayout/Button
+     * MainActivity/DecorView/ActionBarOverlayLayout/FrameLayout/RelativeLayout/Button
      * </p>
      */
@@ -86 +86 @@
     /**
      * <p>
+     * The position of the element in the original GUI.
+     * </p>
+     */
+    private int elementPosition;
+
+    /**
+     * <p>
      * Type hierarchy of the class itself.
      * </p>
      */
     private List<String> typeHierarchy = null;
-    
+
     /*
      * (non-Javadoc)
@@ -121 +128 @@
          */
 
-        if (otherSpec.index > 1 && index == otherSpec.index) {
+        if (otherSpec.getIndex() > 1 && getIndex() == otherSpec.getIndex()) {
+            return true;
+        }
+
+        /*
+         * Path and label of the elements fits together. In this case it is most likely that this
+         * elements fits together. This only makes since in the case a label exists.
+         */
+        if (otherSpec.getName() != "NOT_SET" && getName() != "NOT_SET" &&
+            !otherSpec.getName().contains("image:") && getName().contains("image:") &&
+            otherSpec.getName() == getName() && otherSpec.getPath() == getPath())
+        {
+            return true;
+        }
+
+        /*
+         * Path and position fits together. In this case it is most likely that this elements fits
+         * together.
+         */
+        if (otherSpec.getPath() == getPath() &&
+            otherSpec.getElementPosition() == getElementPosition())
+        {
             return true;
         }
@@ -142 +170 @@
         return false;
     }
-    
 
     /*
@@ -168 +195 @@
             return typeHierarchy.toArray(new String[typeHierarchy.size()]);
     }
-    
+
     /**
      * <p>
@@ -210 +237 @@
      * @return text or image of the GUI element.
      */
-    public String getName() {        
+    public String getName() {
         if (name == null || name.trim().length() == 0) {
             return "NOT_SET";
@@ -218 +245 @@
 
     /**
+     * 
+     * <p>
+     * Return the position of the element in the original GUI.
+     * </p>
+     * 
+     * @return position of the element in the original GUI.
+     */
+    public int getElementPosition() {
+        return elementPosition;
+    }
+
+    /**
+     * 
+     * <p>
+     * Set the position of the element in the original GUI.
+     * </p>
+     * 
+     * @param elementPosition
+     */
+    public void setElementPosition(int elementPosition) {
+        this.elementPosition = elementPosition;
+    }
+
+    /**
      * <p>
      * Sets the GUI element identifier.
@@ -282 +333 @@
         this.typeHierarchy = typeHierarchy;
     }
-    
+
     /*
      * (non-Javadoc)
@@ -303 +354 @@
             (path == null ? otherSpec.path == null : path.equals(otherSpec.path)) &&
             (index == otherSpec.index) &&
+            (elementPosition == otherSpec.elementPosition) &&
             (name == null ? otherSpec.name == null : name.equals(otherSpec.name)) &&
             (type == null ? otherSpec.type == null : type.equals(otherSpec.type));
     }
-    
+
     /*
      * (non-Javadoc)
@@ -314 +366 @@
     @Override
     public int hashCode() {
-     // 17 due to the reason that this is a prime number.
+        // 17 due to the reason that this is a prime number.
         int result = 17;
         /*
@@ -324 +376 @@
         result = 31 * result + index;
         result = 31 * result + getName().hashCode();
-        result = 31 * result + type.hashCode();     
+        result = 31 * result + type.hashCode();
+        result = 31 * result + elementPosition;
         return result;
     }
-    
 
 }