Moving OrientationTouchTransformerTest to instrumentation tests
Bug: 196825541
Test: Presubmit
Change-Id: Ifb0b00f789214a8dde246ab13703211d536364af
diff --git a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
index 35a851a..81e6917 100644
--- a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
+++ b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
@@ -462,7 +462,7 @@
+ "mRotation: " + mRotation
+ " this: " + this);
}
- event.transform(mTmpMatrix);
+ event.applyTransform(mTmpMatrix);
return true;
}
mTmpPoint[0] = event.getX();
@@ -478,7 +478,7 @@
}
if (contains(mTmpPoint[0], mTmpPoint[1])) {
- event.transform(mTmpMatrix);
+ event.applyTransform(mTmpMatrix);
return true;
}
return false;
diff --git a/quickstep/robolectric_tests/src/com/android/quickstep/OrientationTouchTransformerTest.java b/quickstep/tests/src/com/android/quickstep/OrientationTouchTransformerTest.java
similarity index 98%
rename from quickstep/robolectric_tests/src/com/android/quickstep/OrientationTouchTransformerTest.java
rename to quickstep/tests/src/com/android/quickstep/OrientationTouchTransformerTest.java
index 2b1b57c..159a51f 100644
--- a/quickstep/robolectric_tests/src/com/android/quickstep/OrientationTouchTransformerTest.java
+++ b/quickstep/tests/src/com/android/quickstep/OrientationTouchTransformerTest.java
@@ -19,6 +19,8 @@
import static android.view.Display.DEFAULT_DISPLAY;
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+
import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
import static org.junit.Assert.assertFalse;
@@ -40,6 +42,9 @@
import android.view.MotionEvent;
import android.view.Surface;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+
import com.android.launcher3.ResourceUtils;
import com.android.launcher3.util.DisplayController;
@@ -47,10 +52,9 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-@RunWith(RobolectricTestRunner.class)
+@SmallTest
+@RunWith(AndroidJUnit4.class)
public class OrientationTouchTransformerTest {
static class ScreenSize {
int mHeight;
@@ -293,7 +297,7 @@
}
private DisplayController.Info createDisplayInfo(ScreenSize screenSize, int rotation) {
- Context context = RuntimeEnvironment.application;
+ Context context = getApplicationContext();
Display display = spy(context.getSystemService(DisplayManager.class)
.getDisplay(DEFAULT_DISPLAY));