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

Commit 78b66672 authored by Chalard Jean's avatar Chalard Jean
Browse files

Address comments on ag/10316753 

Test: NetworkScoreTests
Change-Id: Ib4754c69e8bca12cda459d93e60aaecc7e23b21d
parent da0c5df4

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

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




package android.net

package android.net





import android.net.NetworkScore.Metrics.BANDWIDTH_UNKNOWN

import android.net.NetworkScore.POLICY_DEFAULT_SUBSCRIPTION

import android.net.NetworkScore.POLICY_DEFAULT_SUBSCRIPTION

import android.net.NetworkScore.POLICY_IGNORE_ON_WIFI

import android.net.NetworkScore.POLICY_IGNORE_ON_WIFI

import android.net.NetworkScore.RANGE_MEDIUM

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

@RunWith(AndroidJUnit4::class)

@SmallTest

@SmallTest

class NetworkScoreTest {

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

    @Test

    fun testParcelNetworkScore() {

    fun testParcelNetworkScore() {

        val defaultCap = NetworkCapabilities()

        val defaultCap = NetworkCapabilities()

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

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

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

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

        assertParcelSane(builder.build(), 7)

        assertParcelSane(legacyBuilder.build(), 7)





        builder.addPolicy(POLICY_IGNORE_ON_WIFI)

        val builder = makeScoreBuilder()

                .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)

        assertParcelSane(builder.build(), 7)

        builder.clearPolicy(POLICY_IGNORE_ON_WIFI)

        builder.clearPolicy(POLICY_IGNORE_ON_WIFI)

        val ns = builder.build()

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




    @Test

    @Test

    fun testBuilderEquals() {

    fun testBuilderEquals() {

        val ns = NetworkScore.Builder()

        val ns = makeScoreBuilder().build()

                .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())

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

    }

    }

}
 
}