commit 58e8573085bcec077a88462ac4c2fc98e1ad881d
author Sihua Ma <sihua@google.com> Fri Jul 26 16:41:49 2024 +0000
committer Sihua Ma <sihua@google.com> Tue Aug 20 07:28:35 2024 +0000
tree 9b33f9e1a4a02f246adf9a082e3bace05fe3caad
parent 109f516e3e04a3749541c06c30f3c49c09c60585

Migrate model tests to multivalent

Also migrating some other tests that have been verified

Test: SysUI studio
Test: atest NexusLauncherRoboTests
Flag: TEST_ONLY
Change-Id: I072201b8e7b98945ca88657fe813fef4727f16e4

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index c99f656..9945570 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -160,7 +160,7 @@
 }
 
 filegroup {
-    name: "launcher-testing-helpers",
+    name: "launcher-testing-helpers-multivalent",
     srcs: [
         "src/**/*.java",
         "src/**/*.kt",
@@ -174,11 +174,20 @@
         // Test classes
         "src/**/*Test.java",
         "src/**/*Test.kt",
+        "src/**/RoboApiWrapper.kt",
         "multivalentTests/src/**/*Test.java",
         "multivalentTests/src/**/*Test.kt",
     ],
 }
 
+filegroup {
+    name: "launcher-testing-helpers",
+    srcs: [
+        ":launcher-testing-helpers-multivalent",
+        "src/**/RoboApiWrapper.kt",
+    ],
+}
+
 android_robolectric_test {
     enabled: true,
     name: "Launcher3RoboTests",
@@ -186,7 +195,7 @@
         ":launcher3-robo-src",
 
         // Test util classes
-        ":launcher-testing-helpers",
+        ":launcher-testing-helpers-multivalent",
         ":launcher-testing-shared",
     ],
     exclude_srcs: [