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

Commit 119015d3 authored by Matthew Reynolds's avatar Matthew Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Fixed runners for MultivalentTests" into main

parents a0406c63 70d34bdf

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/composefragment/viewmodel/AbstractQSFragmentComposeViewModelTest.kt

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.qs.composefragment.viewmodel 
import androidx.lifecycle.Lifecycle

import androidx.lifecycle.lifecycleScope

import androidx.lifecycle.testing.TestLifecycleOwner

import androidx.test.ext.junit.runners.AndroidJUnit4

import com.android.systemui.SysuiTestCase

import com.android.systemui.kosmos.testDispatcher

import com.android.systemui.kosmos.testScope
@@ -33,7 +34,9 @@ import kotlinx.coroutines.test.runTest 
import kotlinx.coroutines.test.setMain

import org.junit.After

import org.junit.Before

import org.junit.runner.RunWith



@RunWith(AndroidJUnit4::class)

@OptIn(ExperimentalCoroutinesApi::class)

abstract class AbstractQSFragmentComposeViewModelTest : SysuiTestCase() {

    protected val kosmos = testKosmos()

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

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.systemui.screenshot



import android.testing.AndroidTestingRunner

import androidx.test.ext.junit.runners.AndroidJUnit4

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.screenshot.data.repository.profileTypeRepository

import com.android.systemui.screenshot.policy.TestUserIds
@@ -30,7 +30,7 @@ import org.junit.Test 
import org.junit.runner.RunWith

import org.mockito.Mockito.mock



@RunWith(AndroidTestingRunner::class)

@RunWith(AndroidJUnit4::class)

class AnnouncementResolverTest {

    private val kosmos = Kosmos()

packages/SystemUI/multivalentTests/src/com/android/systemui/screenshot/scroll/ScrollCaptureFrameworkSmokeTest.java

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static org.junit.Assert.fail; 


import android.content.Intent;

import android.os.RemoteException;

import android.testing.AndroidTestingRunner;

import android.util.Log;

import android.view.Display;

import android.view.IScrollCaptureResponseListener;
@@ -30,6 +29,7 @@ import android.view.IWindowManager; 
import android.view.ScrollCaptureResponse;

import android.view.WindowManagerGlobal;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;

import androidx.test.platform.app.InstrumentationRegistry;
@@ -45,7 +45,7 @@ import java.util.concurrent.TimeUnit; 
/**

 * Tests the of internal framework Scroll Capture API from SystemUI.

 */

@RunWith(AndroidTestingRunner.class)

@RunWith(AndroidJUnit4.class)

@SmallTest

@Ignore

public class ScrollCaptureFrameworkSmokeTest extends SysuiTestCase {

packages/SystemUI/multivalentTests/src/com/android/systemui/settings/brightness/BrightnessSliderControllerTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 


package com.android.systemui.settings.brightness



import android.testing.AndroidTestingRunner

import android.view.MotionEvent

import android.widget.SeekBar

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.internal.logging.testing.UiEventLoggerFake

import com.android.settingslib.RestrictedLockUtils
@@ -52,7 +52,7 @@ import org.mockito.Mockito.`when` as whenever 
import org.mockito.MockitoAnnotations



@SmallTest

@RunWith(AndroidTestingRunner::class)

@RunWith(AndroidJUnit4::class)

class BrightnessSliderControllerTest : SysuiTestCase() {



    @Mock private lateinit var brightnessSliderView: BrightnessSliderView

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/call/domain/interactor/CallChipInteractorTest.kt

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.statusbar.chips.call.domain.interactor



import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectLastValue
@@ -27,8 +28,10 @@ import com.android.systemui.statusbar.phone.ongoingcall.shared.model.inCallModel 
import com.google.common.truth.Truth.assertThat

import kotlin.test.Test

import kotlinx.coroutines.test.runTest

import org.junit.runner.RunWith



@SmallTest

@RunWith(AndroidJUnit4::class)

class CallChipInteractorTest : SysuiTestCase() {

    val kosmos = Kosmos()

    val repo = kosmos.ongoingCallRepository