From f3508769eae5dd725bdce64bc3f8b793d1f4afdd Mon Sep 17 00:00:00 2001 From: Rambo Wang Date: Fri, 24 Apr 2020 16:37:16 -0700 Subject: [PATCH] Rename satisfiedBy to canBeSatisfiedBy for MatchAllNetworkSpecifier MatchAllNetworkSpecifier is a subclass of NetworkSpecifer. The method satisfiedBy should be renamed to canBeSatisfiedBy together with other subclass of NetworkSpecifer in b/152238712. Add annotation @Overide for the method to make sure it will not get ignored when refactor in the future. Bug: 154956584 Test: atest android.net.MatchAllNetworkSpecifierTest Change-Id: Ibe32fd50fae43aa635c1c0dad66eaea82011c8b7 --- .../common/java/android/net/MatchAllNetworkSpecifierTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/net/common/java/android/net/MatchAllNetworkSpecifierTest.kt b/tests/net/common/java/android/net/MatchAllNetworkSpecifierTest.kt index ef15b668e2..a50f0461fa 100644 --- a/tests/net/common/java/android/net/MatchAllNetworkSpecifierTest.kt +++ b/tests/net/common/java/android/net/MatchAllNetworkSpecifierTest.kt @@ -39,12 +39,12 @@ class MatchAllNetworkSpecifierTest { } @Test(expected = IllegalStateException::class) - fun testSatisfiedBy() { + fun testCanBeSatisfiedBy() { val specifier = MatchAllNetworkSpecifier() val discoverySession = Mockito.mock(DiscoverySession::class.java) val peerHandle = Mockito.mock(PeerHandle::class.java) val wifiAwareNetworkSpecifier = WifiAwareNetworkSpecifier.Builder(discoverySession, peerHandle).build() - specifier.satisfiedBy(wifiAwareNetworkSpecifier) + specifier.canBeSatisfiedBy(wifiAwareNetworkSpecifier) } }