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

Passing instrumentation to LauncherInstrumentation

Browse Source 
UiDevice, the old param, belongs to a support lib; as TAPL switched to
AndroidX, it became impossible to pass it from platform tests
that still use the old support lib.

Bug: 110103162
Test: TaplTests
Change-Id: I1f82099b432912fa40da96df0d6179579aab66a3
This commit is contained in:
Vadim Tryshev
2018-08-21 16:30:09 -07:00
parent 23bb710b3d
commit fd34b94b33
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,9 @@ import android.graphics.Point;
import android.os.Process;
import android.os.RemoteException;
import android.os.SystemClock;
import android.util.Log;
import android.view.MotionEvent;
import androidx.test.InstrumentationRegistry;
import androidx.test.uiautomator.By;
import androidx.test.uiautomator.BySelector;
@@ -36,8 +39,6 @@ import androidx.test.uiautomator.Direction;
import androidx.test.uiautomator.UiDevice;
import androidx.test.uiautomator.UiObject2;
import androidx.test.uiautomator.Until;
import android.util.Log;
import android.view.MotionEvent;
import com.android.launcher3.Launcher;
import com.android.launcher3.LauncherAppState;
@@ -90,7 +91,7 @@ public abstract class AbstractLauncherUiTest {
@Before
public void setUp() throws Exception {
mDevice = UiDevice.getInstance(getInstrumentation());
mLauncher = new LauncherInstrumentation(mDevice);
mLauncher = new LauncherInstrumentation(getInstrumentation());
mTargetContext = InstrumentationRegistry.getTargetContext();
mTargetPackage = mTargetContext.getPackageName();
}