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

Commit e1e977d4 authored by Wes Okuhara's avatar Wes Okuhara Committed by Android (Google) Code Review
Browse files

Merge "Desktop screenshots: Update mockito-kotlin argument captor" into main

parents 12e70e96 f0024944

packages/SystemUI/tests/src/com/android/systemui/screencapture/record/largescreen/domain/interactor/ScreenshotInteractorTest.kt

+5 −5
Original line number Diff line number Diff line
@@ -35,12 +35,11 @@ import kotlinx.coroutines.test.runTest 
import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.ArgumentCaptor

import org.mockito.ArgumentMatchers.isNull

import org.mockito.Captor

import org.mockito.Mock

import org.mockito.MockitoAnnotations

import org.mockito.kotlin.any

import org.mockito.kotlin.argumentCaptor

import org.mockito.kotlin.eq

import org.mockito.kotlin.times

import org.mockito.kotlin.verify
@@ -53,7 +52,6 @@ class ScreenshotInteractorTest : SysuiTestCase() { 
    private val testScope = kosmos.testScope



    @Mock private lateinit var mockBitmap: Bitmap

    @Captor private lateinit var screenshotRequestCaptor: ArgumentCaptor<ScreenshotRequest>



    private val interactor: ScreenshotInteractor by lazy { kosmos.screenshotInteractor }
@@ -68,10 +66,11 @@ class ScreenshotInteractorTest : SysuiTestCase() { 
            val displayId = 3

            interactor.takeFullscreenScreenshot(displayId)



            val screenshotRequestCaptor = argumentCaptor<ScreenshotRequest>()

            verify(kosmos.mockScreenshotHelper, times(1))

                .takeScreenshot(screenshotRequestCaptor.capture(), any(), isNull())



            val capturedRequest = screenshotRequestCaptor.value

            val capturedRequest = screenshotRequestCaptor.lastValue

            assertThat(capturedRequest.type).isEqualTo(WindowManager.TAKE_SCREENSHOT_FULLSCREEN)

            assertThat(capturedRequest.source)

                .isEqualTo(WindowManager.ScreenshotSource.SCREENSHOT_SCREEN_CAPTURE_UI)
@@ -88,11 +87,12 @@ class ScreenshotInteractorTest : SysuiTestCase() { 


            interactor.takePartialScreenshot(bounds)



            val screenshotRequestCaptor = argumentCaptor<ScreenshotRequest>()

            verify(kosmos.mockImageCapture, times(1)).captureDisplay(any(), eq(bounds))

            verify(kosmos.mockScreenshotHelper, times(1))

                .takeScreenshot(screenshotRequestCaptor.capture(), any(), isNull())



            val capturedRequest = screenshotRequestCaptor.value

            val capturedRequest = screenshotRequestCaptor.lastValue

            assertThat(capturedRequest.type).isEqualTo(WindowManager.TAKE_SCREENSHOT_PROVIDED_IMAGE)

            assertThat(capturedRequest.source)

                .isEqualTo(WindowManager.ScreenshotSource.SCREENSHOT_SCREEN_CAPTURE_UI)

packages/SystemUI/tests/src/com/android/systemui/screencapture/record/largescreen/ui/viewmodel/PreCaptureViewModelTest.kt

+5 −5
Original line number Diff line number Diff line
@@ -39,12 +39,11 @@ import kotlinx.coroutines.test.runTest 
import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.ArgumentCaptor

import org.mockito.ArgumentMatchers.isNull

import org.mockito.Captor

import org.mockito.Mock

import org.mockito.MockitoAnnotations

import org.mockito.kotlin.any

import org.mockito.kotlin.argumentCaptor

import org.mockito.kotlin.eq

import org.mockito.kotlin.times

import org.mockito.kotlin.verify
@@ -57,7 +56,6 @@ class PreCaptureViewModelTest : SysuiTestCase() { 
    private val testScope = kosmos.testScope



    @Mock private lateinit var mockBitmap: Bitmap

    @Captor private lateinit var screenshotRequestCaptor: ArgumentCaptor<ScreenshotRequest>

    private val viewModel: PreCaptureViewModel by lazy { kosmos.preCaptureViewModel }



    @Before
@@ -179,10 +177,11 @@ class PreCaptureViewModelTest : SysuiTestCase() { 


            viewModel.takeFullscreenScreenshot()



            val screenshotRequestCaptor = argumentCaptor<ScreenshotRequest>()

            verify(kosmos.mockScreenshotHelper, times(1))

                .takeScreenshot(screenshotRequestCaptor.capture(), any(), isNull())



            val capturedRequest = screenshotRequestCaptor.value

            val capturedRequest = screenshotRequestCaptor.lastValue

            assertThat(capturedRequest.type).isEqualTo(WindowManager.TAKE_SCREENSHOT_FULLSCREEN)

            assertThat(capturedRequest.source)

                .isEqualTo(WindowManager.ScreenshotSource.SCREENSHOT_SCREEN_CAPTURE_UI)
@@ -225,9 +224,10 @@ class PreCaptureViewModelTest : SysuiTestCase() { 


            viewModel.takePartialScreenshot()



            val screenshotRequestCaptor = argumentCaptor<ScreenshotRequest>()

            verify(kosmos.mockScreenshotHelper, times(1))

                .takeScreenshot(screenshotRequestCaptor.capture(), any(), isNull())

            val capturedRequest = screenshotRequestCaptor.value

            val capturedRequest = screenshotRequestCaptor.lastValue

            assertThat(capturedRequest.type).isEqualTo(WindowManager.TAKE_SCREENSHOT_PROVIDED_IMAGE)

            assertThat(capturedRequest.bitmap).isEqualTo(mockBitmap)

            assertThat(capturedRequest.boundsInScreen).isEqualTo(regionBox)