aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Bonnici <marc.bonnici@arm.com>2018-12-19 11:18:47 +0000
committerMarc Bonnici <marc.bonnici@arm.com>2018-12-21 14:26:55 +0000
commit87ac9c6ab3da7362bab192999c645b54ad1eba3b (patch)
tree1a6b7f9a217d68b9636e0b8b2549c37265e61c29
parentea5ea90bb625649756afa7ae05a8fb0af860091d (diff)
workloads/androbench: Fix extracting benchmark results
On some devices the entire results page fits on one screen and does not present a scrollable element, therefore only attempt to scroll if available.
-rw-r--r--wa/workloads/androbench/com.arm.wa.uiauto.androbench.apkbin264055 -> 264099 bytes
-rwxr-xr-xwa/workloads/androbench/uiauto/app/src/main/java/com/arm/wa/uiauto/androbench/UiAutomation.java18
2 files changed, 12 insertions, 6 deletions
diff --git a/wa/workloads/androbench/com.arm.wa.uiauto.androbench.apk b/wa/workloads/androbench/com.arm.wa.uiauto.androbench.apk
index 3c9abd3a..0b580183 100644
--- a/wa/workloads/androbench/com.arm.wa.uiauto.androbench.apk
+++ b/wa/workloads/androbench/com.arm.wa.uiauto.androbench.apk
Binary files differ
diff --git a/wa/workloads/androbench/uiauto/app/src/main/java/com/arm/wa/uiauto/androbench/UiAutomation.java b/wa/workloads/androbench/uiauto/app/src/main/java/com/arm/wa/uiauto/androbench/UiAutomation.java
index ae482c32..225d67bb 100755
--- a/wa/workloads/androbench/uiauto/app/src/main/java/com/arm/wa/uiauto/androbench/UiAutomation.java
+++ b/wa/workloads/androbench/uiauto/app/src/main/java/com/arm/wa/uiauto/androbench/UiAutomation.java
@@ -98,17 +98,23 @@ public class UiAutomation extends BaseUiAutomation {
UiScrollable scrollView = new UiScrollable(new UiSelector().scrollable(true));
Log.d(TAG, "Sequential Read Score " + seqRead.getText());
- scrollView.scrollIntoView(seqWrite);
+
+ if (scrollView.exists()){scrollView.scrollIntoView(seqWrite); }
Log.d(TAG, "Sequential Write Score " + seqWrite.getText());
- scrollView.scrollIntoView(ranRead);
+
+ if (scrollView.exists()){scrollView.scrollIntoView(ranRead);}
Log.d(TAG, "Random Read Score " + ranRead.getText());
- scrollView.scrollIntoView(ranWrite);
+
+ if (scrollView.exists()){scrollView.scrollIntoView(ranWrite);}
Log.d(TAG, "Random Write Score " + ranWrite.getText());
- scrollView.scrollIntoView(sqlInsert);
+
+ if (scrollView.exists()){scrollView.scrollIntoView(sqlInsert);}
Log.d(TAG, "SQL Insert Score " + sqlInsert.getText());
- scrollView.scrollIntoView(sqlUpdate);
+
+ if (scrollView.exists()){scrollView.scrollIntoView(sqlUpdate);}
Log.d(TAG, "SQL Update Score " + sqlUpdate.getText());
- scrollView.scrollIntoView(sqlDelete);
+
+ if (scrollView.exists()){scrollView.scrollIntoView(sqlDelete);}
Log.d(TAG, "SQL Delete Score " + sqlDelete.getText());
}
}