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

Minor code maintenance for base class BaseUiAutomation

Browse Source 
- Rename inconsistently named variables
- Avoid long wrapped lines where possible
- Fix whitespace around operators
This commit is contained in:
John Richardson
2016-07-18 11:14:35 +01:00
parent ee7c04a568
commit 0388fa6f36
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wlauto/external/uiauto/src/com/arm/wlauto/uiauto/BaseUiAutomation.java vendored
View File

@@ -86,11 +86,11 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
public boolean takeScreenshot(String name) {
Bundle params = getParams();
String png_dir = params.getString("workdir");
String pngDir = params.getString("workdir");
try {
return getUiDevice().takeScreenshot(new File(png_dir, name + ".png"));
} catch(NoSuchMethodError e) {
return getUiDevice().takeScreenshot(new File(pngDir, name + ".png"));
} catch (NoSuchMethodError e) {
return true;
}
}
@@ -101,9 +101,9 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
public void waitText(String text, int second) throws UiObjectNotFoundException {
UiSelector selector = new UiSelector();
UiObject text_obj = new UiObject(selector.text(text)
UiObject textObj = new UiObject(selector.text(text)
.className("android.widget.TextView"));
waitObject(text_obj, second);
waitObject(textObj, second);
}
public void waitObject(UiObject obj) throws UiObjectNotFoundException {
@@ -111,7 +111,7 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
}
public void waitObject(UiObject obj, int second) throws UiObjectNotFoundException {
if (! obj.waitForExists(second * 1000)){
if (!obj.waitForExists(second * 1000)) {
throw new UiObjectNotFoundException("UiObject is not found: "
+ obj.getSelector().toString());
}
@@ -133,10 +133,10 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
long currentTime = System.currentTimeMillis();
boolean found = false;
while ((currentTime - startTime) < timeout){
while ((currentTime - startTime) < timeout) {
sleep(2); // poll every two seconds
while((line=reader.readLine())!=null) {
while ((line = reader.readLine()) != null) {
if (line.contains(searchText)) {
found = true;
break;
@@ -152,7 +152,8 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
process.destroy();
if ((currentTime - startTime) >= timeout) {
throw new TimeoutException("Timed out waiting for Logcat text \"%s\"".format(searchText));
throw new TimeoutException(String.format("Timed out waiting for Logcat text \"%s\"",
searchText));
}
}