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

Commit ff11eeb0 authored by Matthew Reynolds's avatar Matthew Reynolds
Browse files

Replaced verifyZeroInteractions with verifyNoMoreInteractions 

The on-device unit tests are currently using Mockito 2.23, and the Robolectric tests use mockito 4.8.1. In 2.23, verifyZeroInteractions had already been deprecated, and in 4.8.1, it was removed entirely.  In order to move the tests to multivalentTests, we had to blanket-change the API, and there were some files whose runners hadn't been changed from AndroidTestingRunner to AndroidJUnit4.

MagnificationModeSwitchTest.java was mistakenly moved to the multivalentTests directory, where it was failing at runtime under Robolectric (b/369575544). This CL moves it back to the tests directory, and other files had to be moved back in ag/29583402.

Test: tested manually with atest
Bug: 369888148
Flag: TEST_ONLY
Change-Id: I04f9494d914b3e7627c2e773e49cdde781935880
parent 183cfc93

packages/SystemUI/tests/src/com/android/keyguard/KeyguardAbsKeyInputViewControllerTest.java→packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardAbsKeyInputViewControllerTest.java

+3 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import static org.mockito.Mockito.mock; 
import static org.mockito.Mockito.never;

import static org.mockito.Mockito.reset;

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 android.os.SystemClock;
@@ -168,8 +168,8 @@ public class KeyguardAbsKeyInputViewControllerTest extends SysuiTestCase { 
        verify(mAbsKeyInputView).setKeyDownListener(onKeyDownListenerArgumentCaptor.capture());

        onKeyDownListenerArgumentCaptor.getValue().onKeyDown(

                KeyEvent.KEYCODE_UNKNOWN, mock(KeyEvent.class));

        verifyZeroInteractions(mKeyguardSecurityCallback);

        verifyZeroInteractions(mKeyguardMessageAreaController);

        verifyNoMoreInteractions(mKeyguardSecurityCallback);

        verifyNoMoreInteractions(mKeyguardMessageAreaController);

    }



    @Test

packages/SystemUI/tests/src/com/android/systemui/controls/start/ControlsStartableTest.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/controls/start/ControlsStartableTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ import org.mockito.Mockito.doAnswer 
import org.mockito.Mockito.doReturn

import org.mockito.Mockito.never

import org.mockito.Mockito.verify

import org.mockito.Mockito.verifyZeroInteractions

import org.mockito.Mockito.verifyNoMoreInteractions

import org.mockito.Mockito.`when`

import org.mockito.MockitoAnnotations
@@ -109,7 +109,7 @@ class ControlsStartableTest : SysuiTestCase() { 
            onBootCompleted()

        }



        verifyZeroInteractions(controlsController, controlsListingController, userTracker)

        verifyNoMoreInteractions(controlsController, controlsListingController, userTracker)

    }



    @Test
@@ -119,7 +119,7 @@ class ControlsStartableTest : SysuiTestCase() { 
        fakeExecutor.advanceClockToLast()

        fakeExecutor.runAllReady()



        verifyZeroInteractions(controlsController, controlsListingController, userTracker)

        verifyNoMoreInteractions(controlsController, controlsListingController, userTracker)

    }



    @Test

packages/SystemUI/tests/src/com/android/systemui/haptics/slider/SliderStateTrackerTest.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/haptics/slider/SliderStateTrackerTest.kt

+6 −7
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import org.mockito.Mock 
import org.mockito.Mockito.anyFloat

import org.mockito.Mockito.verify

import org.mockito.Mockito.verifyNoMoreInteractions

import org.mockito.Mockito.verifyZeroInteractions

import org.mockito.MockitoAnnotations



@SmallTest
@@ -84,7 +83,7 @@ class SliderStateTrackerTest : SysuiTestCase() { 


        // THEN The state is idle and the listener is not called to play haptics

        assertThat(mSliderStateTracker.currentState).isEqualTo(SliderState.IDLE)

        verifyZeroInteractions(sliderStateListener)

        verifyNoMoreInteractions(sliderStateListener)

    }



    @Test
@@ -97,7 +96,7 @@ class SliderStateTrackerTest : SysuiTestCase() { 


        // THEN the tracker moves to the wait state and the timer job begins

        assertThat(mSliderStateTracker.currentState).isEqualTo(SliderState.WAIT)

        verifyZeroInteractions(sliderStateListener)

        verifyNoMoreInteractions(sliderStateListener)

        assertThat(mSliderStateTracker.isWaiting).isTrue()

    }
@@ -591,7 +590,7 @@ class SliderStateTrackerTest : SysuiTestCase() { 


        // THEN the tracker moves back to IDLE and there are no haptics

        assertThat(mSliderStateTracker.currentState).isEqualTo(SliderState.IDLE)

        verifyZeroInteractions(sliderStateListener)

        verifyNoMoreInteractions(sliderStateListener)

    }



    @Test
@@ -608,7 +607,7 @@ class SliderStateTrackerTest : SysuiTestCase() { 
        // haptics

        assertThat(mSliderStateTracker.currentState).isEqualTo(SliderState.WAIT)

        assertThat(mSliderStateTracker.isWaiting).isTrue()

        verifyZeroInteractions(sliderStateListener)

        verifyNoMoreInteractions(sliderStateListener)

    }



    @Test
@@ -644,7 +643,7 @@ class SliderStateTrackerTest : SysuiTestCase() { 


        // THEN the tracker moves to IDLE and no haptics are played

        assertThat(mSliderStateTracker.currentState).isEqualTo(SliderState.IDLE)

        verifyZeroInteractions(sliderStateListener)

        verifyNoMoreInteractions(sliderStateListener)

    }



    @Test
@@ -660,7 +659,7 @@ class SliderStateTrackerTest : SysuiTestCase() { 
        // THEN the tracker moves to WAIT and the wait job starts.

        assertThat(mSliderStateTracker.currentState).isEqualTo(SliderState.WAIT)

        assertThat(mSliderStateTracker.isWaiting).isTrue()

        verifyZeroInteractions(sliderStateListener)

        verifyNoMoreInteractions(sliderStateListener)

    }



    @Test

packages/SystemUI/tests/src/com/android/systemui/keyboard/stickykeys/ui/StickyKeysIndicatorCoordinatorTest.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/stickykeys/ui/StickyKeysIndicatorCoordinatorTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import org.junit.Before 
import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mockito.verify

import org.mockito.Mockito.verifyZeroInteractions

import org.mockito.Mockito.verifyNoMoreInteractions



@OptIn(ExperimentalCoroutinesApi::class)

@SmallTest
@@ -75,7 +75,7 @@ class StickyKeysIndicatorCoordinatorTest : SysuiTestCase() { 
    @Test

    fun dialogIsShownWhenStickyKeysAreEmitted() {

        testScope.run {

            verifyZeroInteractions(dialog)

            verifyNoMoreInteractions(dialog)



            stickyKeysRepository.setStickyKeys(linkedMapOf(SHIFT to Locked(true)))

            runCurrent()
@@ -87,7 +87,7 @@ class StickyKeysIndicatorCoordinatorTest : SysuiTestCase() { 
    @Test

    fun dialogDisappearsWhenStickyKeysAreEmpty() {

        testScope.run {

            verifyZeroInteractions(dialog)

            verifyNoMoreInteractions(dialog)



            stickyKeysRepository.setStickyKeys(linkedMapOf(SHIFT to Locked(true)))

            runCurrent()

packages/SystemUI/tests/src/com/android/systemui/keyboard/stickykeys/ui/viewmodel/StickyKeysIndicatorViewModelTest.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/stickykeys/ui/viewmodel/StickyKeysIndicatorViewModelTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ import org.junit.Test 
import org.junit.runner.RunWith

import org.mockito.ArgumentCaptor

import org.mockito.Mockito.verify

import org.mockito.Mockito.verifyZeroInteractions

import org.mockito.Mockito.verifyNoMoreInteractions



@OptIn(ExperimentalCoroutinesApi::class)

@SmallTest
@@ -98,7 +98,7 @@ class StickyKeysIndicatorViewModelTest : SysuiTestCase() { 
            keyboardRepository.setIsAnyKeyboardConnected(true)

            runCurrent()



            verifyZeroInteractions(inputManager)

            verifyNoMoreInteractions(inputManager)

        }

    }