From 6d0d111c6dd9695458d4d49da863b708f015a729 Mon Sep 17 00:00:00 2001
From: Joanne Chung <joannechung@google.com>
Date: Wed, 22 Jul 2020 01:12:02 +0800
Subject: [PATCH] Add TEST_MAPPINGs for autofill under widget

Autofill broken tests (b/159037010, b/159035197, b/152444221) that
weren't executed in presubmit. Add the fail tests into TEST_MAPPING
to make sure the tests can be tested in presubmit.

Bug: 154961272
Test: atest --test-mapping frameworks/base/core/java/android/widget
Test: atest --test-mapping
frameworks/base/core/java/android/widget/inline
Test: TreeHugger

Change-Id: I718c86d8f55234a330235672016c877986c30d54
---
 core/java/android/widget/TEST_MAPPING         | 39 +++++++++++++++++++
 .../widget/inline/InlineContentView.java      |  2 +-
 core/java/android/widget/inline/TEST_MAPPING  | 15 +++++++
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 core/java/android/widget/inline/TEST_MAPPING

diff --git a/core/java/android/widget/TEST_MAPPING b/core/java/android/widget/TEST_MAPPING
index f089f48368a0a..df3024eda4b63 100644
--- a/core/java/android/widget/TEST_MAPPING
+++ b/core/java/android/widget/TEST_MAPPING
@@ -17,6 +17,45 @@
         }
       ],
       "file_patterns": ["Toast\\.java"]
+    },
+    {
+      "name": "CtsAutoFillServiceTestCases",
+      "options": [
+        {
+          "include-filter": "android.autofillservice.cts.LoginActivityTest"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-annotation": "android.platform.test.annotations.AppModeFull"
+        }
+      ]
+    },
+    {
+      "name": "CtsAutoFillServiceTestCases",
+      "options": [
+        {
+          "include-filter": "android.autofillservice.cts.AutofillValueTest"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    },
+    {
+      "name": "CtsAutoFillServiceTestCases",
+      "options": [
+        {
+          "include-filter": "android.autofillservice.cts.CheckoutActivityTest"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-annotation": "android.platform.test.annotations.AppModeFull"
+        }
+      ]
     }
   ]
 }
diff --git a/core/java/android/widget/inline/InlineContentView.java b/core/java/android/widget/inline/InlineContentView.java
index 9712311aab7c4..699a7735bbeed 100644
--- a/core/java/android/widget/inline/InlineContentView.java
+++ b/core/java/android/widget/inline/InlineContentView.java
@@ -59,7 +59,7 @@ import java.util.function.Consumer;
  */
 public class InlineContentView extends ViewGroup {
 
-    private static final String TAG = "InlineContentView";
+    private static final String TAG = "InlineContentView_test2";
 
     private static final boolean DEBUG = false;
 
diff --git a/core/java/android/widget/inline/TEST_MAPPING b/core/java/android/widget/inline/TEST_MAPPING
new file mode 100644
index 0000000000000..0baad5c31af9c
--- /dev/null
+++ b/core/java/android/widget/inline/TEST_MAPPING
@@ -0,0 +1,15 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsAutoFillServiceTestCases",
+      "options": [
+        {
+          "include-filter": "android.autofillservice.cts.inline"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    }
+  ]
+}