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

Commit 5f812109 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Reduce flakiness" into main

parents ee2a86f5 366fe034
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -20,8 +20,12 @@ import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertTrue;
import static junit.framework.TestCase.assertFalse;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -70,10 +74,11 @@ public class NotificationHistoryJobServiceTest extends UiServiceTestCase {

    @Before
    public void setUp() throws Exception {
        mJobService = new NotificationHistoryJobService();
        mJobService = spy(new NotificationHistoryJobService());
        mJobService.attachBaseContext(mContext);
        mJobService.onCreate();
        mJobService.onBind(/* intent= */ null);  // Create JobServiceEngine within JobService.
        doNothing().when(mJobService).jobFinished(any(), eq(false));

        mContext.addMockSystemService(JobScheduler.class, mMockJobScheduler);