LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add testVpnTypesEqual to verify consistency" am: edeab9051e am: f16388a8f5

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

Change-Id: Id2e9d16c88088ef5d3ffe6f698af5ee8201c7716
This commit is contained in:
Ken Chen
2021-05-13 02:45:06 +00:00
committed by Automerger Merge Worker
parent 31aef231ab f16388a8f5
commit 544e7294c1
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/net/java/android/net/VpnManagerTest.java
View File

@@ -28,11 +28,13 @@ import static org.mockito.Mockito.when;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Intent; import android.content.Intent;
import android.test.mock.MockContext; import android.test.mock.MockContext;
import android.util.SparseArray;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.android.internal.net.VpnProfile; import com.android.internal.net.VpnProfile;
import com.android.internal.util.MessageUtils;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -119,4 +121,18 @@ public class VpnManagerTest {
.setAuthPsk(PSK_BYTES) .setAuthPsk(PSK_BYTES)
.build(); .build();
} }
@Test
public void testVpnTypesEqual() throws Exception {
SparseArray<String> vmVpnTypes = MessageUtils.findMessageNames(
new Class[] { VpnManager.class }, new String[]{ "TYPE_VPN_" });
SparseArray<String> nativeVpnType = MessageUtils.findMessageNames(
new Class[] { NativeVpnType.class }, new String[]{ "" });
// TYPE_VPN_NONE = -1 is only defined in VpnManager.
assertEquals(vmVpnTypes.size() - 1, nativeVpnType.size());
for (int i = VpnManager.TYPE_VPN_SERVICE; i < vmVpnTypes.size(); i++) {
assertEquals(vmVpnTypes.get(i), "TYPE_VPN_" + nativeVpnType.get(i));
}
}
} }