Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add meaningful exception when the device is in an unknown state"

Browse Source
This commit is contained in:
Nataniel Borges
2020-03-17 16:49:11 +00:00
committed by Android (Google) Code Review
parent 9880657555 fd683f7113
commit 2884e6bb3c
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ImeAppHelper.java
View File

@@ -18,6 +18,8 @@ package com.android.server.wm.flicker.helpers;
import static android.os.SystemClock.sleep;
import static org.junit.Assert.assertNotNull;
import android.app.Instrumentation;
import android.support.test.uiautomator.By;
import android.support.test.uiautomator.UiDevice;
@@ -35,6 +37,8 @@ public class ImeAppHelper extends FlickerAppHelper {
public void clickEditTextWidget(UiDevice device) {
UiObject2 editText = device.findObject(By.res(getPackage(), "plain_text_input"));
assertNotNull("Text field not found, this usually happens when the device was left "
+ "in an unknown state (e.g. in split screen)", editText);
editText.click();
sleep(500);
}

13
tests/FlickerTests/src/com/android/server/wm/flicker/helpers/PipAppHelper.java
View File

@@ -16,13 +16,14 @@
package com.android.server.wm.flicker.helpers;
import static com.android.server.wm.flicker.helpers.AutomationUtils.getPipWindowSelector;
import static com.android.server.wm.flicker.helpers.AutomationUtils.hasPipWindow;
import static org.junit.Assert.assertNotNull;
import android.app.Instrumentation;
import android.support.test.uiautomator.By;
import android.support.test.uiautomator.UiDevice;
import android.support.test.uiautomator.UiObject2;
import android.support.test.uiautomator.Until;
public class PipAppHelper extends FlickerAppHelper {
@@ -32,12 +33,10 @@ public class PipAppHelper extends FlickerAppHelper {
public void clickEnterPipButton(UiDevice device) {
UiObject2 enterPipButton = device.findObject(By.res(getPackage(), "enter_pip"));
assertNotNull("Pip button not found, this usually happens when the device was left "
+ "in an unknown state (e.g. in split screen)", enterPipButton);
enterPipButton.click();
UiObject2 pipWindow = device.wait(Until.findObject(getPipWindowSelector()), sFindTimeout);
if (pipWindow == null) {
throw new RuntimeException("Unable to find PIP window");
}
hasPipWindow(device);
}
public void closePipWindow(UiDevice device) {