diff options
| author | lesl <lesl@google.com> | 2021-04-14 17:44:26 +0800 |
|---|---|---|
| committer | lesl <lesl@google.com> | 2021-04-15 15:13:04 +0800 |
| commit | c317a6f8a661f63ed4406e4e21e0c72b42321980 (patch) | |
| tree | ae70ae29782c399181ea632546f5ad0e0a90ef7c /wifi/tests | |
| parent | 9dfb804a4e1d6529046c5e7b16c7588018b3069c (diff) | |
wifi: Rename country change API
API Review: CountryCodeChangeListener:
CountryCodeChangeListener - should be CountryCodeChangedListener.
Also update the corresponding method (should be onCountryCodeChanged).
Bug: 185121604
Test: atest -c FrameworksWifiTests
Test: atest -c FrameworksWifiNonUpdatableApiTests
Change-Id: Ifd9dbc359e5542f2cf34e5a0a198ef309b89e58b
Diffstat (limited to 'wifi/tests')
| -rw-r--r-- | wifi/tests/src/android/net/wifi/nl80211/WifiNl80211ManagerTest.java | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/wifi/tests/src/android/net/wifi/nl80211/WifiNl80211ManagerTest.java b/wifi/tests/src/android/net/wifi/nl80211/WifiNl80211ManagerTest.java index 98a0042a7096..3fb23013bdec 100644 --- a/wifi/tests/src/android/net/wifi/nl80211/WifiNl80211ManagerTest.java +++ b/wifi/tests/src/android/net/wifi/nl80211/WifiNl80211ManagerTest.java @@ -98,9 +98,9 @@ public class WifiNl80211ManagerTest { @Mock private WifiNl80211Manager.PnoScanRequestCallback mPnoScanRequestCallback; @Mock - private WifiNl80211Manager.CountryCodeChangeListener mCountryCodeChangeListener; + private WifiNl80211Manager.CountryCodeChangedListener mCountryCodeChangedListener; @Mock - private WifiNl80211Manager.CountryCodeChangeListener mCountryCodeChangeListener2; + private WifiNl80211Manager.CountryCodeChangedListener mCountryCodeChangedListener2; @Mock private Context mContext; private TestLooper mLooper; @@ -768,25 +768,25 @@ public class WifiNl80211ManagerTest { } /** - * Ensures callback works after register CountryCodeChangeListener. + * Ensures callback works after register CountryCodeChangedListener. */ @Test - public void testCountryCodeChangeListenerInvocation() throws Exception { - assertTrue(mWificondControl.registerCountryCodeChangeListener( - Runnable::run, mCountryCodeChangeListener)); - assertTrue(mWificondControl.registerCountryCodeChangeListener( - Runnable::run, mCountryCodeChangeListener2)); + public void testCountryCodeChangedListenerInvocation() throws Exception { + assertTrue(mWificondControl.registerCountryCodeChangedListener( + Runnable::run, mCountryCodeChangedListener)); + assertTrue(mWificondControl.registerCountryCodeChangedListener( + Runnable::run, mCountryCodeChangedListener2)); mWificondEventHandler.OnRegDomainChanged(TEST_COUNTRY_CODE); - verify(mCountryCodeChangeListener).onChanged(TEST_COUNTRY_CODE); - verify(mCountryCodeChangeListener2).onChanged(TEST_COUNTRY_CODE); + verify(mCountryCodeChangedListener).onCountryCodeChanged(TEST_COUNTRY_CODE); + verify(mCountryCodeChangedListener2).onCountryCodeChanged(TEST_COUNTRY_CODE); - reset(mCountryCodeChangeListener); - reset(mCountryCodeChangeListener2); - mWificondControl.unregisterCountryCodeChangeListener(mCountryCodeChangeListener2); + reset(mCountryCodeChangedListener); + reset(mCountryCodeChangedListener2); + mWificondControl.unregisterCountryCodeChangedListener(mCountryCodeChangedListener2); mWificondEventHandler.OnRegDomainChanged(TEST_COUNTRY_CODE); - verify(mCountryCodeChangeListener).onChanged(TEST_COUNTRY_CODE); - verify(mCountryCodeChangeListener2, never()).onChanged(TEST_COUNTRY_CODE); + verify(mCountryCodeChangedListener).onCountryCodeChanged(TEST_COUNTRY_CODE); + verify(mCountryCodeChangedListener2, never()).onCountryCodeChanged(TEST_COUNTRY_CODE); } /** |