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

Commit ebb124d2 authored by Julia Tuttle's avatar Julia Tuttle Committed by Android (Google) Code Review
Browse files

Merge "Remove ExperimentalCoroutinesApi opt-ins from tests/src/" into main

parents 5b03b115 36a18af5

packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorParameterizedTest.kt

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ import platform.test.runner.parameterized.Parameters 


@SmallTest

@RunWith(ParameterizedAndroidJunit4::class)

@kotlinx.coroutines.ExperimentalCoroutinesApi

class KeyboardTouchpadEduInteractorParameterizedTest(private val gestureType: GestureType) :

    SysuiTestCase() {

    private val kosmos = testKosmos()

packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorTest.kt

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ import org.mockito.kotlin.verify 


@SmallTest

@RunWith(AndroidJUnit4::class)

@kotlinx.coroutines.ExperimentalCoroutinesApi

class KeyboardTouchpadEduInteractorTest : SysuiTestCase() {

    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope

packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ import org.mockito.kotlin.clearInvocations 


@RunWith(AndroidJUnit4::class)

@SmallTest

@OptIn(kotlinx.coroutines.ExperimentalCoroutinesApi::class)

class ClockEventControllerTest : SysuiTestCase() {



    private val kosmos = testKosmos()

packages/SystemUI/tests/src/com/android/systemui/accessibility/data/repository/AccessibilityQsShortcutsRepositoryImplForDeviceTest.kt

+0 −2
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import com.android.systemui.util.mockito.whenever 
import com.android.systemui.util.settings.FakeSettings

import com.android.systemui.utils.FieldSetter

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

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.StandardTestDispatcher

import kotlinx.coroutines.test.TestScope

import kotlinx.coroutines.test.runCurrent
@@ -55,7 +54,6 @@ import org.mockito.junit.MockitoRule 
 * can't mock the AccessibilityShortcutInfo for test. MultiValentTest doesn't compile when using

 * newly introduced methods and constants.

 */

@OptIn(ExperimentalCoroutinesApi::class)

@SmallTest

@RunWith(AndroidJUnit4::class)

class AccessibilityQsShortcutsRepositoryImplForDeviceTest : SysuiTestCase() {

packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerOverlayTest.kt

+0 −2
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ import com.android.systemui.testKosmos 
import com.android.systemui.user.domain.interactor.SelectedUserInteractor

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

import dagger.Lazy

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.TestScope

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest
@@ -89,7 +88,6 @@ private const val DISPLAY_HEIGHT = 1920 
private const val SENSOR_WIDTH = 30

private const val SENSOR_HEIGHT = 60



@ExperimentalCoroutinesApi

@SmallTest

@RunWith(AndroidJUnit4::class)

@RunWithLooper(setAsMainLooper = true)