Merge "Fix broken unit test"

This commit is contained in:
David Christie
2013-08-06 16:56:16 +00:00
committed by Android (Google) Code Review

View File

@@ -40,6 +40,7 @@ import static android.text.format.DateUtils.MINUTE_IN_MILLIS;
import static android.text.format.DateUtils.WEEK_IN_MILLIS; import static android.text.format.DateUtils.WEEK_IN_MILLIS;
import static com.android.server.net.NetworkStatsService.ACTION_NETWORK_STATS_POLL; import static com.android.server.net.NetworkStatsService.ACTION_NETWORK_STATS_POLL;
import static org.easymock.EasyMock.anyLong; import static org.easymock.EasyMock.anyLong;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.aryEq; import static org.easymock.EasyMock.aryEq;
import static org.easymock.EasyMock.capture; import static org.easymock.EasyMock.capture;
import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.createMock;
@@ -880,7 +881,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
expectLastCall().anyTimes(); expectLastCall().anyTimes();
mAlarmManager.set(eq(AlarmManager.ELAPSED_REALTIME), anyLong(), anyLong(), anyLong(), mAlarmManager.set(eq(AlarmManager.ELAPSED_REALTIME), anyLong(), anyLong(), anyLong(),
isA(PendingIntent.class), isA(WorkSource.class)); isA(PendingIntent.class), anyObject(WorkSource.class));
expectLastCall().atLeastOnce(); expectLastCall().atLeastOnce();
mNetManager.setGlobalAlert(anyLong()); mNetManager.setGlobalAlert(anyLong());