From 5a7eeec399815e7ede293ffd49b7337304a2b1c9 Mon Sep 17 00:00:00 2001
From: Sandro Montanari <sandrom@google.com>
Date: Wed, 5 Mar 2025 11:32:29 +0000
Subject: [PATCH] Add NetworkSecurityUnitTests to tethering-mainline-presubmit

Test with connectivity/tethering module only, to catch integration issues with older versions of other modules.

Only the unit test are added to the test_mapping for now. The CTS tests are not compatible with older dessert releases.

The min_sdk_version in the test build target should help preventing the
regressions from b/398885474.

Bug: 397130276
Test: on go/abtd
Change-Id: I215758a34901ff048a8279b4a417ef9f4797db0f
---
 networksecurity/TEST_MAPPING               | 5 +++++
 networksecurity/tests/unit/Android.bp      | 1 +
 networksecurity/tests/unit/AndroidTest.xml | 6 ++++++
 3 files changed, 12 insertions(+)

diff --git a/networksecurity/TEST_MAPPING b/networksecurity/TEST_MAPPING
index 448ee8498e..f75bf9ab9f 100644
--- a/networksecurity/TEST_MAPPING
+++ b/networksecurity/TEST_MAPPING
@@ -1,4 +1,9 @@
 {
+  "tethering-mainline-presubmit": [
+    {
+      "name": "NetworkSecurityUnitTests"
+    }
+  ],
   "presubmit": [
     {
       "name": "CtsNetSecConfigCertificateTransparencyTestCases"
diff --git a/networksecurity/tests/unit/Android.bp b/networksecurity/tests/unit/Android.bp
index 11263cf104..1336acc1b6 100644
--- a/networksecurity/tests/unit/Android.bp
+++ b/networksecurity/tests/unit/Android.bp
@@ -41,4 +41,5 @@ android_test {
     ],
 
     sdk_version: "test_current",
+    min_sdk_version: "VanillaIceCream",
 }
diff --git a/networksecurity/tests/unit/AndroidTest.xml b/networksecurity/tests/unit/AndroidTest.xml
index 3c94df78bb..fc0943ef14 100644
--- a/networksecurity/tests/unit/AndroidTest.xml
+++ b/networksecurity/tests/unit/AndroidTest.xml
@@ -17,6 +17,12 @@
 <configuration description="Runs NetworkSecurity Mainline unit Tests.">
     <option name="test-tag" value="NetworkSecurityUnitTests" />
 
+    <!--
+        Only run tests if the device under test is SDK version 35 (Android 15) or above.
+    -->
+    <object type="module_controller"
+            class="com.android.tradefed.testtype.suite.module.Sdk35ModuleController" />
+
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="test-file-name" value="NetworkSecurityUnitTests.apk" />
     </target_preparer>