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

Commit a5a63480 authored by Liran Binyamin's avatar Liran Binyamin
Browse files

Clean up java mockito api from kotlin tests 

Change-Id: I3126e72565576989f298c54402d31a0d149d091c
Flag: EXEMPT test clean up
Bug: 281083629
Test: treehugger
parent b04e0f11

libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleControllerBubbleBarTest.kt

+1 −2
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ import org.junit.Before 
import org.junit.Rule

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mockito

import org.mockito.kotlin.mock

import org.mockito.kotlin.whenever

import java.util.Optional
@@ -133,7 +132,7 @@ class BubbleControllerBubbleBarTest { 
                mainExecutor,

                bgExecutor,

            )

        bubbleController.asBubbles().setSysuiProxy(Mockito.mock(SysuiProxy::class.java))

        bubbleController.asBubbles().setSysuiProxy(mock<SysuiProxy>())



        shellInit.init()

libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleStackViewTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -50,10 +50,10 @@ import org.junit.Before 
import org.junit.Rule

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mockito

import org.mockito.kotlin.any

import org.mockito.kotlin.mock

import org.mockito.kotlin.never

import org.mockito.kotlin.spy

import org.mockito.kotlin.verify

import java.util.concurrent.Semaphore

import java.util.concurrent.TimeUnit
@@ -635,7 +635,7 @@ class BubbleStackViewTest { 


    @Test

    fun removeFromWindow_stopMonitoringSwipeUpGesture() {

        bubbleStackView = Mockito.spy(bubbleStackView)

        bubbleStackView = spy(bubbleStackView)

        InstrumentationRegistry.getInstrumentation().runOnMainSync {

            // No way to add to window in the test environment right now so just pretend

            bubbleStackView.onDetachedFromWindow()

libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/UiEventSubjectTest.kt

+6 −5
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ import com.google.common.truth.Truth.assertThat 
import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mockito.mock

import org.mockito.kotlin.doReturn

import org.mockito.kotlin.mock

import org.mockito.kotlin.whenever



/** Test for [UiEventSubject] */
@@ -130,10 +131,10 @@ class UiEventSubjectTest { 
    }



    private fun createBubble(appUid: Int, packageName: String, instanceId: InstanceId): Bubble {

        return mock(Bubble::class.java).apply {

            whenever(getAppUid()).thenReturn(appUid)

            whenever(getPackageName()).thenReturn(packageName)

            whenever(getInstanceId()).thenReturn(instanceId)

        return mock<Bubble>() {

            on { getAppUid() } doReturn appUid

            on { getPackageName() } doReturn packageName

            on { getInstanceId() } doReturn instanceId

        }

    }

libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerViewTest.kt

+1 −2
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ import org.junit.Before 
import org.junit.Rule

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mockito.mock

import org.mockito.kotlin.mock

import org.mockito.kotlin.whenever
@@ -127,7 +126,7 @@ class BubbleBarLayerViewTest { 
                mainExecutor,

                bgExecutor,

            )

        bubbleController.asBubbles().setSysuiProxy(mock(SysuiProxy::class.java))

        bubbleController.asBubbles().setSysuiProxy(mock<SysuiProxy>())

        // Flush so that proxy gets set

        mainExecutor.flushAll()