1
0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-03-20 17:48:44 +00:00

Add setScreenOrientation to BaseUiAutomation class

This allows workloads to be launched in a pre-determined orientation not the orientation of the physical device itself.

Updated the productivity workloads to take advantage of this new facility.
This commit is contained in:
James Hartley 2016-05-10 13:57:02 +01:00
parent c4bf3c59de
commit e95227175d
9 changed files with 37 additions and 2 deletions

Binary file not shown.

View File

@ -35,6 +35,7 @@ import com.android.uiautomator.testrunner.UiAutomatorTestCase;
public class BaseUiAutomation extends UiAutomatorTestCase { public class BaseUiAutomation extends UiAutomatorTestCase {
public long waitTimeout = TimeUnit.SECONDS.toMillis(4); public long waitTimeout = TimeUnit.SECONDS.toMillis(4);
public enum ScreenOrientation { RIGHT, NATURAL, LEFT };
public void sleep(int second) { public void sleep(int second) {
super.sleep(second * 1000); super.sleep(second * 1000);
@ -251,4 +252,24 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
view.performTwoPointerGesture(startPoint1, startPoint2, endPoint1, endPoint2, steps); view.performTwoPointerGesture(startPoint1, startPoint2, endPoint1, endPoint2, steps);
} }
public void setScreenOrientation(ScreenOrientation orientation) throws Exception {
switch (orientation) {
case RIGHT:
getUiDevice().setOrientationRight();
break;
case NATURAL:
getUiDevice().setOrientationNatural();
break;
case LEFT:
getUiDevice().setOrientationLeft();
break;
default:
throw new Exception("No orientation specified");
}
}
public void unsetScreenOrientation() throws Exception {
getUiDevice().unfreezeRotation();
}
} }

View File

@ -39,6 +39,8 @@ public class UiAutomation extends UxPerfUiAutomation {
public void runUiAutomation() throws Exception { public void runUiAutomation() throws Exception {
parameters = getParams(); parameters = getParams();
setScreenOrientation(ScreenOrientation.NATURAL);
clearFirstRunDialogues(); clearFirstRunDialogues();
clickNewMail(); clickNewMail();

View File

@ -43,12 +43,14 @@ public class UiAutomation extends UxPerfUiAutomation {
public void runUiAutomation() throws Exception { public void runUiAutomation() throws Exception {
parameters = getParams(); parameters = getParams();
setScreenOrientation(ScreenOrientation.NATURAL);
confirmAccess(); confirmAccess();
dismissWelcomeView(); dismissWelcomeView();
gesturesTest(); gesturesTest();
editPhotoColorTest(); editPhotoColorTest();
cropPhotoTest(); cropPhotoTest();
rotatePhotoTest(); rotatePhotoTest();
unsetScreenOrientation();
writeResultsToFile(timingResults, parameters.getString("output_file")); writeResultsToFile(timingResults, parameters.getString("output_file"));
} }

View File

@ -44,17 +44,23 @@ public class UiAutomation extends UxPerfUiAutomation {
public void runUiAutomation() throws Exception { public void runUiAutomation() throws Exception {
parameters = getParams(); parameters = getParams();
dismissWelcomeView(); setScreenOrientation(ScreenOrientation.NATURAL);
dismissWelcomeView();
signInOnline(parameters); signInOnline(parameters);
<<<<<<< HEAD
confirmAccess(); confirmAccess();
=======
confirmLocalFileAccess();
>>>>>>> 3991e73... Add setScreenOrientation to BaseUiAutomation class
gesturesTest("Getting Started.pdf"); gesturesTest("Getting Started.pdf");
String[] searchStrings = {"Glossary", "cortex"}; String[] searchStrings = {"Glossary", "cortex"};
searchPdfTest("cortex_m4", searchStrings); searchPdfTest("cortex_m4", searchStrings);
unsetScreenOrientation();
writeResultsToFile(timingResults, parameters.getString("output_file")); writeResultsToFile(timingResults, parameters.getString("output_file"));
} }

View File

@ -62,6 +62,8 @@ public class UiAutomation extends UxPerfUiAutomation {
outputDir = parameters.getString("output_dir", "/sdcard/wa-working"); outputDir = parameters.getString("output_dir", "/sdcard/wa-working");
dumpsysEnabled = Boolean.parseBoolean(parameters.getString("dumpsys_enabled")); dumpsysEnabled = Boolean.parseBoolean(parameters.getString("dumpsys_enabled"));
setScreenOrientation(ScreenOrientation.NATURAL);
// Run tests // Run tests
handleLoginScreen(loginName, loginPass); handleLoginScreen(loginName, loginPass);
confirmAccess(); confirmAccess();
@ -72,6 +74,8 @@ public class UiAutomation extends UxPerfUiAutomation {
voiceCallTest(callDuration); voiceCallTest(callDuration);
} }
unsetScreenOrientation();
// Save results // Save results
writeResultsToFile(results, resultsFile); writeResultsToFile(results, resultsFile);
} }