Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Address comments on ag/10316753"

Browse Source 
This reverts commit 78b6667292.

Reason for revert: Feature punted

Change-Id: I4b17d1b186369f2ecfcecf4906cd2b99a66bc7a0
This commit is contained in:
Chalard Jean
2020-02-21 09:28:00 +00:00
parent 78b6667292
commit 33834771a3
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tests/net/common/java/android/net/NetworkScoreTest.kt
View File

@@ -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())
}
}