From 444b8e6d0f95bc6fdaeaf5bb148c8bf917557638 Mon Sep 17 00:00:00 2001 From: Sihua Ma Date: Thu, 21 Mar 2024 21:50:20 +0000 Subject: [PATCH 1/2] Revert^2 "Include AndroidX test rules in Robolectric tests" c041b5c625cefe5c9f87d3a969ebdb1fa13db2cc Change-Id: I0b93613ff8544cbe2a0a108da53bc085a532b074 --- tests/Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Android.bp b/tests/Android.bp index 3a9f4ad200..eeafdba855 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -206,6 +206,7 @@ android_robolectric_test { "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", From 9b1a028bd4d5d3568d545410dd78048844e6cbc8 Mon Sep 17 00:00:00 2001 From: Sihua Ma Date: Thu, 21 Mar 2024 21:50:20 +0000 Subject: [PATCH 2/2] Revert^2 "Move FastBitmapDrawableTest to Robolectric" 393477ca544d2642c45eb7b0ced7c0c4ebaa95a2 Change-Id: I051d2456c6930336c92ffe4c6101e6dd77a502c0 --- .../src/com/android/launcher3/icons/FastBitmapDrawableTest.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/{ => multivalentTests}/src/com/android/launcher3/icons/FastBitmapDrawableTest.java (100%) 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