From 89485143f13448d1a75df7bff2b47e91396b3d36 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Thu, 24 Jan 2019 20:13:09 +0900 Subject: [PATCH] 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 --- .../NetworkStack/tests/src/android/net/ip/IpClientTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/NetworkStack/tests/src/android/net/ip/IpClientTest.java b/packages/NetworkStack/tests/src/android/net/ip/IpClientTest.java index f21809fdbc1c7..4ae044dec20b2 100644 --- a/packages/NetworkStack/tests/src/android/net/ip/IpClientTest.java +++ b/packages/NetworkStack/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);