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

Commit f59f4466 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Telecomm: remove usages of deprecated Mockito matchers" into main

parents 8e8aba5c f543ae69

tests/src/com/android/server/telecom/tests/BasicCallTests.java

+1 −1
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ public class BasicCallTests extends TelecomSystemTest { 


        mInCallServiceFixtureX.mInCallAdapter.sendCallEvent(ids.mCallId, TEST_EVENT, 26, null);

        verify(mConnectionServiceFixtureA.getTestDouble(), timeout(TEST_TIMEOUT))

                .sendCallEvent(eq(ids.mConnectionId), eq(TEST_EVENT), isNull(Bundle.class), any());

                .sendCallEvent(eq(ids.mConnectionId), eq(TEST_EVENT), isNull(), any());

    }



    /**

tests/src/com/android/server/telecom/tests/CallerInfoLookupHelperTest.java

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ public class CallerInfoLookupHelperTest extends TelecomTestCase { 
                CallerInfoLookupHelper.OnQueryCompleteListener.class);

        mCallerInfoLookupHelper.startLookup(Uri.EMPTY, listener);



        verify(listener).onCallerInfoQueryComplete(eq(Uri.EMPTY), isNull(CallerInfo.class));

        verify(listener).onCallerInfoQueryComplete(eq(Uri.EMPTY), isNull());

        verifyProperCleanup();

    }

tests/src/com/android/server/telecom/tests/ContactsAsyncHelperTest.java

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ public class ContactsAsyncHelperTest extends TelecomTestCase { 
        cah.startObtainPhotoAsync(TOKEN, mContext, SAMPLE_CONTACT_PHOTO_URI, mListener, COOKIE);



        verify(mListener, timeout(TEST_TIMEOUT)).onImageLoadComplete(eq(TOKEN),

                isNull(Drawable.class), isNull(Bitmap.class), eq(COOKIE));

                isNull(), isNull(), eq(COOKIE));

    }



    @SmallTest

tests/src/com/android/server/telecom/tests/DefaultDialerCacheTest.java

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ public class DefaultDialerCacheTest extends TelecomTestCase { 


        verify(mContext, times(2)).registerReceiverAsUser(

                packageReceiverCaptor.capture(), eq(UserHandle.ALL), any(IntentFilter.class),

                isNull(String.class), isNull(Handler.class));

                isNull(), isNull());

        // Receive the first receiver that was captured, the package change receiver.

        mPackageChangeReceiver = packageReceiverCaptor.getAllValues().get(0);

tests/src/com/android/server/telecom/tests/MissedCallNotifierImplTest.java

+1 −1
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ public class MissedCallNotifierImplTest extends TelecomTestCase { 


        CallerInfo ci = new CallerInfo();

        listenerCaptor.getValue().onCallerInfoQueryComplete(escapedHandle, ci);

        verify(mockCallInfoFactory).makeCallInfo(eq(ci), isNull(PhoneAccountHandle.class),

        verify(mockCallInfoFactory).makeCallInfo(eq(ci), isNull(),

                eq(escapedHandle), eq(CALL_TIMESTAMP));

    }