Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e014e318 authored by Chiachang Wang's avatar Chiachang Wang
Browse files

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
parent 12f9874b

services/tests/VpnTests/java/android/net/Ikev2VpnProfileTest.java

+2 −14
Original line number Diff line number Diff line
@@ -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();

services/tests/VpnTests/java/android/net/VpnManagerTest.java

+2 −5
Original line number Diff line number Diff line
@@ -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";

services/tests/VpnTests/java/com/android/internal/net/VpnProfileTest.java

+4 −19
Original line number Diff line number Diff line
@@ -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);

        }

    }



    @Test