Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5347c17e authored by Kweku Adams's avatar Kweku Adams
Browse files

Reverse Mockito APIs. 

Mockito seems to have problems with when().thenReturn(), so use
doReturn().when() instead.

Bug: 224573955
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/tare
Test: atest frameworks/base/services/tests/mockingservicestests/src/com/android/server/tare
Change-Id: I15e7b5d0927cd6f36c952f994f0ac497ba85c681
parent ba30e363

services/tests/mockingservicestests/src/com/android/server/tare/AgentTest.java

+4 −5
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSess 


import static org.junit.Assert.assertEquals;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.when;



import android.app.AlarmManager;

import android.content.Context;
@@ -71,10 +70,10 @@ public class AgentTest { 
                .strictness(Strictness.LENIENT)

                .mockStatic(LocalServices.class)

                .startMocking();

        when(mIrs.getContext()).thenReturn(mContext);

        when(mIrs.getCompleteEconomicPolicyLocked()).thenReturn(mEconomicPolicy);

        when(mIrs.getLock()).thenReturn(mIrs);

        when(mContext.getSystemService(Context.ALARM_SERVICE)).thenReturn(mock(AlarmManager.class));

        doReturn(mContext).when(mIrs).getContext();

        doReturn(mEconomicPolicy).when(mIrs).getCompleteEconomicPolicyLocked();

        doReturn(mIrs).when(mIrs).getLock();

        doReturn(mock(AlarmManager.class)).when(mContext).getSystemService(Context.ALARM_SERVICE);

        mScribe = new MockScribe(mIrs);

    }