Merge "Add TEST_MAPPING for SC hostside tests" into udc-dev

3 files changed, 14 insertions, 1 deletions

diff --git a/tests/hostside/safetycenter/Android.bp b/tests/hostside/safetycenter/Android.bp
index 33b38c688..62e5f98f3 100644
--- a/tests/hostside/safetycenter/Android.bp
+++ b/tests/hostside/safetycenter/Android.bp
@@ -32,4 +32,7 @@ java_test_host {
         "cts-statsd-atom-host-test-utils",
     ],
     data: [":SafetyCenterHostSideTestsHelper"],
+    test_suites: [
+        "general-tests",
+    ],
 }
\ No newline at end of file
diff --git a/tests/hostside/safetycenter/TEST_MAPPING b/tests/hostside/safetycenter/TEST_MAPPING
new file mode 100644
index 000000000..e59ac7c39
--- /dev/null
+++ b/tests/hostside/safetycenter/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "presubmit": [
+    {
+      "name": "SafetyCenterHostSideTestCases"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/hostside/safetycenter/src/android/safetycenter/hostside/SafetyCenterInteractionLoggingHostTest.kt b/tests/hostside/safetycenter/src/android/safetycenter/hostside/SafetyCenterInteractionLoggingHostTest.kt
index f3e72a253..4fa3b5830 100644
--- a/tests/hostside/safetycenter/src/android/safetycenter/hostside/SafetyCenterInteractionLoggingHostTest.kt
+++ b/tests/hostside/safetycenter/src/android/safetycenter/hostside/SafetyCenterInteractionLoggingHostTest.kt
@@ -30,6 +30,7 @@ import com.google.common.truth.Truth.assertThat
 import org.junit.After
 import org.junit.Assume.assumeTrue
 import org.junit.Before
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -89,7 +90,7 @@ class SafetyCenterInteractionLoggingHostTest : BaseHostJUnit4Test() {
     @Test
     fun sendNotification_recordsNotificationPostedEvent() {
         executeDeviceTest(
-            testClassName = ".NotificationLoggingHelperTests",
+            testClassName = ".SafetyCenterNotificationLoggingHelperTests",
             testMethodName = "sendNotification"
         )
 
@@ -141,6 +142,8 @@ class SafetyCenterInteractionLoggingHostTest : BaseHostJUnit4Test() {
     }
 
     @Test
+    @Ignore
+    // TODO(b/278202773): Fix/de-flake this test
     fun openSubpageFromSettingsSearch_recordsEventWithSettingsNavigationSource() {
         executeDeviceTest(testMethodName = "openSubpageFromSettingsSearch")