commit 7f7769b82ef55bfd4ee4cae03617eafc4e35a24a
author Treehugger Robot <treehugger-gerrit@google.com> Thu Apr 15 10:01:20 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 15 10:01:20 2021 +0000
tree ea922035fa42e6f8ff3605998269c22422b31087
parent 7771a62ab11a37e7418a707a984f9d3a8f1b30e1
parent df2a314d6cefa2aec6f512e92a76a70ce4978a9a

Merge "Add test for [set|is]BypassableVpn" am: 3fbec7cf77

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676426

Change-Id: Ia433edec97f3a02c95dcf89f9f8ae80244063a89

tests/net/common/java/android/net/NetworkAgentConfigTest.kt

diff --git a/tests/net/common/java/android/net/NetworkAgentConfigTest.kt b/tests/net/common/java/android/net/NetworkAgentConfigTest.kt
index 454d5b5..2b45b3d 100644
--- a/tests/net/common/java/android/net/NetworkAgentConfigTest.kt
+++ b/tests/net/common/java/android/net/NetworkAgentConfigTest.kt
@@ -44,6 +44,9 @@
             setSubscriberId("MySubId")
             setPartialConnectivityAcceptable(false)
             setUnvalidatedConnectivityAcceptable(true)
+            if (isAtLeastS()) {
+                setBypassableVpn(true)
+            }
         }.build()
         if (isAtLeastS()) {
             // From S, the config will have 12 items
@@ -66,6 +69,7 @@
             if (isAtLeastS()) {
                 setNat64DetectionEnabled(false)
                 setProvisioningNotificationEnabled(false)
+                setBypassableVpn(true)
             }
         }.build()
 
@@ -78,6 +82,7 @@
         if (isAtLeastS()) {
             assertFalse(config.isNat64DetectionEnabled())
             assertFalse(config.isProvisioningNotificationEnabled())
+            assertTrue(config.isBypassableVpn())
         } else {
             assertTrue(config.isNat64DetectionEnabled())
             assertTrue(config.isProvisioningNotificationEnabled())