commit 2385bf8cef40d78f197e21dab28c4cfc53dc144f
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 18 09:17:53 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 18 09:17:53 2020 +0000
tree 199a5cb44067ced5030e805f0875a89b9d33a2a3
parent 68fa5318bcd18cd605332148b7117a1a19106a2e
parent 78b666729250286a1d61bfb9e8af2161c18c0a45

Merge "Address comments on ag/10316753"

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

diff --git a/tests/net/common/java/android/net/NetworkScoreTest.kt b/tests/net/common/java/android/net/NetworkScoreTest.kt
index 3e10992..a7e33b3 100644
--- a/tests/net/common/java/android/net/NetworkScoreTest.kt
+++ b/tests/net/common/java/android/net/NetworkScoreTest.kt
@@ -16,7 +16,6 @@
 
 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
@@ -35,20 +34,24 @@
 @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 builder = NetworkScore.Builder().setLegacyScore(TEST_SCORE)
-        assertEquals(TEST_SCORE, builder.build().getLegacyScore())
-        assertParcelSane(builder.build(), 7)
+        val legacyBuilder = NetworkScore.Builder().setLegacyScore(TEST_SCORE)
+        assertEquals(TEST_SCORE, legacyBuilder.build().getLegacyScore())
+        assertParcelSane(legacyBuilder.build(), 7)
 
-        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)
+        val builder = makeScoreBuilder()
         assertParcelSane(builder.build(), 7)
         builder.clearPolicy(POLICY_IGNORE_ON_WIFI)
         val ns = builder.build()
@@ -79,14 +82,7 @@
 
     @Test
     fun testBuilderEquals() {
-        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()
+        val ns = makeScoreBuilder().build()
         assertEquals(ns, NetworkScore.Builder(ns).build())
     }
 }