diff --git a/tests/unit/java/com/android/internal/net/VpnProfileTest.java b/tests/unit/java/com/android/internal/net/VpnProfileTest.java index b2dff2e03f57e6bf66c434173ada0b94453e63ff..acae7d25cdb676be420a3a1a49c879e98524b839 100644 --- a/tests/unit/java/com/android/internal/net/VpnProfileTest.java +++ b/tests/unit/java/com/android/internal/net/VpnProfileTest.java @@ -26,6 +26,7 @@ import static com.android.testutils.ParcelUtils.assertParcelSane; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -311,4 +312,12 @@ public class VpnProfileTest { decoded.password = profile.password; assertEquals(profile, decoded); } + + @Test + public void testClone() { + final VpnProfile profile = getSampleIkev2Profile(DUMMY_PROFILE_KEY); + final VpnProfile clone = profile.clone(); + assertEquals(profile, clone); + assertNotSame(profile, clone); + } } diff --git a/tests/unit/java/com/android/server/connectivity/VpnTest.java b/tests/unit/java/com/android/server/connectivity/VpnTest.java index 48cfe7722b9c8ed8f84ce92a9357251cd65c32e1..585ea0ad62d486b2ce22654bc73b6e93b4792758 100644 --- a/tests/unit/java/com/android/server/connectivity/VpnTest.java +++ b/tests/unit/java/com/android/server/connectivity/VpnTest.java @@ -3131,6 +3131,20 @@ public class VpnTest extends VpnTestBase { startPptp(false /* useMppe */); } + @Test + public void testStartLegacyVpnModifyProfile_TypePSK() throws Exception { + setMockedUsers(PRIMARY_USER); + final Vpn vpn = createVpn(PRIMARY_USER.id); + final Ikev2VpnProfile ikev2VpnProfile = + new Ikev2VpnProfile.Builder(TEST_VPN_SERVER, TEST_VPN_IDENTITY) + .setAuthPsk(TEST_VPN_PSK) + .build(); + final VpnProfile profile = ikev2VpnProfile.toVpnProfile(); + + startLegacyVpn(vpn, profile); + assertEquals(profile, ikev2VpnProfile.toVpnProfile()); + } + private void assertTransportInfoMatches(NetworkCapabilities nc, int type) { assertNotNull(nc); VpnTransportInfo ti = (VpnTransportInfo) nc.getTransportInfo();