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

Commit 9d093d5b authored by Sihua Ma's avatar Sihua Ma
Browse files

Replace verifyZeroInteractions with verifyNoMoreInteractions 

Also migrating LockedUserStateTest and AbstractFloatingViewHelperTest
to multivalent

Test: atest NexusLauncherRoboTests
Test: SysUI studio
Flag: TEST_ONLY
Bug: 297950111
Change-Id: Ic476de791109e7892c86bf5ae77727fc0506f0b9
parent 26d9b9c6

tests/src/com/android/launcher3/AbstractFloatingViewHelperTest.kt→tests/multivalentTests/src/com/android/launcher3/AbstractFloatingViewHelperTest.kt

+9 −5
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import org.mockito.kotlin.any 
import org.mockito.kotlin.mock

import org.mockito.kotlin.never

import org.mockito.kotlin.verify

import org.mockito.kotlin.verifyZeroInteractions

import org.mockito.kotlin.verifyNoMoreInteractions

import org.mockito.kotlin.whenever



/** Test for AbstractFloatingViewHelper */
@@ -60,7 +60,8 @@ class AbstractFloatingViewHelperTest { 
            AbstractFloatingView.TYPE_ALL

        )



        verifyZeroInteractions(view)

        // b/343530737

        verifyNoMoreInteractions(view)

        verify(folderView).close(true)

        verify(taskMenuView).close(true)

    }
@@ -73,7 +74,8 @@ class AbstractFloatingViewHelperTest { 
            AbstractFloatingView.TYPE_TASK_MENU

        )



        verifyZeroInteractions(view)

        // b/343530737

        verifyNoMoreInteractions(view)

        verify(folderView, never()).close(any())

        verify(taskMenuView).close(true)

    }
@@ -86,7 +88,8 @@ class AbstractFloatingViewHelperTest { 
            AbstractFloatingView.TYPE_PIN_IME_POPUP

        )



        verifyZeroInteractions(view)

        // b/343530737

        verifyNoMoreInteractions(view)

        verify(folderView, never()).close(any())

        verify(taskMenuView, never()).close(any())

    }
@@ -99,7 +102,8 @@ class AbstractFloatingViewHelperTest { 
            AbstractFloatingView.TYPE_FOLDER or AbstractFloatingView.TYPE_TASK_MENU

        )



        verifyZeroInteractions(view)

        // b/343530737

        verifyNoMoreInteractions(view)

        verify(folderView).close(false)

        verify(taskMenuView).close(false)

    }

tests/src/com/android/launcher3/util/LockedUserStateTest.kt→tests/multivalentTests/src/com/android/launcher3/util/LockedUserStateTest.kt

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

import org.mockito.kotlin.mock

import org.mockito.kotlin.verify

import org.mockito.kotlin.verifyZeroInteractions

import org.mockito.kotlin.verifyNoMoreInteractions

import org.mockito.kotlin.whenever



/** Unit tests for {@link LockedUserState} */
@@ -58,7 +58,8 @@ class LockedUserStateTest { 
        val action: Runnable = mock()

        val state = LockedUserState(context)

        state.runOnUserUnlocked(action)

        verifyZeroInteractions(action)

        // b/343530737

        verifyNoMoreInteractions(action)

        state.mUserUnlockedReceiver.onReceive(context, Intent(Intent.ACTION_USER_UNLOCKED))

        verify(action).run()

    }

tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.kt

+3 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import org.mockito.kotlin.eq 
import org.mockito.kotlin.mock

import org.mockito.kotlin.same

import org.mockito.kotlin.verify

import org.mockito.kotlin.verifyZeroInteractions

import org.mockito.kotlin.verifyNoMoreInteractions

import org.mockito.kotlin.whenever



/** Tests for [AddWorkspaceItemsTask] */
@@ -97,7 +97,8 @@ class AddWorkspaceItemsTaskTest : AbstractWorkspaceModelTest() { 
        val addedItems = testAddItems(nonEmptyScreenIds, itemToAdd)



        assertThat(addedItems.size).isEqualTo(0)

        verifyZeroInteractions(mWorkspaceItemSpaceFinder)

        // b/343530737

        verifyNoMoreInteractions(mWorkspaceItemSpaceFinder)

    }



    @Test

tests/src/com/android/launcher3/provider/RestoreDbTaskTest.java

+3 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import static org.mockito.Mockito.mock; 
import static org.mockito.Mockito.spy;

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 static org.mockito.Mockito.when;



import android.app.backup.BackupManager;
@@ -243,7 +243,8 @@ public class RestoreDbTaskTest { 
        // Then

        assertThat(expectedHost.getAppWidgetIds()).isEqualTo(expectedOldIds);

        assertThat(mPrefs.has(OLD_APP_WIDGET_IDS, APP_WIDGET_IDS)).isFalse();

        verifyZeroInteractions(mMockController);

        // b/343530737

        verifyNoMoreInteractions(mMockController);

    }



    @Test