From 1b4fc685424ae09c640125f8f562cee02644f239 Mon Sep 17 00:00:00 2001 From: Marc Bonnici Date: Tue, 13 Nov 2018 11:47:43 +0000 Subject: [PATCH] workloads/gfxbench: Fix formatting --- .../arm/wa/uiauto/gfxbench/UiAutomation.java | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/wa/workloads/gfxbench/uiauto/app/src/main/java/com/arm/wa/uiauto/gfxbench/UiAutomation.java b/wa/workloads/gfxbench/uiauto/app/src/main/java/com/arm/wa/uiauto/gfxbench/UiAutomation.java index 8b15ffd7..4acdab77 100755 --- a/wa/workloads/gfxbench/uiauto/app/src/main/java/com/arm/wa/uiauto/gfxbench/UiAutomation.java +++ b/wa/workloads/gfxbench/uiauto/app/src/main/java/com/arm/wa/uiauto/gfxbench/UiAutomation.java @@ -63,15 +63,14 @@ public class UiAutomation extends BaseUiAutomation { } public void clearFirstRun() throws Exception { - UiObject accept = + UiObject accept = mDevice.findObject(new UiSelector().resourceId("android:id/button1") .className("android.widget.Button")); if (accept.exists()){ accept.click(); sleep(5); } - - UiObject sync = + UiObject sync = mDevice.findObject(new UiSelector().text("Data synchronization") .className("android.widget.TextView")); if (!sync.exists()){ @@ -93,7 +92,7 @@ public class UiAutomation extends BaseUiAutomation { public void runBenchmark() throws Exception { //Calculate the location of the test selection button - UiObject circle = + UiObject circle = mDevice.findObject(new UiSelector().resourceId("net.kishonti.gfxbench.gl.v50000.corporate:id/main_circleControl") .className("android.widget.RelativeLayout")); Rect bounds = circle.getBounds(); @@ -101,7 +100,7 @@ public class UiAutomation extends BaseUiAutomation { selectx = bounds.width() - selectx; int selecty = bounds.height()/4; selecty = bounds.centerY() + selecty; - + Log.d(TAG, "maxx " + selectx); Log.d(TAG, "maxy " + selecty); @@ -123,7 +122,7 @@ public class UiAutomation extends BaseUiAutomation { toggleTest("1080p Tessellation Offscreen"); //Start the tests - UiObject start = + UiObject start = mDevice.findObject(new UiSelector().text("Start")); start.click(); @@ -136,43 +135,43 @@ public class UiAutomation extends BaseUiAutomation { public void getScores() throws Exception { UiScrollable list = new UiScrollable(new UiSelector().scrollable(true)); - UiObject results = + UiObject results = mDevice.findObject(new UiSelector().resourceId("net.kishonti.gfxbench.gl.v50000.corporate:id/results_testList")); int number_of_results = results.getChildCount(); //High Level Tests - UiObject carchase = + UiObject carchase = mDevice.findObject(new UiSelector().resourceId("net.kishonti.gfxbench.gl.v50000.corporate:id/results_testList")) .getChild(new UiSelector().index(1)) .getChild(new UiSelector().resourceId("net.kishonti.gfxbench.gl.v50000.corporate:id/updated_result_item_subresult")); Log.d(TAG, "Car Chase score " + carchase.getText()); - UiObject carchaseoff = + UiObject carchaseoff = mDevice.findObject(new UiSelector().resourceId("net.kishonti.gfxbench.gl.v50000.corporate:id/results_testList")) .getChild(new UiSelector().index(2)) .getChild(new UiSelector().resourceId("net.kishonti.gfxbench.gl.v50000.corporate:id/updated_result_item_subresult")); Log.d(TAG, "Car Chase Offscreen score " + carchaseoff.getText()); - UiObject manhattan = + UiObject manhattan = mDevice.findObject(new UiSelector().resourceId("net.kishonti.gfxbench.gl.v50000.corporate:id/results_testList")) .getChild(new UiSelector().index(3)) .getChild(new UiSelector().resourceId("net.kishonti.gfxbench.gl.v50000.corporate:id/updated_result_item_subresult")); Log.d(TAG, "Manhattan 3.1 score " + manhattan.getText()); - UiObject manhattan1080 = + UiObject manhattan1080 = mDevice.findObject(new UiSelector().resourceId("net.kishonti.gfxbench.gl.v50000.corporate:id/results_testList")) .getChild(new UiSelector().index(4)) .getChild(new UiSelector().resourceId("net.kishonti.gfxbench.gl.v50000.corporate:id/updated_result_item_subresult")); Log.d(TAG, "1080p Manhattan 3.1 Offscreen score " + manhattan1080.getText()); - UiObject manhattan1440 = + UiObject manhattan1440 = mDevice.findObject(new UiSelector().resourceId("net.kishonti.gfxbench.gl.v50000.corporate:id/results_testList")) .getChild(new UiSelector().index(5)) .getChild(new UiSelector().resourceId("net.kishonti.gfxbench.gl.v50000.corporate:id/updated_result_item_subresult")); Log.d(TAG, "1440p Manhattan 3.1 Offscreen score " + manhattan1440.getText()); //Low Level Tests - UiObject tess = + UiObject tess = mDevice.findObject(new UiSelector().resourceId("net.kishonti.gfxbench.gl.v50000.corporate:id/results_testList")) .getChild(new UiSelector().index(7)) .getChild(new UiSelector().resourceId("net.kishonti.gfxbench.gl.v50000.corporate:id/updated_result_item_subresult")); @@ -181,7 +180,7 @@ public class UiAutomation extends BaseUiAutomation { } Log.d(TAG, "Tessellation score " + tess.getText()); - UiObject tessoff = + UiObject tessoff = mDevice.findObject(new UiSelector().resourceId("net.kishonti.gfxbench.gl.v50000.corporate:id/results_testList")) .getChild(new UiSelector().index(8)) .getChild(new UiSelector().resourceId("net.kishonti.gfxbench.gl.v50000.corporate:id/updated_result_item_subresult")); @@ -193,7 +192,7 @@ public class UiAutomation extends BaseUiAutomation { public void toggleTest(String testname) throws Exception { UiScrollable list = new UiScrollable(new UiSelector().scrollable(true)); - UiObject test = + UiObject test = mDevice.findObject(new UiSelector().text(testname)); if (!test.exists() && list.waitForExists(60)) { list.scrollIntoView(test);