sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-10-31 15:12:25 +00:00
Code Issues Releases Wiki Activity

Updated workload versions to match APK files

Browse Source 
Some workloads presented a different version than what was in the APK file.
With the changes introduced in bb33123 several workloads broke.
This commit is contained in:
Sebastian Goscik
2016-08-24 14:33:18 +01:00
parent 07d34e5615
commit b426e00f2f
9 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wlauto/workloads/glbenchmark/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
View File

@@ -33,7 +33,7 @@ import com.android.uiautomator.testrunner.UiAutomatorTestCase;
import com.arm.wlauto.uiauto.BaseUiAutomation;
public class UiAutomation extends BaseUiAutomation {
public class UiAutomation extends BaseUiAutomation {
public static String TAG = "glb";
public static int maxScrolls = 15;
@@ -63,7 +63,7 @@ public class UiAutomation extends BaseUiAutomation {
extractResults();
iterations -= 1;
}
Bundle status = new Bundle();
getAutomationSupport().sendStatus(Activity.RESULT_OK, status);
}
@@ -81,9 +81,9 @@ public class UiAutomation extends BaseUiAutomation {
UiObject useCaseText = new UiObject(selector.className("android.widget.TextView")
.text(useCase)
);
if (version.equals("2.7.0")){
if (version.equals("2.7")){
UiObject variantText = useCaseText.getFromParent(selector.className("android.widget.TextView")
.text(variant));
.text(variant));
int scrolls = 0;
while(!variantText.exists()) {
testList.scrollForward();
@@ -94,7 +94,7 @@ public class UiAutomation extends BaseUiAutomation {
}
variantText.click();
}
else if (version.equals("2.5.1")){
else if (version.equals("2.5")){
int scrolls = 0;
while(!useCaseText.exists()) {
testList.scrollForward();
@@ -123,7 +123,7 @@ public class UiAutomation extends BaseUiAutomation {
public void waitForResults(String version, String useCase, int timeout) throws Exception {
UiSelector selector = new UiSelector();
UiObject results = null;
if (version.equals("2.7.0"))
if (version.equals("2.7"))
results = new UiObject(selector.text("Results").className("android.widget.TextView"));
else
results = new UiObject(selector.text(useCase).className("android.widget.TextView"));
@@ -135,7 +135,7 @@ public class UiAutomation extends BaseUiAutomation {
// starting GLB.
if (!results.waitForExists(TimeUnit.SECONDS.toMillis(timeout))) {
Log.v(TAG, "Results screen not found. Attempting to bring to foreground.");
String[] commandLine = {"am", "start",
String[] commandLine = {"am", "start",
"-a", "android.intent.action.MAIN",
"-c", "android.intent.category.LAUNCHER",
"-n", "com.glbenchmark.glbenchmark27/com.glbenchmark.activities.GLBenchmarkDownloaderActivity"};