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

Commit dfaecce3 authored by Wes Okuhara's avatar Wes Okuhara
Browse files

Update to mockito-kotlin argument captor in TakeScreenshotExecutorTest 

Bug: 430361425
Test: atest com.android.systemui.screenshot.TakeScreenshotExecutorTest
Flag: TEST_ONLY
Change-Id: I21397b1bd13697f770ce4624178dff4b84c25f69
parent f1bbd3a6

packages/SystemUI/multivalentTests/src/com/android/systemui/screenshot/TakeScreenshotExecutorTest.kt

+33 −33
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import com.android.systemui.display.data.repository.FakeDisplayRepository 
import com.android.systemui.display.data.repository.display

import com.android.systemui.screenshot.proxy.ScreenshotProxy

import com.android.systemui.util.mockito.eq

import com.android.systemui.util.mockito.kotlinArgumentCaptor as ArgumentCaptor

import com.android.systemui.util.mockito.whenever

import com.google.common.truth.Truth.assertThat

import java.lang.IllegalStateException
@@ -40,6 +39,7 @@ import org.mockito.Mockito.times 
import org.mockito.Mockito.verify

import org.mockito.Mockito.verifyNoMoreInteractions

import org.mockito.kotlin.any

import org.mockito.kotlin.argumentCaptor

import org.mockito.kotlin.doReturn

import org.mockito.kotlin.mock

import org.mockito.kotlin.stub
@@ -101,13 +101,13 @@ class TakeScreenshotExecutorTest : SysuiTestCase() { 
            verify(controllerFactory).create(eq(internalDisplay))

            verify(controllerFactory, never()).create(eq(externalDisplay))



            val capturer = ArgumentCaptor<ScreenshotData>()

            val capturer = argumentCaptor<ScreenshotData>()



            verify(controller).handleScreenshot(capturer.capture(), any(), any())

            assertThat(capturer.value.displayId).isEqualTo(0)

            assertThat(capturer.lastValue.displayId).isEqualTo(0)

            // OnSaved callback should be different.

            verify(headlessHandler).handleScreenshot(capturer.capture(), any(), any())

            assertThat(capturer.value.displayId).isEqualTo(1)

            assertThat(capturer.lastValue.displayId).isEqualTo(1)



            assertThat(eventLogger.numLogs()).isEqualTo(2)

            assertThat(eventLogger.get(0).eventId)
@@ -137,10 +137,10 @@ class TakeScreenshotExecutorTest : SysuiTestCase() { 
            verify(controllerFactory).create(eq(internalDisplay))

            verify(controllerFactory, never()).create(eq(externalDisplay))



            val capturer = ArgumentCaptor<ScreenshotData>()

            val capturer = argumentCaptor<ScreenshotData>()



            verify(controller).handleScreenshot(capturer.capture(), any(), any())

            assertThat(capturer.value.displayId).isEqualTo(0)

            assertThat(capturer.lastValue.displayId).isEqualTo(0)

            // OnSaved callback should be different.

            verify(headlessHandler, never()).handleScreenshot(any(), any(), any())
@@ -193,19 +193,18 @@ class TakeScreenshotExecutorTest : SysuiTestCase() { 
            val onSaved = { _: Uri? -> }

            screenshotExecutor.executeScreenshots(createScreenshotRequest(), onSaved, callback)



            val capturer0 = ArgumentCaptor<TakeScreenshotService.RequestCallback>()

            val capturer1 = ArgumentCaptor<TakeScreenshotService.RequestCallback>()

            val capturer0 = argumentCaptor<TakeScreenshotService.RequestCallback>()

            val capturer1 = argumentCaptor<TakeScreenshotService.RequestCallback>()



            verify(controller).handleScreenshot(any(), any(), capturer0.capture())

            verify(headlessHandler).handleScreenshot(any(), any(), capturer1.capture())



            verify(callback, never()).onFinish()



            capturer0.value.onFinish()

            capturer0.lastValue.onFinish()



            verify(callback, never()).onFinish()



            capturer1.value.onFinish()

            capturer1.lastValue.onFinish()



            verify(callback).onFinish()

            screenshotExecutor.onDestroy()
@@ -219,19 +218,19 @@ class TakeScreenshotExecutorTest : SysuiTestCase() { 
            val onSaved = { _: Uri? -> }

            screenshotExecutor.executeScreenshots(createScreenshotRequest(), onSaved, callback)



            val capturer0 = ArgumentCaptor<TakeScreenshotService.RequestCallback>()

            val capturer1 = ArgumentCaptor<TakeScreenshotService.RequestCallback>()

            val capturer0 = argumentCaptor<TakeScreenshotService.RequestCallback>()

            val capturer1 = argumentCaptor<TakeScreenshotService.RequestCallback>()



            verify(controller).handleScreenshot(any(), any(), capturer0.capture())

            verify(headlessHandler).handleScreenshot(any(), any(), capturer1.capture())



            verify(callback, never()).onFinish()



            capturer0.value.onFinish()

            capturer0.lastValue.onFinish()



            verify(callback, never()).onFinish()



            capturer1.value.reportError()

            capturer1.lastValue.reportError()



            verify(callback, never()).onFinish()

            verify(callback).reportError()
@@ -247,20 +246,20 @@ class TakeScreenshotExecutorTest : SysuiTestCase() { 
            val onSaved = { _: Uri? -> }

            screenshotExecutor.executeScreenshots(createScreenshotRequest(), onSaved, callback)



            val capturer0 = ArgumentCaptor<TakeScreenshotService.RequestCallback>()

            val capturer1 = ArgumentCaptor<TakeScreenshotService.RequestCallback>()

            val capturer0 = argumentCaptor<TakeScreenshotService.RequestCallback>()

            val capturer1 = argumentCaptor<TakeScreenshotService.RequestCallback>()



            verify(controller).handleScreenshot(any(), any(), capturer0.capture())

            verify(headlessHandler).handleScreenshot(any(), any(), capturer1.capture())



            verify(callback, never()).onFinish()



            capturer0.value.reportError()

            capturer0.lastValue.reportError()



            verify(callback, never()).onFinish()

            verify(callback, never()).reportError()



            capturer1.value.reportError()

            capturer1.lastValue.reportError()



            verify(callback, never()).onFinish()

            verify(callback).reportError()
@@ -273,6 +272,7 @@ class TakeScreenshotExecutorTest : SysuiTestCase() { 
        testScope.runTest {

            val displayId = 1

            setDisplays(display(TYPE_INTERNAL, id = 0), display(TYPE_EXTERNAL, id = displayId))



            val onSaved = { _: Uri? -> }

            screenshotExecutor.executeScreenshots(

                createScreenshotRequest(
@@ -283,11 +283,11 @@ class TakeScreenshotExecutorTest : SysuiTestCase() { 
                callback,

            )



            val dataCaptor = ArgumentCaptor<ScreenshotData>()

            val dataCaptor = argumentCaptor<ScreenshotData>()



            verify(controller).handleScreenshot(dataCaptor.capture(), any(), any())



            assertThat(dataCaptor.value.displayId).isEqualTo(displayId)

            assertThat(dataCaptor.lastValue.displayId).isEqualTo(displayId)



            screenshotExecutor.onDestroy()

        }
@@ -310,11 +310,11 @@ class TakeScreenshotExecutorTest : SysuiTestCase() { 
                callback,

            )



            val dataCaptor = ArgumentCaptor<ScreenshotData>()

            val dataCaptor = argumentCaptor<ScreenshotData>()



            verify(controller).handleScreenshot(dataCaptor.capture(), any(), any())



            assertThat(dataCaptor.value.displayId).isEqualTo(Display.DEFAULT_DISPLAY)

            assertThat(dataCaptor.lastValue.displayId).isEqualTo(Display.DEFAULT_DISPLAY)



            screenshotExecutor.onDestroy()

        }
@@ -333,9 +333,9 @@ class TakeScreenshotExecutorTest : SysuiTestCase() { 
            val onSaved = { _: Uri? -> }

            screenshotExecutor.executeScreenshots(request, onSaved, callback)



            val dataCaptor = ArgumentCaptor<ScreenshotData>()

            val dataCaptor = argumentCaptor<ScreenshotData>()

            verify(controller).handleScreenshot(dataCaptor.capture(), any(), any())

            assertThat(dataCaptor.value.displayId).isEqualTo(displayId)

            assertThat(dataCaptor.lastValue.displayId).isEqualTo(displayId)



            screenshotExecutor.onDestroy()

        }
@@ -356,9 +356,9 @@ class TakeScreenshotExecutorTest : SysuiTestCase() { 
            val onSaved = { _: Uri? -> }

            screenshotExecutor.executeScreenshots(request, onSaved, callback)



            val dataCaptor = ArgumentCaptor<ScreenshotData>()

            val dataCaptor = argumentCaptor<ScreenshotData>()

            verify(controller).handleScreenshot(dataCaptor.capture(), any(), any())

            assertThat(dataCaptor.value.displayId).isEqualTo(Display.DEFAULT_DISPLAY)

            assertThat(dataCaptor.lastValue.displayId).isEqualTo(Display.DEFAULT_DISPLAY)



            screenshotExecutor.onDestroy()

        }
@@ -380,11 +380,11 @@ class TakeScreenshotExecutorTest : SysuiTestCase() { 
                callback,

            )



            val dataCaptor = ArgumentCaptor<ScreenshotData>()

            val dataCaptor = argumentCaptor<ScreenshotData>()



            verify(controller).handleScreenshot(dataCaptor.capture(), any(), any())



            assertThat(dataCaptor.value.displayId).isEqualTo(displayId)

            assertThat(dataCaptor.lastValue.displayId).isEqualTo(displayId)



            screenshotExecutor.onDestroy()

        }
@@ -409,11 +409,11 @@ class TakeScreenshotExecutorTest : SysuiTestCase() { 
                callback,

            )



            val dataCaptor = ArgumentCaptor<ScreenshotData>()

            val dataCaptor = argumentCaptor<ScreenshotData>()



            verify(controller).handleScreenshot(dataCaptor.capture(), any(), any())



            assertThat(dataCaptor.value.displayId).isEqualTo(Display.DEFAULT_DISPLAY)

            assertThat(dataCaptor.lastValue.displayId).isEqualTo(Display.DEFAULT_DISPLAY)



            screenshotExecutor.onDestroy()

        }
@@ -483,9 +483,9 @@ class TakeScreenshotExecutorTest : SysuiTestCase() { 
            assertThat(requestProcessor.processed)

                .isEqualTo(ScreenshotData.fromRequest(screenshotRequest))



            val capturer = ArgumentCaptor<ScreenshotData>()

            val capturer = argumentCaptor<ScreenshotData>()

            verify(controller).handleScreenshot(capturer.capture(), any(), any())

            assertThat(capturer.value).isEqualTo(toBeReturnedByProcessor)

            assertThat(capturer.lastValue).isEqualTo(toBeReturnedByProcessor)



            screenshotExecutor.onDestroy()

        }