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

Commit e6384a5b authored by Adrian Roos's avatar Adrian Roos
Browse files

frameworks/opt/telephony: remove usages of Mockito.verifyZeroInteractions 

The method has been replaced by verifyNo(More)Interactions
in later Mockito versions.

Test: m checkbuild
Flag: TEST_ONLY
Bug: 310268946
Change-Id: I57faa43a5f158bb131f64c19d93de99e04f257ca
parent ae05591f

tests/telephonytests/src/com/android/internal/telephony/ims/ImsEnablementTrackerTest.java

+5 −5
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import static org.mockito.Matchers.eq; 
import static org.mockito.Mockito.never;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verifyZeroInteractions;

import static org.mockito.Mockito.verifyNoMoreInteractions;



import android.os.Handler;

import android.os.Looper;
@@ -224,7 +224,7 @@ public class ImsEnablementTrackerTest extends ImsTestBase { 
        mTracker.disableIms(SLOT_1, SUB_1);

        waitForHandler(mHandler);



        verifyZeroInteractions(mMockServiceControllerBinder);

        verifyNoMoreInteractions(mMockServiceControllerBinder);

        assertTrue(mTracker.isState(SLOT_1, mTracker.STATE_IMS_DISABLED));

    }
@@ -299,7 +299,7 @@ public class ImsEnablementTrackerTest extends ImsTestBase { 
        mTracker.enableIms(SLOT_1, SUB_1);

        waitForHandler(mHandler);



        verifyZeroInteractions(mMockServiceControllerBinder);

        verifyNoMoreInteractions(mMockServiceControllerBinder);

        assertTrue(mTracker.isState(SLOT_1, mTracker.STATE_IMS_ENABLED));

    }
@@ -417,7 +417,7 @@ public class ImsEnablementTrackerTest extends ImsTestBase { 
        mTracker.enableIms(SLOT_1, SUB_1);

        waitForHandler(mHandler);



        verifyZeroInteractions(mMockServiceControllerBinder);

        verifyNoMoreInteractions(mMockServiceControllerBinder);

        assertTrue(mTracker.isState(SLOT_1, mTracker.STATE_IMS_RESETTING));

    }
@@ -435,7 +435,7 @@ public class ImsEnablementTrackerTest extends ImsTestBase { 
        mTracker.disableIms(SLOT_1, SUB_1);

        waitForHandler(mHandler);



        verifyZeroInteractions(mMockServiceControllerBinder);

        verifyNoMoreInteractions(mMockServiceControllerBinder);

        assertTrue(mTracker.isState(SLOT_1, mTracker.STATE_IMS_RESETTING));

    }

tests/telephonytests/src/com/android/internal/telephony/satellite/DatagramControllerTest.java

+4 −4
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import static org.mockito.ArgumentMatchers.eq; 
import static org.mockito.Mockito.clearInvocations;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verifyZeroInteractions;

import static org.mockito.Mockito.verifyNoMoreInteractions;

import static org.mockito.Mockito.when;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;
@@ -148,9 +148,9 @@ public class DatagramControllerTest extends TelephonyTest { 
        int errorCode = SATELLITE_RESULT_SUCCESS;

        mDatagramControllerUT.updateSendStatus(SUB_ID, DATAGRAM_TYPE_KEEP_ALIVE,

                SATELLITE_DATAGRAM_TRANSFER_STATE_SENDING, sendPendingCount, errorCode);

        verifyZeroInteractions(mMockSatelliteSessionController);

        verifyZeroInteractions(mMockPointingAppController);

        verifyZeroInteractions(mMockDatagramReceiver);

        verifyNoMoreInteractions(mMockSatelliteSessionController);

        verifyNoMoreInteractions(mMockPointingAppController);

        verifyNoMoreInteractions(mMockDatagramReceiver);

    }



    @Test

tests/telephonytests/src/com/android/internal/telephony/satellite/DatagramDispatcherTest.java

+16 −17
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import static org.mockito.Mockito.reset; 
import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verifyNoMoreInteractions;

import static org.mockito.Mockito.verifyZeroInteractions;

import static org.mockito.Mockito.when;



import android.annotation.NonNull;
@@ -230,7 +229,7 @@ public class DatagramDispatcherTest extends TelephonyTest { 
                    eq(SATELLITE_RESULT_SUCCESS));

            mInOrder.verify(mMockDatagramController).getDatagramWaitTimeForConnectedState(

                    eq(SatelliteServiceUtils.isLastSosMessage(datagramType)));

            verifyZeroInteractions(mMockSatelliteModemInterface);

            verifyNoMoreInteractions(mMockSatelliteModemInterface);

            assertTrue(mDatagramDispatcherUT.isDatagramWaitForConnectedStateTimerStarted());



            doReturn(false).when(mMockDatagramController)
@@ -273,7 +272,7 @@ public class DatagramDispatcherTest extends TelephonyTest { 
            mDatagramDispatcherUT.sendSatelliteDatagram(SUB_ID, datagramType, mDatagram,

                    true, mResultListener::offer);

            processAllMessages();

            verifyZeroInteractions(mMockSatelliteModemInterface);

            verifyNoMoreInteractions(mMockSatelliteModemInterface);

            mInOrder.verify(mMockDatagramController)

                    .needsWaitingForSatelliteConnected(eq(datagramType));

            mInOrder.verify(mMockDatagramController).getDatagramWaitTimeForConnectedState(
@@ -282,7 +281,7 @@ public class DatagramDispatcherTest extends TelephonyTest { 


            moveTimeForward(TEST_DATAGRAM_WAIT_FOR_CONNECTED_STATE_TIMEOUT_MILLIS);

            processAllMessages();

            verifyZeroInteractions(mMockSatelliteModemInterface);

            verifyNoMoreInteractions(mMockSatelliteModemInterface);

            mInOrder.verify(mMockDatagramController)

                    .updateSendStatus(eq(mPhone.getSubId()),

                            eq(datagramType),
@@ -305,7 +304,7 @@ public class DatagramDispatcherTest extends TelephonyTest { 
            mDatagramDispatcherUT.onSatelliteModemStateChanged(

                    SatelliteManager.SATELLITE_MODEM_STATE_CONNECTED);

            processAllMessages();

            verifyZeroInteractions(mMockSatelliteModemInterface);

            verifyNoMoreInteractions(mMockSatelliteModemInterface);

            assertEquals(0, mResultListener.size());



            clearInvocations(mMockSatelliteModemInterface);
@@ -315,7 +314,7 @@ public class DatagramDispatcherTest extends TelephonyTest { 
            mDatagramDispatcherUT.sendSatelliteDatagram(SUB_ID, datagramType, mDatagram,

                    true, mResultListener::offer);

            processAllMessages();

            verifyZeroInteractions(mMockSatelliteModemInterface);

            verifyNoMoreInteractions(mMockSatelliteModemInterface);

            mInOrder.verify(mMockDatagramController)

                    .needsWaitingForSatelliteConnected(eq(datagramType));

            mInOrder.verify(mMockDatagramController).getDatagramWaitTimeForConnectedState(
@@ -329,7 +328,7 @@ public class DatagramDispatcherTest extends TelephonyTest { 
            mDatagramDispatcherUT.onSatelliteModemStateChanged(

                    SatelliteManager.SATELLITE_MODEM_STATE_OFF);

            processAllMessages();

            verifyZeroInteractions(mMockSatelliteModemInterface);

            verifyNoMoreInteractions(mMockSatelliteModemInterface);

            assertEquals(1, mResultListener.size());

            assertThat(mResultListener.peek()).isEqualTo(

                    SatelliteManager.SATELLITE_RESULT_REQUEST_ABORTED);
@@ -805,7 +804,7 @@ public class DatagramDispatcherTest extends TelephonyTest { 
                eq(SATELLITE_RESULT_SUCCESS));

        mInOrder.verify(mMockDatagramController).getDatagramWaitTimeForConnectedState(

                eq(SatelliteServiceUtils.isLastSosMessage(datagramType)));

        verifyZeroInteractions(mMockSmsDispatchersController);

        verifyNoMoreInteractions(mMockSmsDispatchersController);

        assertTrue(mDatagramDispatcherUT.isDatagramWaitForConnectedStateTimerStarted());



        doReturn(false).when(mMockDatagramController)
@@ -899,7 +898,7 @@ public class DatagramDispatcherTest extends TelephonyTest { 
                eq(SATELLITE_RESULT_SUCCESS));

        mInOrder.verify(mMockDatagramController).getDatagramWaitTimeForConnectedState(

                eq(SatelliteServiceUtils.isLastSosMessage(datagramType)));

        verifyZeroInteractions(mMockSmsDispatchersController);

        verifyNoMoreInteractions(mMockSmsDispatchersController);

        assertTrue(mDatagramDispatcherUT.isDatagramWaitForConnectedStateTimerStarted());



        moveTimeForward(TEST_DATAGRAM_WAIT_FOR_CONNECTED_STATE_TIMEOUT_MILLIS);
@@ -922,7 +921,7 @@ public class DatagramDispatcherTest extends TelephonyTest { 
        mDatagramDispatcherUT.onSatelliteModemStateChanged(

                SatelliteManager.SATELLITE_MODEM_STATE_CONNECTED);

        processAllMessages();

        verifyZeroInteractions(mMockSmsDispatchersController);

        verifyNoMoreInteractions(mMockSmsDispatchersController);

    }



    @Test
@@ -947,7 +946,7 @@ public class DatagramDispatcherTest extends TelephonyTest { 
                eq(SATELLITE_RESULT_SUCCESS));

        mInOrder.verify(mMockDatagramController).getDatagramWaitTimeForConnectedState(

                eq(SatelliteServiceUtils.isLastSosMessage(datagramType)));

        verifyZeroInteractions(mMockSmsDispatchersController);

        verifyNoMoreInteractions(mMockSmsDispatchersController);

        assertTrue(mDatagramDispatcherUT.isDatagramWaitForConnectedStateTimerStarted());



        mDatagramDispatcherUT.onSatelliteModemStateChanged(
@@ -1008,7 +1007,7 @@ public class DatagramDispatcherTest extends TelephonyTest { 
                eq(SATELLITE_RESULT_SUCCESS));

        mInOrder.verify(mMockDatagramController).getDatagramWaitTimeForConnectedState(

                eq(SatelliteServiceUtils.isLastSosMessage(datagramTypeSms)));

        verifyZeroInteractions(mMockSmsDispatchersController);

        verifyNoMoreInteractions(mMockSmsDispatchersController);

        assertTrue(mDatagramDispatcherUT.isDatagramWaitForConnectedStateTimerStarted());



        mDatagramDispatcherUT.sendSatelliteDatagram(SUB_ID, datagramTypeSos, mDatagram,
@@ -1020,7 +1019,7 @@ public class DatagramDispatcherTest extends TelephonyTest { 
                eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_WAITING_TO_CONNECT),

                eq(2),

                eq(SATELLITE_RESULT_SUCCESS));

        verifyZeroInteractions(mMockSatelliteModemInterface);

        verifyNoMoreInteractions(mMockSatelliteModemInterface);

        assertTrue(mDatagramDispatcherUT.isDatagramWaitForConnectedStateTimerStarted());



        doReturn(false).when(mMockDatagramController)
@@ -1108,7 +1107,7 @@ public class DatagramDispatcherTest extends TelephonyTest { 
        mDatagramDispatcherUT.sendSatelliteDatagram(SUB_ID, datagramTypeSos, mDatagram,

                true, mResultListener::offer);

        processAllMessages();

        verifyZeroInteractions(mMockSatelliteModemInterface);

        verifyNoMoreInteractions(mMockSatelliteModemInterface);



        mDatagramDispatcherUT.onSendSmsDone(mPhone.getSubId(), mPendingSms.uniqueMessageId, true);

        processAllMessages();
@@ -1172,7 +1171,7 @@ public class DatagramDispatcherTest extends TelephonyTest { 
                mDatagramDispatcherUT.obtainMessage(10 /*EVENT_MT_SMS_POLLING_THROTTLE_TIMED_OUT*/,

                        new AsyncResult(null, null, null)));



        verifyZeroInteractions(mMockSmsDispatchersController);

        verifyNoMoreInteractions(mMockSmsDispatchersController);

   }



    @Test
@@ -1189,7 +1188,7 @@ public class DatagramDispatcherTest extends TelephonyTest { 
                mDatagramDispatcherUT.obtainMessage(10 /*EVENT_MT_SMS_POLLING_THROTTLE_TIMED_OUT*/,

                        new AsyncResult(null, null, null)));



        verifyZeroInteractions(mMockSmsDispatchersController);

        verifyNoMoreInteractions(mMockSmsDispatchersController);

   }
@@ -1216,7 +1215,7 @@ public class DatagramDispatcherTest extends TelephonyTest { 


        mDatagramDispatcherUT.setDeviceAlignedWithSatellite(false);



        verifyZeroInteractions(mMockSmsDispatchersController);

        verifyNoMoreInteractions(mMockSmsDispatchersController);

    }



    @Test

tests/telephonytests/src/com/android/internal/telephony/satellite/DatagramReceiverTest.java

+4 −5
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import static org.mockito.Mockito.never; 
import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verifyNoMoreInteractions;

import static org.mockito.Mockito.verifyZeroInteractions;

import static org.mockito.Mockito.when;



import android.annotation.NonNull;
@@ -190,7 +189,7 @@ public class DatagramReceiverTest extends TelephonyTest { 
                eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_WAITING_TO_CONNECT), eq(0),

                eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));

        mInOrder.verify(mMockDatagramController).getDatagramWaitTimeForConnectedState(eq(false));

        verifyZeroInteractions(mMockSatelliteModemInterface);

        verifyNoMoreInteractions(mMockSatelliteModemInterface);

        assertTrue(mDatagramReceiverUT.isDatagramWaitForConnectedStateTimerStarted());



        doReturn(false).when(mMockDatagramController)
@@ -220,7 +219,7 @@ public class DatagramReceiverTest extends TelephonyTest { 
        mInOrder.verify(mMockDatagramController)

                .needsWaitingForSatelliteConnected(eq(SatelliteManager.DATAGRAM_TYPE_UNKNOWN));

        mInOrder.verify(mMockDatagramController).getDatagramWaitTimeForConnectedState(eq(false));

        verifyZeroInteractions(mMockSatelliteModemInterface);

        verifyNoMoreInteractions(mMockSatelliteModemInterface);

        assertTrue(mDatagramReceiverUT.isDatagramWaitForConnectedStateTimerStarted());



        moveTimeForward(TEST_DATAGRAM_WAIT_FOR_CONNECTED_STATE_TIMEOUT_MILLIS);
@@ -233,7 +232,7 @@ public class DatagramReceiverTest extends TelephonyTest { 
                eq(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE),

                eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE), eq(0),

                eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));

        verifyZeroInteractions(mMockSatelliteModemInterface);

        verifyNoMoreInteractions(mMockSatelliteModemInterface);

        assertEquals(1, mResultListener.size());

        assertThat(mResultListener.peek()).isEqualTo(

                SatelliteManager.SATELLITE_RESULT_NOT_REACHABLE);
@@ -244,7 +243,7 @@ public class DatagramReceiverTest extends TelephonyTest { 
        mDatagramReceiverUT.onSatelliteModemStateChanged(

                SatelliteManager.SATELLITE_MODEM_STATE_CONNECTED);

        processAllMessages();

        verifyZeroInteractions(mMockSatelliteModemInterface);

        verifyNoMoreInteractions(mMockSatelliteModemInterface);

        assertEquals(0, mResultListener.size());

    }