From e014e318ee70a29c03ec4067401ed3050be6cfdc Mon Sep 17 00:00:00 2001 From: Chiachang Wang Date: Wed, 6 Mar 2024 02:34:07 +0000 Subject: Remove the SDK check and update test runner The tests are in the platform now so the SDK check is no longer needed. Also update test runner since the tests do not need to use DevSdkIgnoreRunner so update it to AndroidJUnit4 instead. Test: atest FrameworksVpnTests Change-Id: Ibbd475820d87fd189f76b0134c688d52a0139451 --- .../java/android/net/Ikev2VpnProfileTest.java | 16 ++------------- .../VpnTests/java/android/net/VpnManagerTest.java | 7 ++----- .../com/android/internal/net/VpnProfileTest.java | 23 ++++------------------ 3 files changed, 8 insertions(+), 38 deletions(-) diff --git a/services/tests/VpnTests/java/android/net/Ikev2VpnProfileTest.java b/services/tests/VpnTests/java/android/net/Ikev2VpnProfileTest.java index e12e961fd60f..e4530204b38c 100644 --- a/services/tests/VpnTests/java/android/net/Ikev2VpnProfileTest.java +++ b/services/tests/VpnTests/java/android/net/Ikev2VpnProfileTest.java @@ -20,8 +20,6 @@ import static android.net.cts.util.IkeSessionTestUtils.CHILD_PARAMS; import static android.net.cts.util.IkeSessionTestUtils.IKE_PARAMS_V6; import static android.net.cts.util.IkeSessionTestUtils.getTestIkeSessionParams; -import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2; - import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -31,19 +29,16 @@ import static org.junit.Assert.fail; import android.net.ipsec.ike.IkeKeyIdIdentification; import android.net.ipsec.ike.IkeTunnelConnectionParams; -import android.os.Build; import android.test.mock.MockContext; +import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; import com.android.internal.net.VpnProfile; import com.android.internal.org.bouncycastle.x509.X509V1CertificateGenerator; import com.android.net.module.util.ProxyUtils; -import com.android.testutils.DevSdkIgnoreRule; -import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -62,8 +57,7 @@ import javax.security.auth.x500.X500Principal; /** Unit tests for {@link Ikev2VpnProfile.Builder}. */ @SmallTest -@RunWith(DevSdkIgnoreRunner.class) -@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) +@RunWith(AndroidJUnit4.class) public class Ikev2VpnProfileTest { private static final String SERVER_ADDR_STRING = "1.2.3.4"; private static final String IDENTITY_STRING = "Identity"; @@ -73,9 +67,6 @@ public class Ikev2VpnProfileTest { private static final byte[] PSK_BYTES = "preSharedKey".getBytes(); private static final int TEST_MTU = 1300; - @Rule - public final DevSdkIgnoreRule ignoreRule = new DevSdkIgnoreRule(); - private final MockContext mMockContext = new MockContext() { @Override @@ -271,9 +262,6 @@ public class Ikev2VpnProfileTest { } } - - // TODO: Refer to Build.VERSION_CODES.SC_V2 when it's available in AOSP and mainline branch - @DevSdkIgnoreRule.IgnoreUpTo(SC_V2) @Test public void testBuildExcludeLocalRoutesSet() throws Exception { final Ikev2VpnProfile.Builder builder = getBuilderWithDefaultOptions(); diff --git a/services/tests/VpnTests/java/android/net/VpnManagerTest.java b/services/tests/VpnTests/java/android/net/VpnManagerTest.java index 365b4d1c25f8..98fd294f1552 100644 --- a/services/tests/VpnTests/java/android/net/VpnManagerTest.java +++ b/services/tests/VpnTests/java/android/net/VpnManagerTest.java @@ -29,17 +29,15 @@ import static org.mockito.Mockito.when; import android.content.ComponentName; import android.content.Intent; import android.content.pm.PackageManager; -import android.os.Build; import android.test.mock.MockContext; import android.util.SparseArray; import androidx.test.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; import com.android.internal.net.VpnProfile; import com.android.internal.util.MessageUtils; -import com.android.testutils.DevSdkIgnoreRule; -import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Before; import org.junit.Test; @@ -47,8 +45,7 @@ import org.junit.runner.RunWith; /** Unit tests for {@link VpnManager}. */ @SmallTest -@RunWith(DevSdkIgnoreRunner.class) -@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) +@RunWith(AndroidJUnit4.class) public class VpnManagerTest { private static final String PKG_NAME = "fooPackage"; diff --git a/services/tests/VpnTests/java/com/android/internal/net/VpnProfileTest.java b/services/tests/VpnTests/java/com/android/internal/net/VpnProfileTest.java index acae7d25cdb6..acbe8b858d8f 100644 --- a/services/tests/VpnTests/java/com/android/internal/net/VpnProfileTest.java +++ b/services/tests/VpnTests/java/com/android/internal/net/VpnProfileTest.java @@ -19,8 +19,6 @@ package com.android.internal.net; import static android.net.cts.util.IkeSessionTestUtils.CHILD_PARAMS; import static android.net.cts.util.IkeSessionTestUtils.IKE_PARAMS_V4; -import static com.android.modules.utils.build.SdkLevel.isAtLeastT; -import static com.android.modules.utils.build.SdkLevel.isAtLeastU; import static com.android.testutils.ParcelUtils.assertParcelSane; import static org.junit.Assert.assertEquals; @@ -32,13 +30,10 @@ import static org.junit.Assert.assertTrue; import android.net.IpSecAlgorithm; import android.net.ipsec.ike.IkeTunnelConnectionParams; -import android.os.Build; +import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; -import com.android.testutils.DevSdkIgnoreRule; -import com.android.testutils.DevSdkIgnoreRunner; - import org.junit.Test; import org.junit.runner.RunWith; @@ -48,8 +43,7 @@ import java.util.List; /** Unit tests for {@link VpnProfile}. */ @SmallTest -@RunWith(DevSdkIgnoreRunner.class) -@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) +@RunWith(AndroidJUnit4.class) public class VpnProfileTest { private static final String DUMMY_PROFILE_KEY = "Test"; @@ -176,17 +170,8 @@ public class VpnProfileTest { @Test public void testParcelUnparcel() { - if (isAtLeastU()) { - // automaticNattKeepaliveTimerEnabled, automaticIpVersionSelectionEnabled added in U. - assertParcelSane(getSampleIkev2Profile(DUMMY_PROFILE_KEY), 28); - assertParcelSane(getSampleIkev2ProfileWithIkeTunConnParams(DUMMY_PROFILE_KEY), 28); - } else if (isAtLeastT()) { - // excludeLocalRoutes, requiresPlatformValidation were added in T. - assertParcelSane(getSampleIkev2Profile(DUMMY_PROFILE_KEY), 26); - assertParcelSane(getSampleIkev2ProfileWithIkeTunConnParams(DUMMY_PROFILE_KEY), 26); - } else { - assertParcelSane(getSampleIkev2Profile(DUMMY_PROFILE_KEY), 23); - } + assertParcelSane(getSampleIkev2Profile(DUMMY_PROFILE_KEY), 28); + assertParcelSane(getSampleIkev2ProfileWithIkeTunConnParams(DUMMY_PROFILE_KEY), 28); } @Test -- cgit v1.2.3-59-g8ed1b From 85a0c72c9c92e5b5712bddd66794536b83982407 Mon Sep 17 00:00:00 2001 From: Chiachang Wang Date: Wed, 6 Mar 2024 02:55:46 +0000 Subject: Remove unused variables This is a cleanup commit to address unused variables found by ERROR_PRONE. Test: atest FrameworksVpnTests Change-Id: I40241276a2700a38e769737e0ea8aace4cc3cae9 --- .../tests/VpnTests/java/android/net/Ikev2VpnProfileTest.java | 10 ---------- services/tests/VpnTests/java/android/net/VpnManagerTest.java | 1 - 2 files changed, 11 deletions(-) diff --git a/services/tests/VpnTests/java/android/net/Ikev2VpnProfileTest.java b/services/tests/VpnTests/java/android/net/Ikev2VpnProfileTest.java index e4530204b38c..180f54e1cf5f 100644 --- a/services/tests/VpnTests/java/android/net/Ikev2VpnProfileTest.java +++ b/services/tests/VpnTests/java/android/net/Ikev2VpnProfileTest.java @@ -29,7 +29,6 @@ import static org.junit.Assert.fail; import android.net.ipsec.ike.IkeKeyIdIdentification; import android.net.ipsec.ike.IkeTunnelConnectionParams; -import android.test.mock.MockContext; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; @@ -67,13 +66,6 @@ public class Ikev2VpnProfileTest { private static final byte[] PSK_BYTES = "preSharedKey".getBytes(); private static final int TEST_MTU = 1300; - private final MockContext mMockContext = - new MockContext() { - @Override - public String getOpPackageName() { - return "fooPackage"; - } - }; private final ProxyInfo mProxy = ProxyInfo.buildDirectProxy( SERVER_ADDR_STRING, -1, ProxyUtils.exclusionStringAsList(EXCL_LIST)); @@ -218,7 +210,6 @@ public class Ikev2VpnProfileTest { @Test public void testSetAllowedAlgorithmsInvalidList() throws Exception { final Ikev2VpnProfile.Builder builder = getBuilderWithDefaultOptions(); - List allowedAlgorithms = new ArrayList<>(); try { builder.setAllowedAlgorithms(Arrays.asList(IpSecAlgorithm.AUTH_HMAC_SHA256)); @@ -236,7 +227,6 @@ public class Ikev2VpnProfileTest { @Test public void testSetAllowedAlgorithmsInsecureAlgorithm() throws Exception { final Ikev2VpnProfile.Builder builder = getBuilderWithDefaultOptions(); - List allowedAlgorithms = new ArrayList<>(); try { builder.setAllowedAlgorithms(Arrays.asList(IpSecAlgorithm.AUTH_HMAC_MD5)); diff --git a/services/tests/VpnTests/java/android/net/VpnManagerTest.java b/services/tests/VpnTests/java/android/net/VpnManagerTest.java index 98fd294f1552..f5b83f0ee79d 100644 --- a/services/tests/VpnTests/java/android/net/VpnManagerTest.java +++ b/services/tests/VpnTests/java/android/net/VpnManagerTest.java @@ -50,7 +50,6 @@ public class VpnManagerTest { private static final String PKG_NAME = "fooPackage"; - private static final String SESSION_NAME_STRING = "testSession"; private static final String SERVER_ADDR_STRING = "1.2.3.4"; private static final String IDENTITY_STRING = "Identity"; private static final byte[] PSK_BYTES = "preSharedKey".getBytes(); -- cgit v1.2.3-59-g8ed1b