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

Commit 33834771 authored by Chalard Jean's avatar Chalard Jean
Browse files

Revert "Address comments on ag/10316753" 

This reverts commit 78b66672.

Reason for revert: Feature punted

Change-Id: I4b17d1b186369f2ecfcecf4906cd2b99a66bc7a0
parent 78b66672

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

+19 −15
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.net



import android.net.NetworkScore.Metrics.BANDWIDTH_UNKNOWN

import android.net.NetworkScore.POLICY_DEFAULT_SUBSCRIPTION

import android.net.NetworkScore.POLICY_IGNORE_ON_WIFI

import android.net.NetworkScore.RANGE_MEDIUM
@@ -34,24 +35,20 @@ private const val TEST_SCORE = 80 
@RunWith(AndroidJUnit4::class)

@SmallTest

class NetworkScoreTest {

    private fun makeScoreBuilder() = NetworkScore.Builder()

            .setLegacyScore(TEST_SCORE)

            .addPolicy(POLICY_IGNORE_ON_WIFI)

            .addPolicy(POLICY_DEFAULT_SUBSCRIPTION)

            .setExiting(false)

            .setEndToEndMetrics(NetworkScore.Metrics(145 /* latency */,

                    2500 /* downlinkBandwidth */, 1430 /* uplinkBandwidth */))

            .setRange(RANGE_MEDIUM)

            .setSignalStrength(400)



    @Test

    fun testParcelNetworkScore() {

        val defaultCap = NetworkCapabilities()

        val legacyBuilder = NetworkScore.Builder().setLegacyScore(TEST_SCORE)

        assertEquals(TEST_SCORE, legacyBuilder.build().getLegacyScore())

        assertParcelSane(legacyBuilder.build(), 7)

        val builder = NetworkScore.Builder().setLegacyScore(TEST_SCORE)

        assertEquals(TEST_SCORE, builder.build().getLegacyScore())

        assertParcelSane(builder.build(), 7)



        val builder = makeScoreBuilder()

        builder.addPolicy(POLICY_IGNORE_ON_WIFI)

                .addPolicy(POLICY_DEFAULT_SUBSCRIPTION)

                .setLinkLayerMetrics(NetworkScore.Metrics(44 /* latency */,

                        380 /* downlinkBandwidth */, BANDWIDTH_UNKNOWN /* uplinkBandwidth */))

                .setEndToEndMetrics(NetworkScore.Metrics(11 /* latency */,

                        BANDWIDTH_UNKNOWN /* downlinkBandwidth */, 100_000 /* uplinkBandwidth */))

                .setRange(NetworkScore.RANGE_MEDIUM)

        assertParcelSane(builder.build(), 7)

        builder.clearPolicy(POLICY_IGNORE_ON_WIFI)

        val ns = builder.build()
@@ -82,7 +79,14 @@ class NetworkScoreTest { 


    @Test

    fun testBuilderEquals() {

        val ns = makeScoreBuilder().build()

        val ns = NetworkScore.Builder()

                .addPolicy(POLICY_IGNORE_ON_WIFI)

                .addPolicy(POLICY_DEFAULT_SUBSCRIPTION)

                .setExiting(true)

                .setEndToEndMetrics(NetworkScore.Metrics(145, 2500, 1430))

                .setRange(RANGE_MEDIUM)

                .setSignalStrength(400)

                .build()

        assertEquals(ns, NetworkScore.Builder(ns).build())

    }

}