From 61525a57a0af324a896e8f0e6e6c7e231a68a9dd Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Thu, 1 Sep 2022 18:02:12 +0900 Subject: [PATCH] Convert EthTrackTest from when() to doReturn() Bug: 242671512 Test: FrameworksNetTests Change-Id: I5f13ebe1c1e8e1ecd3d561cae8380ec12b31dc95 --- .../com/android/server/ethernet/EthernetTrackerTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/unit/java/com/android/server/ethernet/EthernetTrackerTest.java b/tests/unit/java/com/android/server/ethernet/EthernetTrackerTest.java index 082a016241..ea3d3923c7 100644 --- a/tests/unit/java/com/android/server/ethernet/EthernetTrackerTest.java +++ b/tests/unit/java/com/android/server/ethernet/EthernetTrackerTest.java @@ -87,8 +87,8 @@ public class EthernetTrackerTest { public void setUp() throws RemoteException { MockitoAnnotations.initMocks(this); initMockResources(); - when(mFactory.updateInterfaceLinkState(anyString(), anyBoolean())).thenReturn(false); - when(mNetd.interfaceGetList()).thenReturn(new String[0]); + doReturn(false).when(mFactory).updateInterfaceLinkState(anyString(), anyBoolean()); + doReturn(new String[0]).when(mNetd).interfaceGetList(); mHandlerThread = new HandlerThread(THREAD_NAME); mHandlerThread.start(); tracker = new EthernetTracker(mContext, mHandlerThread.getThreadHandler(), mFactory, mNetd, @@ -101,8 +101,8 @@ public class EthernetTrackerTest { } private void initMockResources() { - when(mDeps.getInterfaceRegexFromResource(eq(mContext))).thenReturn(""); - when(mDeps.getInterfaceConfigFromResource(eq(mContext))).thenReturn(new String[0]); + doReturn("").when(mDeps).getInterfaceRegexFromResource(eq(mContext)); + doReturn(new String[0]).when(mDeps).getInterfaceConfigFromResource(eq(mContext)); } private void waitForIdle() {