Refactor action map to origin widget

Author: ferpasri

android/src/org/testar/monkey/alayer/android/actions/AndroidActionClick.java

@@ -49,7 +49,7 @@ public class AndroidActionClick extends TaggableBase implements Action {
 
 	public AndroidActionClick(State state, Widget w, String text, String accessibilityID, String className) {
 	    this.set(Tags.Role, ActionRoles.LeftClickAt);
-	    this.mapActionToWidget(w);
+	    this.mapOriginWidget(w);
 	    this.text = text;
 	    this.accessibilityID = accessibilityID;
 	    this.widget = w;

android/src/org/testar/monkey/alayer/android/actions/AndroidActionLongClick.java

@@ -48,7 +48,7 @@ public class AndroidActionLongClick extends TaggableBase implements Action {
 
     public AndroidActionLongClick(State state, Widget w, String accessibilityID) {
         this.set(Tags.Role, AndroidRoles.AndroidWidget);
-        this.mapActionToWidget(w);
+        this.mapOriginWidget(w);
         this.accessibilityId = accessibilityID;
         this.widget = w;
         this.widgetClass = w.get(AndroidTags.AndroidClassName);

android/src/org/testar/monkey/alayer/android/actions/AndroidActionPinch.java

@@ -46,7 +46,7 @@ public class AndroidActionPinch extends TaggableBase implements Action {
 
     public AndroidActionPinch(State state, Widget w, String accessibilityID, boolean zoomIn) {
         this.set(Tags.Role, AndroidRoles.AndroidWidget);
-        this.mapActionToWidget(w);
+        this.mapOriginWidget(w);
         this.accessibilityId = accessibilityID;
         this.widget = w;
         this.set(Tags.Desc, toShortString());

android/src/org/testar/monkey/alayer/android/actions/AndroidActionScroll.java

@@ -45,7 +45,7 @@ public class AndroidActionScroll extends TaggableBase implements Action {
 
     public AndroidActionScroll(State state, Widget w, String accessibilityID) {
         this.set(Tags.Role, AndroidRoles.AndroidWidget);
-        this.mapActionToWidget(w);
+        this.mapOriginWidget(w);
         this.accessibilityId = accessibilityID;
         this.widget = w;
         this.set(Tags.Desc, toShortString());

android/src/org/testar/monkey/alayer/android/actions/AndroidActionType.java

@@ -55,7 +55,7 @@ public class AndroidActionType extends TaggableBase implements Action {
 
 	public AndroidActionType(State state, Widget w, String type, String accessibilityId, String text, String className) {
 		this.set(Tags.Role, ActionRoles.ClickTypeInto);
-		this.mapActionToWidget(w);
+		this.mapOriginWidget(w);
 		this.type = type;
 		this.accessibilityId = accessibilityId;
 		this.widget = w;

android/src/org/testar/monkey/alayer/android/actions/AndroidBackAction.java

@@ -44,7 +44,7 @@ public class AndroidBackAction extends TaggableBase implements Action {
     public AndroidBackAction(State state, Widget widget) {
         this.widget = widget;
         this.set(Tags.Role, AndroidRoles.AndroidWidget);
-        this.mapActionToWidget(widget);
+        this.mapOriginWidget(widget);
         this.set(Tags.Desc, toShortString());
     }
 

android/src/org/testar/monkey/alayer/android/actions/AndroidSystemActionCall.java

@@ -44,7 +44,7 @@ public class AndroidSystemActionCall extends TaggableBase implements Action {
     public AndroidSystemActionCall(State state, Widget widget) {
         this.widget = widget;
         this.set(Tags.Role, AndroidRoles.AndroidWidget);
-        this.mapActionToWidget(widget);
+        this.mapOriginWidget(widget);
         this.set(Tags.Desc, toShortString());
     }
 

android/src/org/testar/monkey/alayer/android/actions/AndroidSystemActionOrientation.java

@@ -44,7 +44,7 @@ public class AndroidSystemActionOrientation extends TaggableBase implements Acti
     public AndroidSystemActionOrientation(State state, Widget widget) {
         this.widget = widget;
         this.set(Tags.Role, AndroidRoles.AndroidWidget);
-        this.mapActionToWidget(widget);
+        this.mapOriginWidget(widget);
         this.set(Tags.Desc, toShortString());
     }
 

android/src/org/testar/monkey/alayer/android/actions/AndroidSystemActionText.java

@@ -44,7 +44,7 @@ public class AndroidSystemActionText extends TaggableBase implements Action {
     public AndroidSystemActionText(State state, Widget widget) {
         this.widget = widget;
         this.set(Tags.Role, AndroidRoles.AndroidWidget);
-        this.mapActionToWidget(widget);
+        this.mapOriginWidget(widget);
         this.set(Tags.Desc, toShortString());
     }
 

android/test/org/testar/monkey/alayer/android/actions/BuildAndroidActions.java

@@ -41,9 +41,6 @@ public void buildAndroidActionClick() {
 		// Verify Action <-> Widget mapping
 		Assert.notNull(androidClick.get(Tags.OriginWidget));
 		Assert.isTrue(androidClick.get(Tags.OriginWidget).get(AndroidTags.AndroidXpath).equals(pathTest));
-		Assert.notNull(widget.get(Tags.ActionSet));
-		Assert.isTrue(widget.get(Tags.ActionSet).size() == 1);
-		Assert.isTrue(widget.get(Tags.ActionSet).iterator().next().getClass().getName().equals(AndroidActionClick.class.getName()));
 	}
 
 	@Test
@@ -53,9 +50,6 @@ public void buildAndroidActionLongClick() {
 		// Verify Action <-> Widget mapping
 		Assert.notNull(androidLongClick.get(Tags.OriginWidget));
 		Assert.isTrue(androidLongClick.get(Tags.OriginWidget).get(AndroidTags.AndroidXpath).equals(pathTest));
-		Assert.notNull(widget.get(Tags.ActionSet));
-		Assert.isTrue(widget.get(Tags.ActionSet).size() == 1);
-		Assert.isTrue(widget.get(Tags.ActionSet).iterator().next().getClass().getName().equals(AndroidActionLongClick.class.getName()));
 	}
 
 	@Test
@@ -66,9 +60,6 @@ public void buildAndroidActionPinch() {
 		// Verify Action <-> Widget mapping
 		Assert.notNull(androidPinch.get(Tags.OriginWidget));
 		Assert.isTrue(androidPinch.get(Tags.OriginWidget).get(AndroidTags.AndroidXpath).equals(pathTest));
-		Assert.notNull(widget.get(Tags.ActionSet));
-		Assert.isTrue(widget.get(Tags.ActionSet).size() == 1);
-		Assert.isTrue(widget.get(Tags.ActionSet).iterator().next().getClass().getName().equals(AndroidActionPinch.class.getName()));
 	}
 
 	@Test
@@ -78,9 +69,6 @@ public void buildAndroidActionScroll() {
 		// Verify Action <-> Widget mapping
 		Assert.notNull(androidScroll.get(Tags.OriginWidget));
 		Assert.isTrue(androidScroll.get(Tags.OriginWidget).get(AndroidTags.AndroidXpath).equals(pathTest));
-		Assert.notNull(widget.get(Tags.ActionSet));
-		Assert.isTrue(widget.get(Tags.ActionSet).size() == 1);
-		Assert.isTrue(widget.get(Tags.ActionSet).iterator().next().getClass().getName().equals(AndroidActionScroll.class.getName()));
 	}
 
 	@Test
@@ -93,9 +81,6 @@ public void buildAndroidActionType() {
 		// Verify Action <-> Widget mapping
 		Assert.notNull(androidType.get(Tags.OriginWidget));
 		Assert.isTrue(androidType.get(Tags.OriginWidget).get(AndroidTags.AndroidXpath).equals(pathTest));
-		Assert.notNull(widget.get(Tags.ActionSet));
-		Assert.isTrue(widget.get(Tags.ActionSet).size() == 1);
-		Assert.isTrue(widget.get(Tags.ActionSet).iterator().next().getClass().getName().equals(AndroidActionType.class.getName()));
 	}
 
 	@Test
@@ -104,9 +89,6 @@ public void buildAndroidBackAction() {
 		// Verify Action <-> Widget mapping
 		Assert.notNull(androidBack.get(Tags.OriginWidget));
 		Assert.isTrue(androidBack.get(Tags.OriginWidget).get(AndroidTags.AndroidXpath).equals(pathTest));
-		Assert.notNull(widget.get(Tags.ActionSet));
-		Assert.isTrue(widget.get(Tags.ActionSet).size() == 1);
-		Assert.isTrue(widget.get(Tags.ActionSet).iterator().next().getClass().getName().equals(AndroidBackAction.class.getName()));
 	}
 
 	@Test
@@ -115,9 +97,6 @@ public void buildAndroidSystemActionCall() {
 		// Verify Action <-> Widget mapping
 		Assert.notNull(androidSystemCall.get(Tags.OriginWidget));
 		Assert.isTrue(androidSystemCall.get(Tags.OriginWidget).get(AndroidTags.AndroidXpath).equals(pathTest));
-		Assert.notNull(widget.get(Tags.ActionSet));
-		Assert.isTrue(widget.get(Tags.ActionSet).size() == 1);
-		Assert.isTrue(widget.get(Tags.ActionSet).iterator().next().getClass().getName().equals(AndroidSystemActionCall.class.getName()));
 	}
 
 	@Test
@@ -126,9 +105,6 @@ public void buildAndroidSystemActionOrientation() {
 		// Verify Action <-> Widget mapping
 		Assert.notNull(androidSystemOrientation.get(Tags.OriginWidget));
 		Assert.isTrue(androidSystemOrientation.get(Tags.OriginWidget).get(AndroidTags.AndroidXpath).equals(pathTest));
-		Assert.notNull(widget.get(Tags.ActionSet));
-		Assert.isTrue(widget.get(Tags.ActionSet).size() == 1);
-		Assert.isTrue(widget.get(Tags.ActionSet).iterator().next().getClass().getName().equals(AndroidSystemActionOrientation.class.getName()));
 	}
 
 	@Test
@@ -137,8 +113,5 @@ public void buildAndroidSystemActionText() {
 		// Verify Action <-> Widget mapping
 		Assert.notNull(androidSystemText.get(Tags.OriginWidget));
 		Assert.isTrue(androidSystemText.get(Tags.OriginWidget).get(AndroidTags.AndroidXpath).equals(pathTest));
-		Assert.notNull(widget.get(Tags.ActionSet));
-		Assert.isTrue(widget.get(Tags.ActionSet).size() == 1);
-		Assert.isTrue(widget.get(Tags.ActionSet).iterator().next().getClass().getName().equals(AndroidSystemActionText.class.getName()));
 	}
 }