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

Commit 6385405f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "packages/services/Telecomm: remove deprecated Mockito usages" into main

parents adae5eec 68b683f1
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.server.telecom.tests;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyObject;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.never;
@@ -116,7 +115,7 @@ public class ContactsAsyncHelperTest extends TelecomTestCase {
        }
        Thread.sleep(TEST_TIMEOUT);
        verify(mListener, never()).onImageLoadComplete(anyInt(),
                any(Drawable.class), any(Bitmap.class), anyObject());
                any(Drawable.class), any(Bitmap.class), any());
    }

    @SmallTest
+2 −3
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static com.android.server.telecom.TelecomStatsLog.TELECOM_ERROR_STATS;
import static com.android.server.telecom.TelecomStatsLog.TELECOM_EVENT_STATS;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyObject;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
@@ -139,8 +138,8 @@ public class TelecomMetricsControllerTest extends TelecomTestCase {

        mTelecomMetricsController.registerAtom(TELECOM_API_STATS, stats);

        verify(statsManager, times(1)).setPullAtomCallback(eq(TELECOM_API_STATS), anyObject(),
                anyObject(), eq(mTelecomMetricsController));
        verify(statsManager, times(1)).setPullAtomCallback(eq(TELECOM_API_STATS), any(),
                any(), eq(mTelecomMetricsController));
        assertThat(mTelecomMetricsController.getStats().get(TELECOM_API_STATS))
                .isSameInstanceAs(stats);
    }