Simplify feature enabled checking in IpReachabilityMonitorTest. Test: test-only change Change-Id: I15d3b6af990a5c0a1d019d7f380f8058698b8165
diff --git a/tests/integration/signature/android/net/ip/IpClientSignatureTest.kt b/tests/integration/signature/android/net/ip/IpClientSignatureTest.kt index e725ea9..427b83a 100644 --- a/tests/integration/signature/android/net/ip/IpClientSignatureTest.kt +++ b/tests/integration/signature/android/net/ip/IpClientSignatureTest.kt
@@ -92,3 +92,4 @@ return DEFAULT_NUD_SOLICIT_NUM_POST_ROAM } } +
diff --git a/tests/unit/src/android/net/ip/IpReachabilityMonitorTest.kt b/tests/unit/src/android/net/ip/IpReachabilityMonitorTest.kt index 9971e4b..e071280 100644 --- a/tests/unit/src/android/net/ip/IpReachabilityMonitorTest.kt +++ b/tests/unit/src/android/net/ip/IpReachabilityMonitorTest.kt
@@ -55,8 +55,6 @@ import com.android.net.module.util.netlink.StructNdMsg.NUD_REACHABLE import com.android.net.module.util.netlink.StructNdMsg.NUD_STALE import com.android.networkstack.metrics.IpReachabilityMonitorMetrics -import com.android.networkstack.util.NetworkStackUtils.IP_REACHABILITY_IGNORE_INCOMPLETE_IPV6_DEFAULT_ROUTER_VERSION -import com.android.networkstack.util.NetworkStackUtils.IP_REACHABILITY_IGNORE_INCOMPLETE_IPV6_DNS_SERVER_VERSION import com.android.networkstack.util.NetworkStackUtils.IP_REACHABILITY_MCAST_RESOLICIT_VERSION import com.android.networkstack.util.NetworkStackUtils.IP_REACHABILITY_ROUTER_MAC_CHANGE_FAILURE_ONLY_AFTER_ROAM_VERSION import com.android.testutils.makeNewNeighMessage @@ -268,11 +266,8 @@ eq(IP_REACHABILITY_MCAST_RESOLICIT_VERSION)) // TODO: test with non-default flag combinations. - doReturn(false).`when`(dependencies).isFeatureEnabled(any(), anyString()) - doReturn(false).`when`(dependencies).isFeatureNotChickenedOut(any(), - eq(IP_REACHABILITY_IGNORE_INCOMPLETE_IPV6_DNS_SERVER_VERSION)) - doReturn(false).`when`(dependencies).isFeatureNotChickenedOut(any(), - eq(IP_REACHABILITY_IGNORE_INCOMPLETE_IPV6_DEFAULT_ROUTER_VERSION)) + // Note: because dependencies is a mock, all features that are not specified here are + // neither enabled nor chickened out. doReturn(true).`when`(dependencies).isFeatureNotChickenedOut(any(), eq(IP_REACHABILITY_ROUTER_MAC_CHANGE_FAILURE_ONLY_AFTER_ROAM_VERSION))