mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-03-03 17:36:49 +00:00
fixing tests to match new abstraction
This change will let us move from activity to other parent views for recent viewss Change-Id: I2424d94f799f87b2d2262da96b289aac6dfadee9
This commit is contained in:
@@ -3,6 +3,7 @@ package com.android.launcher3.ui;
|
||||
import android.util.Log;
|
||||
import android.view.Surface;
|
||||
|
||||
import com.android.launcher3.Launcher;
|
||||
import com.android.launcher3.tapl.TestHelpers;
|
||||
import com.android.launcher3.util.rule.FailureWatcher;
|
||||
|
||||
@@ -14,11 +15,12 @@ import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
import java.util.Objects;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
public class PortraitLandscapeRunner implements TestRule {
|
||||
public class PortraitLandscapeRunner<LAUNCHER_TYPE extends Launcher> implements TestRule {
|
||||
private static final String TAG = "PortraitLandscapeRunner";
|
||||
private AbstractLauncherUiTest mTest;
|
||||
private AbstractLauncherUiTest<LAUNCHER_TYPE> mTest;
|
||||
|
||||
// Annotation for tests that need to be run in portrait and landscape modes.
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
@@ -26,7 +28,7 @@ public class PortraitLandscapeRunner implements TestRule {
|
||||
public @interface PortraitLandscape {
|
||||
}
|
||||
|
||||
public PortraitLandscapeRunner(AbstractLauncherUiTest test) {
|
||||
public PortraitLandscapeRunner(AbstractLauncherUiTest<LAUNCHER_TYPE> test) {
|
||||
mTest = test;
|
||||
}
|
||||
|
||||
@@ -47,7 +49,7 @@ public class PortraitLandscapeRunner implements TestRule {
|
||||
|
||||
mTest.mDevice.pressHome();
|
||||
mTest.waitForLauncherCondition("Launcher activity wasn't created",
|
||||
launcher -> launcher != null,
|
||||
Objects::nonNull,
|
||||
TimeUnit.SECONDS.toMillis(20));
|
||||
|
||||
mTest.executeOnLauncher(launcher ->
|
||||
|
||||
Reference in New Issue
Block a user