From 51c784f5dd3e69ffb5323604148aaef81772b302 Mon Sep 17 00:00:00 2001 From: muendelezaji Date: Fri, 27 May 2016 14:37:54 +0100 Subject: [PATCH] Use consistent method names --- wlauto/common/android/BaseUiAutomation.class | Bin 12128 -> 12090 bytes .../arm/wlauto/uiauto/BaseUiAutomation.java | 30 +++---- .../com.arm.wlauto.uiauto.googleslides.jar | Bin 16176 -> 16155 bytes .../com/arm/wlauto/uiauto/UiAutomation.java | 84 +++++++++--------- 4 files changed, 57 insertions(+), 57 deletions(-) diff --git a/wlauto/common/android/BaseUiAutomation.class b/wlauto/common/android/BaseUiAutomation.class index a2a03d61c3d4476b581cbb6edb01ba0981e1d0b5..d8831cb5cb06f6dfb1060dee20533f7fbf9febb5 100644 GIT binary patch delta 1098 zcmYk6*>jU+6voffh4;(LN!nVBEiG+Os?yS6DT`Q^+9FC7D?1`oLK;eFNlFqZWh=@N9&f#zH!V6~{y+YBdYmVbWiUZo)s|}2RlYy$ zVWNr`6g3)olA=~IS&fEKt7?j3s$!Z>UsOz2yp+@M1CfTTvzURI2D3cOw$y~6LA|zK zRx~IYEzQRq-F?MJN%YLMl*X&-@|t3vqRHTO4{umnE+M6!uj_9bH0$}6Vu8iN;rD?> z>ay6lwRb$M^svf9i^01Ft3l&mAwT z!XqjNzPCREb*?{HsAX6ypp05_?T%B zeT+|VlJO}{8A!m-U1@$i`~`i(IITD%kci(h`f--=CB9;u)4_R?xL+$SxPkmB-bIy{ zaLV1uud2JOz9-OUaE0j?y2H3C7wIbfuDHf@L)8scH&xvfg=^>omAn3e;(=tr-I8pX uxYOY>x2Jl0w(Jk_V_6vp?L2G7mOPEslYg#tyO6lzk-qykE55iNrvGOE;uR!adv zCUH6nv?>S)jto+9KoQ#u@h(ZVbC3Y5R8jSm8WPqp#6b3pNByzCyt*s1WFx@RCrKfl*VX`(NuvlP2(|E+{#6b(-@Bm={}?ocaTu1l+weRCW@9%=IhGX9*xLW$1{7HKT*`yN;# zE=x77u_pGiWrF2`7X&W~UJ|U3wR#6HJ7{o_R9LBy0*&UnOvd$Vo0GYmn^Q=GqO-kB zx~8qx_wugq*-5vjG;mQB#(cNMP3CKxy;Rc@&uuk@dQvQu`ZopnBKM8)Ovy6S{Vmgm*#z(M+euDi92N<84 z8!<0&(2n7d;IJ%o$iinh!Z?c08DB`_OWMHrO7OMWT{t=XjmTrz4=S@Cv1}^ixR~!l zx55dgD|D4{(r(kAbdBj49cQ{O>XfM8MSW)#zD0LWynn2uz?RI6cz1yvvT?Y%9dE!N g=3IPefi>u>>`gS_hOHEb0(8^<+XU#A8B$sL50abrc>n+a diff --git a/wlauto/external/uiauto/src/com/arm/wlauto/uiauto/BaseUiAutomation.java b/wlauto/external/uiauto/src/com/arm/wlauto/uiauto/BaseUiAutomation.java index 61ed0d64..7218d2a0 100644 --- a/wlauto/external/uiauto/src/com/arm/wlauto/uiauto/BaseUiAutomation.java +++ b/wlauto/external/uiauto/src/com/arm/wlauto/uiauto/BaseUiAutomation.java @@ -42,7 +42,7 @@ public class BaseUiAutomation extends UiAutomatorTestCase { public static final int CLICK_REPEAT_INTERVAL_DEFAULT = 50; /* - * Used by clickView() methods in order to provide a consistent API + * Used by clickUiObject() methods in order to provide a consistent API */ public enum FindByCriteria { BY_ID, BY_TEXT, BY_DESC; } @@ -294,7 +294,7 @@ public class BaseUiAutomation extends UiAutomatorTestCase { getUiDevice().swipe(startX, yCoordinate, endX, yCoordinate, steps); } - public void repeatClickView(UiObject view, int repeatCount, int intervalInMillis) throws Exception { + public void repeatClickUiObject(UiObject view, int repeatCount, int intervalInMillis) throws Exception { int repeatInterval = intervalInMillis > CLICK_REPEAT_INTERVAL_MINIMUM ? intervalInMillis : CLICK_REPEAT_INTERVAL_DEFAULT; if (repeatCount < 1 || !view.isClickable()) { return; @@ -305,30 +305,30 @@ public class BaseUiAutomation extends UiAutomatorTestCase { } } - public UiObject clickView(FindByCriteria criteria, String matching) throws Exception { - return clickView(criteria, matching, null, false); + public UiObject clickUiObject(FindByCriteria criteria, String matching) throws Exception { + return clickUiObject(criteria, matching, null, false); } - public UiObject clickView(FindByCriteria criteria, String matching, boolean wait) throws Exception { - return clickView(criteria, matching, null, wait); + public UiObject clickUiObject(FindByCriteria criteria, String matching, boolean wait) throws Exception { + return clickUiObject(criteria, matching, null, wait); } - public UiObject clickView(FindByCriteria criteria, String matching, String clazz) throws Exception { - return clickView(criteria, matching, clazz, false); + public UiObject clickUiObject(FindByCriteria criteria, String matching, String clazz) throws Exception { + return clickUiObject(criteria, matching, clazz, false); } - public UiObject clickView(FindByCriteria criteria, String matching, String clazz, boolean wait) throws Exception { + public UiObject clickUiObject(FindByCriteria criteria, String matching, String clazz, boolean wait) throws Exception { UiObject view; switch (criteria) { case BY_ID: - view = clazz == null ? getViewById(matching) : getUiObjectByResourceId(matching, clazz); + view = clazz == null ? getUiObjectByResourceId(matching) : getUiObjectByResourceId(matching, clazz); break; case BY_DESC: - view = clazz == null ? getViewByDesc(matching) : getUiObjectByDescription(matching, clazz); + view = clazz == null ? getUiObjectByDescription(matching) : getUiObjectByDescription(matching, clazz); break; case BY_TEXT: default: - view = clazz == null ? getViewByText(matching) : getUiObjectByText(matching, clazz); + view = clazz == null ? getUiObjectByText(matching) : getUiObjectByText(matching, clazz); break; } if (wait) { @@ -339,7 +339,7 @@ public class BaseUiAutomation extends UiAutomatorTestCase { return view; } - public UiObject getViewByText(String text) throws Exception { + public UiObject getUiObjectByText(String text) throws Exception { UiObject object = new UiObject(new UiSelector().textContains(text)); if (!object.waitForExists(waitTimeout)) { throw new UiObjectNotFoundException("Could not find view with text: " + text); @@ -347,7 +347,7 @@ public class BaseUiAutomation extends UiAutomatorTestCase { return object; } - public UiObject getViewByDesc(String desc) throws Exception { + public UiObject getUiObjectByDescription(String desc) throws Exception { UiObject object = new UiObject(new UiSelector().descriptionContains(desc)); if (!object.waitForExists(waitTimeout)) { throw new UiObjectNotFoundException("Could not find view with description: " + desc); @@ -355,7 +355,7 @@ public class BaseUiAutomation extends UiAutomatorTestCase { return object; } - public UiObject getViewById(String id) throws Exception { + public UiObject getUiObjectByResourceId(String id) throws Exception { UiObject object = new UiObject(new UiSelector().resourceId(id)); if (!object.waitForExists(waitTimeout)) { throw new UiObjectNotFoundException("Could not find view with resource ID: " + id); diff --git a/wlauto/workloads/googleslides/com.arm.wlauto.uiauto.googleslides.jar b/wlauto/workloads/googleslides/com.arm.wlauto.uiauto.googleslides.jar index 62cf6b121cc5b1d50575d2f58ece0eb0e14f6238..02d6bcac797f31d12fcf63799b224a78226c58a8 100644 GIT binary patch delta 15951 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 H8{+=~K~0Z$ diff --git a/wlauto/workloads/googleslides/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java b/wlauto/workloads/googleslides/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java index 44ee526c..14ede351 100644 --- a/wlauto/workloads/googleslides/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java +++ b/wlauto/workloads/googleslides/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java @@ -100,7 +100,7 @@ public class UiAutomation extends UxPerfUiAutomation { protected void skipWelcomeScreen() throws Exception { timer = new Timer(); timer.start(); - clickView(BY_TEXT, "Skip", true); + clickUiObject(BY_TEXT, "Skip", true); timer.end(); results.put("skip_welcome", timer); sleep(1); @@ -110,7 +110,7 @@ public class UiAutomation extends UxPerfUiAutomation { startDumpsys(ACTIVITY_DOCLIST); timer = new Timer(); timer.start(); - clickView(BY_DESC, "drawer"); + clickUiObject(BY_DESC, "drawer"); getUiDevice().pressBack(); timer.end(); results.put("open_drawer", timer); @@ -122,9 +122,9 @@ public class UiAutomation extends UxPerfUiAutomation { startDumpsys(ACTIVITY_SETTINGS); timer = new Timer(); timer.start(); - clickView(BY_DESC, "drawer"); - clickView(BY_TEXT, "Settings", true); - clickView(BY_TEXT, "Create PowerPoint"); + clickUiObject(BY_DESC, "drawer"); + clickUiObject(BY_TEXT, "Settings", true); + clickUiObject(BY_TEXT, "Create PowerPoint"); getUiDevice().pressBack(); timer.end(); results.put("enable_ppt_compat", timer); @@ -148,8 +148,8 @@ public class UiAutomation extends UxPerfUiAutomation { // Open document timer = new Timer(); timer.start(); - clickView(BY_DESC, "Open presentation"); - clickView(BY_TEXT, "Device storage", true); + clickUiObject(BY_DESC, "Open presentation"); + clickUiObject(BY_TEXT, "Device storage", true); timer.end(); results.put("open_file_picker", timer); @@ -158,8 +158,8 @@ public class UiAutomation extends UxPerfUiAutomation { list.scrollIntoView(new UiSelector().textContains(docName)); timer = new Timer(); timer.start(); - clickView(BY_TEXT, docName); - clickView(BY_TEXT, "Open", CLASS_BUTTON, true); + clickUiObject(BY_TEXT, docName); + clickUiObject(BY_TEXT, "Open", CLASS_BUTTON, true); timer.end(); results.put("open_document", timer); sleep(5); @@ -220,7 +220,7 @@ public class UiAutomation extends UxPerfUiAutomation { // scroll forward in slideshow mode timer = new Timer(); timer.start(); - clickView(BY_DESC, "Start slideshow", true); + clickUiObject(BY_DESC, "Start slideshow", true); timer.end(); results.put("open_slideshow", timer); @@ -253,8 +253,8 @@ public class UiAutomation extends UxPerfUiAutomation { // create new file timer = new Timer(); timer.start(); - clickView(BY_DESC, "New presentation"); - clickView(BY_TEXT, "New PowerPoint", true); + clickUiObject(BY_DESC, "New presentation"); + clickUiObject(BY_TEXT, "New PowerPoint", true); timer.end(); results.put("create_document", timer); endDumpsys(ACTIVITY_DOCLIST, "create_document"); @@ -267,13 +267,13 @@ public class UiAutomation extends UxPerfUiAutomation { insertSlide("Title and Content"); enterTextInSlide("title", "Extensions - Workloads"); enterTextInSlide("Text placeholder", SLIDE_TEXT_CONTENT); - clickView(BY_DESC, "Text placeholder"); - clickView(BY_DESC, "Format"); - clickView(BY_TEXT, "Droid Sans"); - clickView(BY_TEXT, "Droid Sans Mono"); - clickView(BY_ID, PACKAGE_ID + "palette_back_button"); - UiObject decreaseFont = getViewByDesc("Decrease text"); - repeatClickView(decreaseFont, 20, CLICK_REPEAT_INTERVAL_MS); + clickUiObject(BY_DESC, "Text placeholder"); + clickUiObject(BY_DESC, "Format"); + clickUiObject(BY_TEXT, "Droid Sans"); + clickUiObject(BY_TEXT, "Droid Sans Mono"); + clickUiObject(BY_ID, PACKAGE_ID + "palette_back_button"); + UiObject decreaseFont = getUiObjectByDescription("Decrease text"); + repeatClickUiObject(decreaseFont, 20, CLICK_REPEAT_INTERVAL_MS); getUiDevice().pressBack(); // get image from gallery and insert @@ -281,26 +281,26 @@ public class UiAutomation extends UxPerfUiAutomation { // folder it's in. More reliable than trying to find a pushed image in the file // picker, and fails gracefully in the rare case that no images exist. insertSlide("Title Only"); - clickView(BY_DESC, "Insert"); - clickView(BY_TEXT, "Image", true); - clickView(BY_TEXT, "Recent"); + clickUiObject(BY_DESC, "Insert"); + clickUiObject(BY_TEXT, "Image", true); + clickUiObject(BY_TEXT, "Recent"); try { UiObject image = new UiObject(new UiSelector().resourceId("com.android.documentsui:id/date").instance(2)); image.clickAndWaitForNewWindow(); } catch (UiObjectNotFoundException e) { - clickView(BY_ID, "com.android.documentsui:id/date", true); + clickUiObject(BY_ID, "com.android.documentsui:id/date", true); } // last slide insertSlide("Title Slide"); // insert "?" shape - clickView(BY_DESC, "Insert"); - clickView(BY_TEXT, "Shape"); - clickView(BY_TEXT, "Buttons"); - clickView(BY_DESC, "actionButtonHelp"); - UiObject resize = getViewByDesc("Bottom-left resize"); - UiObject shape = getViewByDesc("actionButtonHelp"); - UiObject subtitle = getViewByDesc("subTitle"); + clickUiObject(BY_DESC, "Insert"); + clickUiObject(BY_TEXT, "Shape"); + clickUiObject(BY_TEXT, "Buttons"); + clickUiObject(BY_DESC, "actionButtonHelp"); + UiObject resize = getUiObjectByDescription("Bottom-left resize"); + UiObject shape = getUiObjectByDescription("actionButtonHelp"); + UiObject subtitle = getUiObjectByDescription("subTitle"); resize.dragTo(subtitle, 40); shape.dragTo(subtitle, 40); enterTextInSlide("title", "THE END. QUESTIONS?"); @@ -312,20 +312,20 @@ public class UiAutomation extends UxPerfUiAutomation { public void insertSlide(String slideLayout) throws Exception { sleep(1); // a bit of time to see previous slide - UiObject view = getViewByDesc("Insert slide"); + UiObject view = getUiObjectByDescription("Insert slide"); view.clickAndWaitForNewWindow(); - view = getViewByText(slideLayout); + view = getUiObjectByText(slideLayout); view.clickAndWaitForNewWindow(); } public void enterTextInSlide(String viewName, String textToEnter) throws Exception { - UiObject view = getViewByDesc(viewName); + UiObject view = getUiObjectByDescription(viewName); view.click(); view.setText(textToEnter); try { - clickView(BY_DESC, "Done"); + clickUiObject(BY_DESC, "Done"); } catch (UiObjectNotFoundException e) { - clickView(BY_ID, "android:id/action_mode_close_button"); + clickUiObject(BY_ID, "android:id/action_mode_close_button"); } // On some devices, keyboard pops up when entering text, and takes a noticeable // amount of time (few milliseconds) to disappear after clicking Done. @@ -337,17 +337,17 @@ public class UiAutomation extends UxPerfUiAutomation { public void saveDocument(String docName) throws Exception { timer = new Timer(); timer.start(); - clickView(BY_TEXT, "SAVE"); - clickView(BY_TEXT, "Device"); + clickUiObject(BY_TEXT, "SAVE"); + clickUiObject(BY_TEXT, "Device"); timer.end(); results.put("save_dialog_1", timer); timer = new Timer(); timer.start(); - UiObject filename = getViewById(PACKAGE_ID + "file_name_edit_text"); + UiObject filename = getUiObjectByResourceId(PACKAGE_ID + "file_name_edit_text"); filename.clearTextField(); filename.setText(docName); - clickView(BY_TEXT, "Save", CLASS_BUTTON); + clickUiObject(BY_TEXT, "Save", CLASS_BUTTON); timer.end(); results.put("save_dialog_2", timer); @@ -358,7 +358,7 @@ public class UiAutomation extends UxPerfUiAutomation { // part of the UiAutomator test case. UiObject overwriteView = new UiObject(new UiSelector().textContains("already exists")); if (overwriteView.waitForExists(DIALOG_WAIT_TIME_MS)) { - clickView(BY_TEXT, "Overwrite"); + clickUiObject(BY_TEXT, "Overwrite"); } sleep(1); } @@ -366,9 +366,9 @@ public class UiAutomation extends UxPerfUiAutomation { public void deleteDocument(String docName) throws Exception { timer = new Timer(); timer.start(); - UiObject doc = getViewByText(docName); + UiObject doc = getUiObjectByText(docName); doc.longClick(); - clickView(BY_TEXT, "Remove"); + clickUiObject(BY_TEXT, "Remove"); timer.end(); results.put("delete_dialog_1", timer);