aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-03 17:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enabling tests in landscape mode

Browse Source 
Bug: 121280703
Change-Id: I3245ca8d0b0496035658ce2a602882a62942f3f1
This commit is contained in:
vadimt
2019-06-11 19:15:14 -07:00
parent f46e3956dd
commit 06d30e54d5
9 changed files with 98 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
View File

@@ -35,7 +35,6 @@ import android.content.pm.PackageManager;
import android.os.Process;
import android.os.RemoteException;
import android.util.Log;
import android.view.Surface;
import androidx.test.InstrumentationRegistry;
import androidx.test.uiautomator.By;
@@ -67,7 +66,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;
import org.junit.runners.model.Statement;
import java.io.IOException;
import java.lang.annotation.ElementType;
@@ -124,46 +122,10 @@ public abstract class AbstractLauncherUiTest {
protected @interface PortraitLandscape {
}
@Rule
public TestRule mPortraitLandscapeExecutor =
(base, description) -> false && description.getAnnotation(PortraitLandscape.class)
!= null ? new Statement() {
@Override
public void evaluate() throws Throwable {
try {
// Create launcher activity if necessary and bring it to the front.
mLauncher.pressHome();
waitForLauncherCondition("Launcher activity wasn't created",
launcher -> launcher != null);
executeOnLauncher(launcher ->
launcher.getRotationHelper().forceAllowRotationForTesting(true));
evaluateInPortrait();
evaluateInLandscape();
} finally {
mDevice.setOrientationNatural();
executeOnLauncher(launcher ->
launcher.getRotationHelper().forceAllowRotationForTesting(false));
mLauncher.setExpectedRotation(Surface.ROTATION_0);
}
}
private void evaluateInPortrait() throws Throwable {
mDevice.setOrientationNatural();
mLauncher.setExpectedRotation(Surface.ROTATION_0);
base.evaluate();
}
private void evaluateInLandscape() throws Throwable {
mDevice.setOrientationLeft();
mLauncher.setExpectedRotation(Surface.ROTATION_90);
base.evaluate();
}
} : base;
protected TestRule getRulesInsideActivityMonitor() {
return new FailureWatcher(this);
return RuleChain.
outerRule(new PortraitLandscapeRunner(this)).
around(new FailureWatcher(this));
}
@Rule