commit 9a8a3091ba3e21ddaf366c2c4276537541abcac2
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Mar 23 00:14:35 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Mar 23 00:14:35 2024 +0000
tree 8765138fb262f95b96412e3aa1e06fae6d813712
parent 9adc98841270f1442ff5d33c0a4dae8403d5084c
parent 9b1a028bd4d5d3568d545410dd78048844e6cbc8

Merge changes from topic "revert-26664190-revert-26605558-robolectric-enable-androidx-rules-OWMAZEJUYZ-JTFGVYILBL" into main

* changes:
  Revert^2 "Move FastBitmapDrawableTest to Robolectric"
  Revert^2 "Include AndroidX test rules in Robolectric tests"

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 3a9f4ad..eeafdba 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -206,6 +206,7 @@
         "androidx.test.uiautomator_uiautomator",
         "androidx.core_core-animation-testing",
         "androidx.test.ext.junit",
+        "androidx.test.rules",
         "mockito-robolectric-prebuilt",
         "mockito-kotlin2",
         "platform-parametric-runner-lib",

tests/multivalentTests/src/com/android/launcher3/icons/FastBitmapDrawableTest.java

diff --git a/tests/src/com/android/launcher3/icons/FastBitmapDrawableTest.java b/tests/multivalentTests/src/com/android/launcher3/icons/FastBitmapDrawableTest.java
similarity index 100%
rename from tests/src/com/android/launcher3/icons/FastBitmapDrawableTest.java
rename to tests/multivalentTests/src/com/android/launcher3/icons/FastBitmapDrawableTest.java