diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-01-24 20:13:09 +0900 |
|---|---|---|
| committer | Remi NGUYEN VAN <reminv@google.com> | 2019-01-24 20:14:48 +0900 |
| commit | dc6eaebf771c4aea7322a59a96dfe1a90a163ca0 (patch) | |
| tree | 4daa5279070cba14b090108f10b0a1a398f0b8cc | |
| parent | e1f80469fad97019bc2bcfa39dc474bd1b2e8373 (diff) | |
Fix IpClientTest
NetworkStackTests is run with a version of mockito that allows mocking
final methods, which broke mocking of the ConnectivityService.
Test: atest NetworkStackTests
Change-Id: I430fe12216c43a0c4265a504dbefafad37c09291
| -rw-r--r-- | tests/src/android/net/ip/IpClientTest.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/src/android/net/ip/IpClientTest.java b/tests/src/android/net/ip/IpClientTest.java index f21809f..4ae044d 100644 --- a/tests/src/android/net/ip/IpClientTest.java +++ b/tests/src/android/net/ip/IpClientTest.java @@ -103,9 +103,7 @@ public class IpClientTest { MockitoAnnotations.initMocks(this); when(mContext.getSystemService(eq(Context.ALARM_SERVICE))).thenReturn(mAlarm); - when(mContext.getSystemServiceName(ConnectivityManager.class)) - .thenReturn(Context.CONNECTIVITY_SERVICE); - when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(mCm); + when(mContext.getSystemService(eq(ConnectivityManager.class))).thenReturn(mCm); when(mContext.getResources()).thenReturn(mResources); when(mResources.getInteger(R.integer.config_networkAvoidBadWifi)) .thenReturn(DEFAULT_AVOIDBADWIFI_CONFIG_VALUE); |