Merge "Reverse Mockito APIs." into tm-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
63b4a76ba2
@@ -21,7 +21,6 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSess
|
|||||||
|
|
||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
import static org.mockito.Mockito.mock;
|
import static org.mockito.Mockito.mock;
|
||||||
import static org.mockito.Mockito.when;
|
|
||||||
|
|
||||||
import android.app.AlarmManager;
|
import android.app.AlarmManager;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
@@ -71,10 +70,10 @@ public class AgentTest {
|
|||||||
.strictness(Strictness.LENIENT)
|
.strictness(Strictness.LENIENT)
|
||||||
.mockStatic(LocalServices.class)
|
.mockStatic(LocalServices.class)
|
||||||
.startMocking();
|
.startMocking();
|
||||||
when(mIrs.getContext()).thenReturn(mContext);
|
doReturn(mContext).when(mIrs).getContext();
|
||||||
when(mIrs.getCompleteEconomicPolicyLocked()).thenReturn(mEconomicPolicy);
|
doReturn(mEconomicPolicy).when(mIrs).getCompleteEconomicPolicyLocked();
|
||||||
when(mIrs.getLock()).thenReturn(mIrs);
|
doReturn(mIrs).when(mIrs).getLock();
|
||||||
when(mContext.getSystemService(Context.ALARM_SERVICE)).thenReturn(mock(AlarmManager.class));
|
doReturn(mock(AlarmManager.class)).when(mContext).getSystemService(Context.ALARM_SERVICE);
|
||||||
mScribe = new MockScribe(mIrs);
|
mScribe = new MockScribe(mIrs);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user