packages/modules/Wifi: configure TEST_MAPPING

Bug: 176260047
Test: presubmit
Change-Id: I5d72e62c9cb8cc0c63cb99d847cf3efbaffab079

4 files changed, 37 insertions, 37 deletions

diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000000..1ce70c021e
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,27 @@
+{
+  "presubmit": [
+    {
+      "name": "MtsWifiTestCases"
+    }
+  ],
+  "presubmit-large": [
+    {
+      "name": "CtsWifiTestCases",
+      "options": [
+        {
+          "exclude-annotation": "android.net.wifi.cts.VirtualDeviceNotSupported"
+        }
+      ]
+    }
+  ],
+  "mainline-presubmit": [
+    {
+      "name": "CtsWifiTestCases[com.google.android.wifi.apex]",
+      "options": [
+        {
+          "exclude-annotation": "android.net.wifi.cts.VirtualDeviceNotSupported"
+        }
+      ]
+    }
+  ]
+}
diff --git a/framework/TEST_MAPPING b/framework/TEST_MAPPING
index 7ddc30872c..95e57a7621 100644
--- a/framework/TEST_MAPPING
+++ b/framework/TEST_MAPPING
@@ -1,22 +1,12 @@
 {
-  "presubmit-large": [
+  "presubmit": [
     {
-      "name": "CtsWifiTestCases",
-      "options": [
-        {
-          "exclude-annotation": "android.net.wifi.cts.VirtualDeviceNotSupported"
-        }
-      ]
-    }
-  ],
-  "mainline-presubmit": [
+      "name": "FrameworksWifiApiTests"
+    },
     {
-      "name": "CtsWifiTestCases[com.google.android.wifi.apex]",
-      "options": [
-        {
-          "exclude-annotation": "android.net.wifi.cts.VirtualDeviceNotSupported"
-        }
-      ]
+      // run service unit tests for API changes (since API changes can break service, but not the
+      // other way around)
+      "name": "FrameworksWifiTests"
     }
   ]
 }
diff --git a/service/TEST_MAPPING b/service/TEST_MAPPING
index 7d6f93dc8f..fe5ba48d45 100644
--- a/service/TEST_MAPPING
+++ b/service/TEST_MAPPING
@@ -11,25 +11,5 @@
         }
       ]
     }
-  ],
-  "presubmit-large": [
-    {
-      "name": "CtsWifiTestCases",
-      "options": [
-        {
-          "exclude-annotation": "android.net.wifi.cts.VirtualDeviceNotSupported"
-        }
-      ]
-    }
-  ],
-  "mainline-presubmit": [
-    {
-      "name": "CtsWifiTestCases[com.google.android.wifi.apex]",
-      "options": [
-        {
-          "exclude-annotation": "android.net.wifi.cts.VirtualDeviceNotSupported"
-        }
-      ]
-    }
   ]
 }
diff --git a/service/tests/mts/Android.bp b/service/tests/mts/Android.bp
index 19b0eb1f79..7c79db441c 100644
--- a/service/tests/mts/Android.bp
+++ b/service/tests/mts/Android.bp
@@ -44,6 +44,9 @@ android_test {
     // need access to system_current and test_current, so needs to be platform_apis: true
     platform_apis: true,
 
-    test_suites: [ "mts" ],
+    test_suites: [
+        "general-tests",
+        "mts",
+    ],
     test_config: "AndroidTest.xml",
 }