From 06aa20724af8a4ce906555a3f5ff62fe351e1dbb Mon Sep 17 00:00:00 2001
From: felkachang <felkachang@google.com>
Date: Mon, 5 Dec 2022 07:43:39 +0000
Subject: [PATCH] Add SelfTargeting test plan

This patch adds a trigger. The trigger is triggered when someone
changes the followin files
* core/java/android/content/om/*
* core/java/com/android/internal/content/om/*
* core/jni/*Overlay*

The trigger triggers the following tests to run.
* SelfTargetingOverlayDeviceTests
* CtsContentTestCases
    * android.content.om.cts
    * android.content.res.loader.cts

Bug: 205919743
Test: atest --collect-tests-only -p \
      frameworks/base/core/java/android/content/om/
Test: atest --collect-tests-only -p \
      frameworks/base/core/java/com/android/internal/content/om/
Test: atest --collect-tests-only -p \
      frameworks/base/core/jni
Change-Id: I6018d5806c93b7b0a87331a95e144a6ab45c068c
---
 core/java/android/content/om/TEST_MAPPING     |  6 +++++
 .../android/internal/content/om/TEST_MAPPING  | 24 ++++++++++++++++++-
 core/jni/TEST_MAPPING                         | 23 ++++++++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/core/java/android/content/om/TEST_MAPPING b/core/java/android/content/om/TEST_MAPPING
index 6185cf64ad127..a9aaf1a895040 100644
--- a/core/java/android/content/om/TEST_MAPPING
+++ b/core/java/android/content/om/TEST_MAPPING
@@ -11,6 +11,9 @@
     {
       "name": "OverlayDeviceTests"
     },
+    {
+      "name": "SelfTargetingOverlayDeviceTests"
+    },
     {
       "name": "OverlayHostTests"
     },
@@ -35,6 +38,9 @@
         },
         {
           "include-filter": "android.content.om.cts"
+        },
+        {
+          "include-filter": "android.content.res.loader.cts"
         }
       ]
     }
diff --git a/core/java/com/android/internal/content/om/TEST_MAPPING b/core/java/com/android/internal/content/om/TEST_MAPPING
index 4cb595b016812..98dadce7359a2 100644
--- a/core/java/com/android/internal/content/om/TEST_MAPPING
+++ b/core/java/com/android/internal/content/om/TEST_MAPPING
@@ -7,6 +7,28 @@
           "include-filter": "com.android.internal.content."
         }
       ]
+    },
+    {
+      "name": "SelfTargetingOverlayDeviceTests"
+    }
+  ],
+  "presubmit-large": [
+    {
+      "name": "CtsContentTestCases",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-annotation": "org.junit.Ignore"
+        },
+        {
+          "include-filter": "android.content.om.cts"
+        },
+        {
+          "include-filter": "android.content.res.loader.cts"
+        }
+      ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/core/jni/TEST_MAPPING b/core/jni/TEST_MAPPING
index 004c30ee51131..28448561e1358 100644
--- a/core/jni/TEST_MAPPING
+++ b/core/jni/TEST_MAPPING
@@ -11,6 +11,29 @@
         }
       ],
       "file_patterns": ["CharsetUtils|FastData"]
+    },
+    {
+      "name": "SelfTargetingOverlayDeviceTests",
+      "file_patterns": ["Overlay"]
+    }
+  ],
+  "presubmit-large": [
+    {
+      "name": "CtsContentTestCases",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-annotation": "org.junit.Ignore"
+        },
+        {
+          "include-filter": "android.content.om.cts"
+        },
+        {
+          "include-filter": "android.content.res.loader.cts"
+        }
+      ]
     }
   ]
 }