commit 98ae8cc62919b496fb631ac86e0adf8f1f8d0ae8
author chiachangwang <chiachangwang@google.com> Tue Aug 30 10:42:40 2022 +0000
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Tue Sep 06 06:49:52 2022 +0000
tree 8bebfb841645f27d1ea9bf5e5184fe4dacb743e7
parent b8a747c8fbe97cb9eb2ef8e969b8e681d032dccf

Add test to verify null ProxyInfo in Ikev2VpnProfile

Bug: 244281603
Test: atest FrameworksNetTests
Change-Id: Ice195b60a0f62ae541ede9277c6e36f9c72b2dbb
(cherry picked from commit 715dc5b4475fb023afd2567c482107f8ab34f1b4)
Merged-In: Ice195b60a0f62ae541ede9277c6e36f9c72b2dbb

tests/unit/java/android/net/Ikev2VpnProfileTest.java

diff --git a/tests/unit/java/android/net/Ikev2VpnProfileTest.java b/tests/unit/java/android/net/Ikev2VpnProfileTest.java
index 5cb014f..2f5b0ab 100644
--- a/tests/unit/java/android/net/Ikev2VpnProfileTest.java
+++ b/tests/unit/java/android/net/Ikev2VpnProfileTest.java
@@ -471,6 +471,23 @@
                 new Ikev2VpnProfile.Builder(tunnelParams2).build());
     }
 
+    @Test
+    public void testBuildProfileWithNullProxy() throws Exception {
+        final Ikev2VpnProfile ikev2VpnProfile =
+                new Ikev2VpnProfile.Builder(SERVER_ADDR_STRING, IDENTITY_STRING)
+                        .setAuthUsernamePassword(USERNAME_STRING, PASSWORD_STRING, mServerRootCa)
+                        .build();
+
+        // ProxyInfo should be null for the profile without setting ProxyInfo.
+        assertNull(ikev2VpnProfile.getProxyInfo());
+
+        // ProxyInfo should stay null after performing toVpnProfile() and fromVpnProfile()
+        final VpnProfile vpnProfile = ikev2VpnProfile.toVpnProfile();
+        assertNull(vpnProfile.proxy);
+
+        final Ikev2VpnProfile convertedIkev2VpnProfile = Ikev2VpnProfile.fromVpnProfile(vpnProfile);
+        assertNull(convertedIkev2VpnProfile.getProxyInfo());
+    }
 
     private static class CertificateAndKey {
         public final X509Certificate cert;