From 87ac9c6ab3da7362bab192999c645b54ad1eba3b Mon Sep 17 00:00:00 2001 From: Marc Bonnici Date: Wed, 19 Dec 2018 11:18:47 +0000 Subject: 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. --- .../androbench/com.arm.wa.uiauto.androbench.apk | Bin 264055 -> 264099 bytes .../com/arm/wa/uiauto/androbench/UiAutomation.java | 18 ++++++++++++------ 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 Binary files a/wa/workloads/androbench/com.arm.wa.uiauto.androbench.apk and b/wa/workloads/androbench/com.arm.wa.uiauto.androbench.apk 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()); } } -- cgit v1.2.3