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

Commit b0b710f1 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Clean up @OptIn(ExperimentalCoroutinesApi::class) 

After runTest get stable.

Bug: 285231003
Test: unit test
Change-Id: I200ba979727b900380b107bd82e1d0e43ab1d994
parent eeba25e2

tests/spa_unit/src/com/android/settings/applications/specialaccess/DataSaverControllerTest.kt

+0 −2
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import com.android.settings.core.BasePreferenceController.AVAILABLE 
import com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE

import com.android.settingslib.spaprivileged.model.app.AppListRepository

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

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.flowOf

import kotlinx.coroutines.test.runTest
@@ -43,7 +42,6 @@ import org.mockito.junit.MockitoJUnit 
import org.mockito.junit.MockitoRule

import org.mockito.Mockito.`when` as whenever



@OptIn(ExperimentalCoroutinesApi::class)

@RunWith(AndroidJUnit4::class)

class DataSaverControllerTest {

    @get:Rule

tests/spa_unit/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.kt

+0 −2
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import com.android.settingslib.net.DataUsageController 
import com.android.settingslib.net.DataUsageController.DataUsageInfo

import com.android.settingslib.spa.testutils.waitUntil

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

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.runTest

import org.junit.After

import org.junit.Before
@@ -53,7 +52,6 @@ import org.mockito.Spy 
import org.mockito.quality.Strictness

import org.mockito.Mockito.`when` as whenever



@OptIn(ExperimentalCoroutinesApi::class)

@RunWith(AndroidJUnit4::class)

class DataUsagePreferenceControllerTest {

tests/spa_unit/src/com/android/settings/network/telephony/TelephonyStatusControlSessionTest.kt

+0 −2
Original line number Diff line number Diff line
@@ -23,12 +23,10 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 
import com.android.settings.core.BasePreferenceController

import com.android.settingslib.spa.testutils.waitUntil

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

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.runTest

import org.junit.Test

import org.junit.runner.RunWith



@OptIn(ExperimentalCoroutinesApi::class)

@RunWith(AndroidJUnit4::class)

class TelephonyStatusControlSessionTest {

    private val context: Context = ApplicationProvider.getApplicationContext()

tests/spa_unit/src/com/android/settings/spa/app/AllAppListTest.kt

+0 −2
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import com.android.settingslib.spa.testutils.firstWithTimeoutOrNull 
import com.android.settingslib.spaprivileged.template.app.AppListInput

import com.android.settingslib.spaprivileged.template.app.AppListItemModel

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

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.flowOf

import kotlinx.coroutines.test.runTest

import org.junit.Rule
@@ -118,7 +117,6 @@ class AllAppListTest { 
            .isEqualTo("AppInfoSettings/package.name/0")

    }



    @OptIn(ExperimentalCoroutinesApi::class)

    @Test

    fun allAppListModel_transform() = runTest {

        val listModel = AllAppListModel(context) { stateOf(SUMMARY) }

tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProviderTest.kt

+4 −5
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import com.android.settingslib.spa.testutils.FakeNavControllerWrapper 
import com.android.settingslib.spa.testutils.firstWithTimeoutOrNull

import com.android.settingslib.spaprivileged.template.app.AppListItemModel

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

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.flowOf

import kotlinx.coroutines.test.runTest

import org.junit.Rule
@@ -67,14 +66,16 @@ class UserAspectRatioAppsPageProviderTest { 
    @Test

    fun injectEntry_summary() {

        setInjectEntry()

        composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_summary, Build.MODEL))

        composeTestRule

            .onNodeWithText(context.getString(R.string.aspect_ratio_summary, Build.MODEL))

            .assertIsDisplayed()

    }



    @Test

    fun injectEntry_onClick_navigate() {

        setInjectEntry()

        composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_title)).performClick()

        composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_title))

            .performClick()

        assertThat(fakeNavControllerWrapper.navigateCalledWith).isEqualTo("UserAspectRatioAppsPage")

    }
@@ -103,7 +104,6 @@ class UserAspectRatioAppsPageProviderTest { 
        composeTestRule.onNodeWithText(LABEL).assertIsDisplayed()

    }



    @OptIn(ExperimentalCoroutinesApi::class)

    @Test

    fun aspectRatioAppListModel_transform() = runTest {

        val listModel = UserAspectRatioAppListModel(context)
@@ -114,7 +114,6 @@ class UserAspectRatioAppsPageProviderTest { 
        assertThat(recordList[0].app).isSameInstanceAs(APP)

    }



    @OptIn(ExperimentalCoroutinesApi::class)

    @Test

    fun aspectRatioAppListModel_filter() = runTest {

        val listModel = UserAspectRatioAppListModel(context)