From 6b04cbffd22b28c98cfaa676fc45f6357b08e00b Mon Sep 17 00:00:00 2001 From: Marc Bonnici Date: Wed, 24 Oct 2018 09:18:14 +0100 Subject: worklods: Fix whitespace --- .../com/arm/wa/uiauto/antutu/UiAutomation.java | 34 +++++++++++----------- .../com/arm/wa/uiauto/pcmark/UiAutomation.java | 18 ++++++------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/wa/workloads/antutu/uiauto/app/src/main/java/com/arm/wa/uiauto/antutu/UiAutomation.java b/wa/workloads/antutu/uiauto/app/src/main/java/com/arm/wa/uiauto/antutu/UiAutomation.java index dbf76cec..6807536d 100755 --- a/wa/workloads/antutu/uiauto/app/src/main/java/com/arm/wa/uiauto/antutu/UiAutomation.java +++ b/wa/workloads/antutu/uiauto/app/src/main/java/com/arm/wa/uiauto/antutu/UiAutomation.java @@ -59,7 +59,7 @@ public class UiAutomation extends BaseUiAutomation { } public void hitTest() throws Exception { - UiObject testbutton = + UiObject testbutton = mDevice.findObject(new UiSelector().resourceId("com.antutu.ABenchMark:id/main_test_start_title")); testbutton.click(); sleep(1); @@ -73,14 +73,14 @@ public class UiAutomation extends BaseUiAutomation { public void getScores() throws Exception { //Expand, Extract and Close CPU sub scores - UiObject cpuscores = + UiObject cpuscores = mDevice.findObject(new UiSelector().text("CPU")); cpuscores.click(); - UiObject cpumaths = + UiObject cpumaths = mDevice.findObject(new UiSelector().text("CPU Mathematics Score").fromParent(new UiSelector().index(3))); - UiObject cpucommon = + UiObject cpucommon = mDevice.findObject(new UiSelector().text("CPU Common Use Score").fromParent(new UiSelector().index(3))); - UiObject cpumulti = + UiObject cpumulti = mDevice.findObject(new UiSelector().text("CPU Multi-Core Score").fromParent(new UiSelector().index(3))); Log.d(TAG, "CPU Maths Score " + cpumaths.getText()); Log.d(TAG, "CPU Common Score " + cpucommon.getText()); @@ -88,14 +88,14 @@ public class UiAutomation extends BaseUiAutomation { cpuscores.click(); //Expand, Extract and Close GPU sub scores - UiObject gpuscores = + UiObject gpuscores = mDevice.findObject(new UiSelector().text("GPU")); gpuscores.click(); - UiObject gpumaroon = + UiObject gpumaroon = mDevice.findObject(new UiSelector().text("3D [Marooned] Score").fromParent(new UiSelector().index(3))); - UiObject gpucoast = + UiObject gpucoast = mDevice.findObject(new UiSelector().text("3D [Coastline] Score").fromParent(new UiSelector().index(3))); - UiObject gpurefinery = + UiObject gpurefinery = mDevice.findObject(new UiSelector().text("3D [Refinery] Score").fromParent(new UiSelector().index(3))); Log.d(TAG, "GPU Marooned Score " + gpumaroon.getText()); Log.d(TAG, "GPU Coastline Score " + gpucoast.getText()); @@ -103,16 +103,16 @@ public class UiAutomation extends BaseUiAutomation { gpuscores.click(); //Expand, Extract and Close UX sub scores - UiObject uxscores = + UiObject uxscores = mDevice.findObject(new UiSelector().text("UX")); uxscores.click(); - UiObject security = + UiObject security = mDevice.findObject(new UiSelector().text("Data Security Score").fromParent(new UiSelector().index(3))); - UiObject dataprocessing = + UiObject dataprocessing = mDevice.findObject(new UiSelector().text("Data Processing Score").fromParent(new UiSelector().index(3))); - UiObject imageprocessing = + UiObject imageprocessing = mDevice.findObject(new UiSelector().text("Image Processing Score").fromParent(new UiSelector().index(3))); - UiObject uxscore = + UiObject uxscore = mDevice.findObject(new UiSelector().text("User Experience Score").fromParent(new UiSelector().index(3))); Log.d(TAG, "Data Security Score " + security.getText()); Log.d(TAG, "Data Processing Score " + dataprocessing.getText()); @@ -121,12 +121,12 @@ public class UiAutomation extends BaseUiAutomation { uxscores.click(); //Expand, Extract and Close MEM sub scores - UiObject memscores = + UiObject memscores = mDevice.findObject(new UiSelector().text("MEM")); memscores.click(); - UiObject ramscore = + UiObject ramscore = mDevice.findObject(new UiSelector().text("RAM Score").fromParent(new UiSelector().index(3))); - UiObject romscore = + UiObject romscore = mDevice.findObject(new UiSelector().text("ROM Score").fromParent(new UiSelector().index(3))); Log.d(TAG, "RAM Score " + ramscore.getText()); Log.d(TAG, "ROM Score " + romscore.getText()); diff --git a/wa/workloads/pcmark/uiauto/app/src/main/java/com/arm/wa/uiauto/pcmark/UiAutomation.java b/wa/workloads/pcmark/uiauto/app/src/main/java/com/arm/wa/uiauto/pcmark/UiAutomation.java index 05b92a35..a83ddfb7 100755 --- a/wa/workloads/pcmark/uiauto/app/src/main/java/com/arm/wa/uiauto/pcmark/UiAutomation.java +++ b/wa/workloads/pcmark/uiauto/app/src/main/java/com/arm/wa/uiauto/pcmark/UiAutomation.java @@ -64,7 +64,7 @@ public class UiAutomation extends BaseUiAutomation { //Swipe to benchmarks and back to initialise the app correctly private void loadBenchmarks() throws Exception { - UiObject title = + UiObject title = mDevice.findObject(new UiSelector().text("PCMARK")); title.waitForExists(300000); if (title.exists()){ @@ -83,22 +83,22 @@ public class UiAutomation extends BaseUiAutomation { //Install the Work 2.0 Performance Benchmark private void installBenchmark() throws Exception { - UiObject benchmark = + UiObject benchmark = mDevice.findObject(new UiSelector().descriptionContains("INSTALL(")); if (benchmark.exists()) { benchmark.click(); } else { - UiObject benchmarktext = + UiObject benchmarktext = mDevice.findObject(new UiSelector().textContains("INSTALL(")); benchmarktext.click(); } - UiObject install = + UiObject install = mDevice.findObject(new UiSelector().description("INSTALL") .className("android.view.View")); if (install.exists()) { install.click(); } else { - UiObject installtext = + UiObject installtext = mDevice.findObject(new UiSelector().text("INSTALL") .className("android.view.View")); installtext.click();; @@ -114,7 +114,7 @@ public class UiAutomation extends BaseUiAutomation { installedtext.waitForExists(1000); } } - + //Execute the Work 2.0 Performance Benchmark - wait up to ten minutes for this to complete private void runBenchmark() throws Exception { UiObject run = @@ -125,17 +125,17 @@ public class UiAutomation extends BaseUiAutomation { if (run.exists()) { run.click(); } else { - UiObject runtext = + UiObject runtext = mDevice.findObject(new UiSelector().text("RUN")); if (runtext.exists()) { runtext.click(); } else { - UiObject rundesc = + UiObject rundesc = mDevice.findObject(new UiSelector().description("RUN")); rundesc.click(); } } - UiObject score = + UiObject score = mDevice.findObject(new UiSelector().text("SCORE DETAILS") .className("android.widget.TextView")); if (!score.waitForExists(3600000)){ -- cgit v1.2.3