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

Commit 3c6140d8 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by junyulai
Browse files

Fix common tests on Q and R 

The common tests cannot reference EthernetNetworkSpecifier,
as it did not exist in Q and R yet.

Bug: 179329291
Merged-In: Iec8ef874a3ca6dcc65944bbbaa3575a5ae0f4989
Change-Id: Iec8ef874a3ca6dcc65944bbbaa3575a5ae0f4989
Test: atest CtsNetTestCasesLatestSdk
parent c5479a08

tests/net/common/java/android/net/NetworkCapabilitiesTest.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -68,6 +68,7 @@ import android.util.ArraySet; 
import androidx.test.runner.AndroidJUnit4;

import androidx.test.runner.AndroidJUnit4;





import com.android.modules.utils.build.SdkLevel;

import com.android.modules.utils.build.SdkLevel;

import com.android.testutils.CompatUtil;

import com.android.testutils.DevSdkIgnoreRule;

import com.android.testutils.DevSdkIgnoreRule;

import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;

import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
@@ -211,7 +212,7 @@ public class NetworkCapabilitiesTest { 
        nc1 = new NetworkCapabilities().addTransportType(TRANSPORT_WIFI);

        nc1 = new NetworkCapabilities().addTransportType(TRANSPORT_WIFI);

        nc2 = new NetworkCapabilities()

        nc2 = new NetworkCapabilities()

                .addTransportType(TRANSPORT_WIFI)

                .addTransportType(TRANSPORT_WIFI)

                .setNetworkSpecifier(new EthernetNetworkSpecifier("eth42"));

                .setNetworkSpecifier(CompatUtil.makeEthernetNetworkSpecifier("eth42"));

        assertNotEquals("", nc1.describeImmutableDifferences(nc2));

        assertNotEquals("", nc1.describeImmutableDifferences(nc2));

        assertEquals("", nc1.describeImmutableDifferences(nc1));

        assertEquals("", nc1.describeImmutableDifferences(nc1));

    }

    }
@@ -671,7 +672,7 @@ public class NetworkCapabilitiesTest { 
        NetworkCapabilities nc1 = new NetworkCapabilities();

        NetworkCapabilities nc1 = new NetworkCapabilities();

        nc1.addTransportType(TRANSPORT_CELLULAR).addTransportType(TRANSPORT_WIFI);

        nc1.addTransportType(TRANSPORT_CELLULAR).addTransportType(TRANSPORT_WIFI);

        try {

        try {

            nc1.setNetworkSpecifier(new EthernetNetworkSpecifier("eth0"));

            nc1.setNetworkSpecifier(CompatUtil.makeEthernetNetworkSpecifier("eth0"));

            fail("Cannot set NetworkSpecifier on a NetworkCapability with multiple transports!");

            fail("Cannot set NetworkSpecifier on a NetworkCapability with multiple transports!");

        } catch (IllegalStateException expected) {

        } catch (IllegalStateException expected) {

            // empty

            // empty
@@ -680,7 +681,7 @@ public class NetworkCapabilitiesTest { 
        // Sequence 2: Transport + NetworkSpecifier + Transport

        // Sequence 2: Transport + NetworkSpecifier + Transport

        NetworkCapabilities nc2 = new NetworkCapabilities();

        NetworkCapabilities nc2 = new NetworkCapabilities();

        nc2.addTransportType(TRANSPORT_CELLULAR).setNetworkSpecifier(

        nc2.addTransportType(TRANSPORT_CELLULAR).setNetworkSpecifier(

                new EthernetNetworkSpecifier("testtap3"));

                CompatUtil.makeEthernetNetworkSpecifier("testtap3"));

        try {

        try {

            nc2.addTransportType(TRANSPORT_WIFI);

            nc2.addTransportType(TRANSPORT_WIFI);

            fail("Cannot set a second TransportType of a network which has a NetworkSpecifier!");

            fail("Cannot set a second TransportType of a network which has a NetworkSpecifier!");

tests/net/common/java/android/net/NetworkProviderTest.kt

+5 −2
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ import android.os.HandlerThread 
import android.os.Looper

import android.os.Looper

import androidx.test.InstrumentationRegistry

import androidx.test.InstrumentationRegistry

import com.android.net.module.util.ArrayTrackRecord

import com.android.net.module.util.ArrayTrackRecord

import com.android.testutils.CompatUtil

import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo

import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo

import com.android.testutils.DevSdkIgnoreRunner

import com.android.testutils.DevSdkIgnoreRunner

import com.android.testutils.isDevSdkInRange

import com.android.testutils.isDevSdkInRange
@@ -102,7 +103,8 @@ class NetworkProviderTest { 
        mCm.registerNetworkProvider(provider)

        mCm.registerNetworkProvider(provider)

        assertNotEquals(provider.getProviderId(), NetworkProvider.ID_NONE)

        assertNotEquals(provider.getProviderId(), NetworkProvider.ID_NONE)





        val specifier = EthernetNetworkSpecifier(UUID.randomUUID().toString())

        val specifier = CompatUtil.makeTestNetworkSpecifier(

                UUID.randomUUID().toString())

        val nr: NetworkRequest = NetworkRequest.Builder()

        val nr: NetworkRequest = NetworkRequest.Builder()

                .addTransportType(TRANSPORT_TEST)

                .addTransportType(TRANSPORT_TEST)

                .setNetworkSpecifier(specifier)

                .setNetworkSpecifier(specifier)
@@ -183,7 +185,8 @@ class NetworkProviderTest { 




        mCm.registerNetworkProvider(provider)

        mCm.registerNetworkProvider(provider)





        val specifier = EthernetNetworkSpecifier(UUID.randomUUID().toString())

        val specifier = CompatUtil.makeTestNetworkSpecifier(

                UUID.randomUUID().toString())

        val nr: NetworkRequest = NetworkRequest.Builder()

        val nr: NetworkRequest = NetworkRequest.Builder()

                .addTransportType(TRANSPORT_TEST)

                .addTransportType(TRANSPORT_TEST)

                .setNetworkSpecifier(specifier)

                .setNetworkSpecifier(specifier)