From 7e399a63a94c992cca5d00eb34ef25af136b7f46 Mon Sep 17 00:00:00 2001 From: Rex Hoffman Date: Thu, 15 Dec 2022 19:33:29 +0000 Subject: Let upstream robolectric tests run in the build Test: mma Bug: 262751072 Change-Id: Ic98b5836116d6fe2abb2903cc7510bf12811972f Merged-In: Ic98b5836116d6fe2abb2903cc7510bf12811972f --- robotest.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/robotest.sh b/robotest.sh index e1d992e8d..e95f09df3 100755 --- a/robotest.sh +++ b/robotest.sh @@ -80,6 +80,9 @@ function junit() { -Drobolectric.dependency.dir="${PRIVATE_ROBOLECTRIC_PATH}" -Drobolectric.offline=true -Drobolectric.logging=stdout + -Drobolectric.usePreinstrumentedJars=false + -Drobolectric.conscryptMode=OFF + -Drobolectric.logging.enabled=true -cp "$classpath" com.android.junitxml.JUnitXmlRunner ) -- cgit v1.2.3 From c9801f5d38fb9c59ea1c08262cc3f0a4dd7b0b3e Mon Sep 17 00:00:00 2001 From: Rex Hoffman Date: Fri, 24 Feb 2023 15:01:08 +0000 Subject: Update owner Bug: 266743013 Test: N/A Merged-In: Ia2894426c4738c20c01b47b0e5ee2b051645953f Change-Id: I48646c82cc3bcdd15e2aae1a818e8c905b7e0920 --- OWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OWNERS b/OWNERS index 2011246ec..c87e60eea 100644 --- a/OWNERS +++ b/OWNERS @@ -1,6 +1,6 @@ brettchabot@google.com hoisie@google.com jplemieux@google.com -leechou@google.com yukl@google.com -tmfang@google.com \ No newline at end of file +tmfang@google.com +chiujason@google.com -- cgit v1.2.3 From c5861628d90e942b6abc2b8cdddc35a807587023 Mon Sep 17 00:00:00 2001 From: Rex Hoffman Date: Fri, 24 Feb 2023 15:03:02 +0000 Subject: Restrict robolectric usage to existing modules, per agreement with framework. add uptesting to owners. Bug: 266743013 Test: m Change-Id: I59062066228fcbe124b3dae85f593f83ade79159 Merged-In: I59062066228fcbe124b3dae85f593f83ade79159 --- Android.bp | 39 ++++++++++++++++++++++++++++++++++++++- OWNERS | 5 +++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/Android.bp b/Android.bp index 774c382db..5be12fb7b 100644 --- a/Android.bp +++ b/Android.bp @@ -177,7 +177,44 @@ java_library_host { java_host_for_device { name: "Robolectric_all-target", libs: ["Robolectric_all"], - visibility: ["//visibility:public"], + visibility: [ + ":__subpackages__", + //java references + "//frameworks/opt/net/wifi/libs/WifiTrackerLib/tests:__pkg__", + "//prebuilts/sdk/current/androidx:__pkg__", + "//prebuilts/sdk/current/aaos-libs:__pkg__", + "//packages/apps/TV/tests/common:__pkg__", + //robolectric tests + "//vendor:__subpackages__", + "//platform_testing/robolab/roboStandaloneProj/tests:__pkg__", + "//external/mobile-data-download/javatests:__pkg__", + "//frameworks/base/services/robotests:__pkg__", + "//frameworks/base/services/robotests/backup:__pkg__", + "//frameworks/base/packages/SettingsLib/tests/robotests:__pkg__", + "//frameworks/base/packages/SystemUI:__pkg__", + "//frameworks/opt/car/setupwizard/library/main/tests/robotests:__pkg__", + "//frameworks/opt/localepicker/tests:__pkg__", + "//frameworks/opt/wear/signaldetector/robotests:__pkg__", + "//frameworks/opt/wear/robotests:__pkg__", + "//packages/modules/Connectivity/nearby/tests/multidevices/clients/test_support/snippet_helper/tests:__pkg__", + "//packages/modules/Connectivity/nearby/tests/robotests:__pkg__", + "//packages/modules/DeviceLock/DeviceLockController/tests/robolectric:__pkg__", + "//packages/services/Car/tests/CarLibTests:__pkg__", + "//packages/services/Mms/tests/robotests:__pkg__", + "//packages/apps/QuickAccessWallet/tests/robolectric:__pkg__", + "//packages/apps/ManagedProvisioning/tests/robotests:__pkg__", + "//packages/apps/Car/Notification/tests/robotests:__pkg__", + "//packages/apps/Car/Cluster/DirectRenderingCluster/tests/robotests:__pkg__", + "//packages/apps/Car/Settings/tests/robotests:__pkg__", + "//packages/apps/EmergencyInfo/tests/robolectric:__pkg__", + "//packages/apps/StorageManager/robotests:__pkg__", + "//packages/apps/Settings/tests/robotests:__pkg__", + "//packages/apps/ThemePicker/tests/robotests:__pkg__", + "//packages/apps/WallpaperPicker2/tests/robotests:__pkg__", + "//packages/apps/TvSettings/Settings/tests/robotests:__pkg__", + "//packages/apps/KeyChain/robotests:__pkg__", + "//packages/apps/CertInstaller/robotests:__pkg__", + ], } // Make dependencies available as host jars diff --git a/OWNERS b/OWNERS index c87e60eea..8036aa048 100644 --- a/OWNERS +++ b/OWNERS @@ -4,3 +4,8 @@ jplemieux@google.com yukl@google.com tmfang@google.com chiujason@google.com +rexhoffman@google.com +yuwu@google.com +congxiliu@google.com +ramperi@google.com +ihcinihsdk@google.com -- cgit v1.2.3 From da7ba80fa85fae326d5c710aa493adaf979d7ed1 Mon Sep 17 00:00:00 2001 From: Rex Hoffman Date: Fri, 24 Feb 2023 00:02:52 +0000 Subject: Restrict robolectric usage to existing modules, per agreement with framework. add uptesting to owners. Updates for tm-dev. Bug: 266743013 Test: m Change-Id: I182180c9d737fdfeff57cde7e110aefe712751bb --- Android.bp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Android.bp b/Android.bp index 5be12fb7b..338d25920 100644 --- a/Android.bp +++ b/Android.bp @@ -214,6 +214,9 @@ java_host_for_device { "//packages/apps/TvSettings/Settings/tests/robotests:__pkg__", "//packages/apps/KeyChain/robotests:__pkg__", "//packages/apps/CertInstaller/robotests:__pkg__", + //tm-dev additions + "//frameworks/base/packages/BackupEncryption/test/robolectric-integration:__pkg__", + "//frameworks/base/packages/BackupEncryption/test/robolectric:__pkg__", ], } -- cgit v1.2.3 From 45c56c6e6a0e0ead7ca202e107498b3eafe2a807 Mon Sep 17 00:00:00 2001 From: Rex Hoffman Date: Tue, 28 Feb 2023 20:35:18 +0000 Subject: Add packages/apps/Car/libs missing visibility to fix the build. Adding to Robolectric_all-target's visibility: packages/apps/Car/libs/car-media-common/tests/robotests packages/apps/Car/libs/car-ui-lib Test: m Bug: 266743013 Change-Id: I0bf0eb738f0cdbdfe0dda8c078b71aa85aafdb59 Merged-In: I0bf0eb738f0cdbdfe0dda8c078b71aa85aafdb59 --- Android.bp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Android.bp b/Android.bp index 338d25920..a6563ce40 100644 --- a/Android.bp +++ b/Android.bp @@ -203,6 +203,8 @@ java_host_for_device { "//packages/services/Mms/tests/robotests:__pkg__", "//packages/apps/QuickAccessWallet/tests/robolectric:__pkg__", "//packages/apps/ManagedProvisioning/tests/robotests:__pkg__", + "//packages/apps/Car/libs/car-media-common/tests/robotests", + "//packages/apps/Car/libs/car-ui-lib", "//packages/apps/Car/Notification/tests/robotests:__pkg__", "//packages/apps/Car/Cluster/DirectRenderingCluster/tests/robotests:__pkg__", "//packages/apps/Car/Settings/tests/robotests:__pkg__", -- cgit v1.2.3