LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix EthernetTrackerTest#createNetworkCapabilities am: e81b053c1f am: 3c098c26d4

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1553694

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc07c8d1fba17fe68fe39e78f2ddc4ebfa02d913
This commit is contained in:
lucaslin
2021-01-27 04:59:24 +00:00
committed by Automerger Merge Worker
parent fa5ea005b3 3c098c26d4
commit ad7cc86898
1 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tests/ethernet/java/com/android/server/ethernet/EthernetTrackerTest.java
View File

@@ -133,6 +133,15 @@ public class EthernetTrackerTest {
} }
} }
private NetworkCapabilitiesBuilder makeEthernetCapabilitiesBuilder(boolean clearAll) {
final NetworkCapabilitiesBuilder result =
clearAll ? new NetworkCapabilitiesBuilder().clearAll()
: new NetworkCapabilitiesBuilder();
return result.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING)
.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED)
.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED);
}
/** /**
* Test: Attempt to create a capabilties with various valid sets of capabilities/transports * Test: Attempt to create a capabilties with various valid sets of capabilities/transports
*/ */
@@ -140,15 +149,15 @@ public class EthernetTrackerTest {
public void createNetworkCapabilities() { public void createNetworkCapabilities() {
// Particularly common expected results // Particularly common expected results
NetworkCapabilities defaultEthernetCleared = new NetworkCapabilitiesBuilder() NetworkCapabilities defaultEthernetCleared =
.clearAll() makeEthernetCapabilitiesBuilder(true /* clearAll */)
.setLinkUpstreamBandwidthKbps(100000) .setLinkUpstreamBandwidthKbps(100000)
.setLinkDownstreamBandwidthKbps(100000) .setLinkDownstreamBandwidthKbps(100000)
.addTransport(NetworkCapabilities.TRANSPORT_ETHERNET) .addTransport(NetworkCapabilities.TRANSPORT_ETHERNET)
.build(); .build();
NetworkCapabilities ethernetClearedWithCommonCaps = new NetworkCapabilitiesBuilder() NetworkCapabilities ethernetClearedWithCommonCaps =
.clearAll() makeEthernetCapabilitiesBuilder(true /* clearAll */)
.setLinkUpstreamBandwidthKbps(100000) .setLinkUpstreamBandwidthKbps(100000)
.setLinkDownstreamBandwidthKbps(100000) .setLinkDownstreamBandwidthKbps(100000)
.addTransport(NetworkCapabilities.TRANSPORT_ETHERNET) .addTransport(NetworkCapabilities.TRANSPORT_ETHERNET)
@@ -165,7 +174,7 @@ public class EthernetTrackerTest {
// Empty capabilities and transports without the clear defaults flag should return the // Empty capabilities and transports without the clear defaults flag should return the
// default capabilities set with TRANSPORT_ETHERNET // default capabilities set with TRANSPORT_ETHERNET
assertParsedNetworkCapabilities( assertParsedNetworkCapabilities(
new NetworkCapabilitiesBuilder() makeEthernetCapabilitiesBuilder(false /* clearAll */)
.setLinkUpstreamBandwidthKbps(100000) .setLinkUpstreamBandwidthKbps(100000)
.setLinkDownstreamBandwidthKbps(100000) .setLinkDownstreamBandwidthKbps(100000)
.addTransport(NetworkCapabilities.TRANSPORT_ETHERNET) .addTransport(NetworkCapabilities.TRANSPORT_ETHERNET)
@@ -175,7 +184,7 @@ public class EthernetTrackerTest {
// A list of capabilities without the clear defaults flag should return the default // A list of capabilities without the clear defaults flag should return the default
// capabilities, mixed with the desired capabilities, and TRANSPORT_ETHERNET // capabilities, mixed with the desired capabilities, and TRANSPORT_ETHERNET
assertParsedNetworkCapabilities( assertParsedNetworkCapabilities(
new NetworkCapabilitiesBuilder() makeEthernetCapabilitiesBuilder(false /* clearAll */)
.setLinkUpstreamBandwidthKbps(100000) .setLinkUpstreamBandwidthKbps(100000)
.setLinkDownstreamBandwidthKbps(100000) .setLinkDownstreamBandwidthKbps(100000)
.addTransport(NetworkCapabilities.TRANSPORT_ETHERNET) .addTransport(NetworkCapabilities.TRANSPORT_ETHERNET)
@@ -195,32 +204,28 @@ public class EthernetTrackerTest {
// Adding a valid override transport will remove the default TRANSPORT_ETHERNET transport // Adding a valid override transport will remove the default TRANSPORT_ETHERNET transport
// and apply only the override to the capabiltities object // and apply only the override to the capabiltities object
assertParsedNetworkCapabilities( assertParsedNetworkCapabilities(
new NetworkCapabilitiesBuilder() makeEthernetCapabilitiesBuilder(true /* clearAll */)
.clearAll()
.setLinkUpstreamBandwidthKbps(100000) .setLinkUpstreamBandwidthKbps(100000)
.setLinkDownstreamBandwidthKbps(100000) .setLinkDownstreamBandwidthKbps(100000)
.addTransport(0) .addTransport(0)
.build(), .build(),
true, "", "0"); true, "", "0");
assertParsedNetworkCapabilities( assertParsedNetworkCapabilities(
new NetworkCapabilitiesBuilder() makeEthernetCapabilitiesBuilder(true /* clearAll */)
.clearAll()
.setLinkUpstreamBandwidthKbps(100000) .setLinkUpstreamBandwidthKbps(100000)
.setLinkDownstreamBandwidthKbps(100000) .setLinkDownstreamBandwidthKbps(100000)
.addTransport(1) .addTransport(1)
.build(), .build(),
true, "", "1"); true, "", "1");
assertParsedNetworkCapabilities( assertParsedNetworkCapabilities(
new NetworkCapabilitiesBuilder() makeEthernetCapabilitiesBuilder(true /* clearAll */)
.clearAll()
.setLinkUpstreamBandwidthKbps(100000) .setLinkUpstreamBandwidthKbps(100000)
.setLinkDownstreamBandwidthKbps(100000) .setLinkDownstreamBandwidthKbps(100000)
.addTransport(2) .addTransport(2)
.build(), .build(),
true, "", "2"); true, "", "2");
assertParsedNetworkCapabilities( assertParsedNetworkCapabilities(
new NetworkCapabilitiesBuilder() makeEthernetCapabilitiesBuilder(true /* clearAll */)
.clearAll()
.setLinkUpstreamBandwidthKbps(100000) .setLinkUpstreamBandwidthKbps(100000)
.setLinkDownstreamBandwidthKbps(100000) .setLinkDownstreamBandwidthKbps(100000)
.addTransport(3) .addTransport(3)
@@ -244,8 +249,7 @@ public class EthernetTrackerTest {
// Ensure the adding of both capabilities and transports work // Ensure the adding of both capabilities and transports work
assertParsedNetworkCapabilities( assertParsedNetworkCapabilities(
new NetworkCapabilitiesBuilder() makeEthernetCapabilitiesBuilder(true /* clearAll */)
.clearAll()
.setLinkUpstreamBandwidthKbps(100000) .setLinkUpstreamBandwidthKbps(100000)
.setLinkDownstreamBandwidthKbps(100000) .setLinkDownstreamBandwidthKbps(100000)
.addCapability(12) .addCapability(12)