Merge "Convert EthTrackTest from when() to doReturn()"

This commit is contained in:
Jean Chalard
2022-09-02 02:52:39 +00:00
committed by Gerrit Code Review

View File

@@ -87,8 +87,8 @@ public class EthernetTrackerTest {
public void setUp() throws RemoteException { public void setUp() throws RemoteException {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
initMockResources(); initMockResources();
when(mFactory.updateInterfaceLinkState(anyString(), anyBoolean())).thenReturn(false); doReturn(false).when(mFactory).updateInterfaceLinkState(anyString(), anyBoolean());
when(mNetd.interfaceGetList()).thenReturn(new String[0]); doReturn(new String[0]).when(mNetd).interfaceGetList();
mHandlerThread = new HandlerThread(THREAD_NAME); mHandlerThread = new HandlerThread(THREAD_NAME);
mHandlerThread.start(); mHandlerThread.start();
tracker = new EthernetTracker(mContext, mHandlerThread.getThreadHandler(), mFactory, mNetd, tracker = new EthernetTracker(mContext, mHandlerThread.getThreadHandler(), mFactory, mNetd,
@@ -101,8 +101,8 @@ public class EthernetTrackerTest {
} }
private void initMockResources() { private void initMockResources() {
when(mDeps.getInterfaceRegexFromResource(eq(mContext))).thenReturn(""); doReturn("").when(mDeps).getInterfaceRegexFromResource(eq(mContext));
when(mDeps.getInterfaceConfigFromResource(eq(mContext))).thenReturn(new String[0]); doReturn(new String[0]).when(mDeps).getInterfaceConfigFromResource(eq(mContext));
} }
private void waitForIdle() { private void waitForIdle() {