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

Commit 407560fd authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Move ComposeContentTestRuleExt to SpaLibTestUtils"

parents 2a1f7cb4 3d10bebe

tests/spa_unit/Android.bp

+1 −3
Original line number Diff line number Diff line
@@ -30,13 +30,11 @@ android_test { 


    static_libs: [

        "Settings-core",

        "SpaLibTestUtils",

        "androidx.compose.runtime_runtime",

        "androidx.compose.ui_ui-test-junit4",

        "androidx.compose.ui_ui-test-manifest",

        "androidx.test.ext.junit",

        "androidx.test.runner",

        "mockito-target-extended-minus-junit4",

        "truth-prebuilt",

    ],

    jni_libs: [

        "libdexmakerjvmtiagent",

tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppButtonsTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ import androidx.compose.ui.test.onRoot 
import androidx.test.core.app.ApplicationProvider

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

import com.android.dx.mockito.inline.extended.ExtendedMockito

import com.android.settings.testutils.delay

import com.android.settingslib.applications.AppUtils

import com.android.settingslib.spa.testutils.delay

import kotlinx.coroutines.flow.flowOf

import kotlinx.coroutines.flow.stateIn

import org.junit.After

tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppDataUsagePreferenceTest.kt

+2 −5
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import androidx.compose.ui.test.junit4.createComposeRule 
import androidx.compose.ui.test.onNodeWithText

import androidx.compose.ui.test.onRoot

import androidx.compose.ui.test.performClick

import androidx.compose.ui.test.printToLog

import androidx.test.core.app.ApplicationProvider

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

import com.android.dx.mockito.inline.extended.ExtendedMockito
@@ -39,9 +38,9 @@ import com.android.settings.R 
import com.android.settings.Utils

import com.android.settings.applications.appinfo.AppInfoDashboardFragment

import com.android.settings.datausage.AppDataUsage

import com.android.settings.testutils.waitUntilExists

import com.android.settingslib.net.NetworkCycleDataForUid

import com.android.settingslib.net.NetworkCycleDataForUidLoader

import com.android.settingslib.spa.testutils.waitUntilExists

import org.junit.After

import org.junit.Before

import org.junit.Rule
@@ -134,9 +133,7 @@ class AppDataUsagePreferenceTest { 


        setContent()



        composeTestRule.onRoot().printToLog("AAA")

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

            .assertIsDisplayed()

        composeTestRule.waitUntilExists(hasText(context.getString(R.string.no_data_usage)))

    }



    @Test

tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppDisableButtonTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ class AppDisableButtonTest { 
    private lateinit var devicePolicyManager: DevicePolicyManager



    private val fakeFeatureFactory = FakeFeatureFactory()

    private val appFeatureProvider = fakeFeatureFactory.applicationFeatureProvider

    private val appFeatureProvider = fakeFeatureFactory.mockApplicationFeatureProvider



    private lateinit var appDisableButton: AppDisableButton

tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppInstallerInfoPreferenceTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ import com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession 
import com.android.settings.R

import com.android.settings.Utils

import com.android.settings.applications.AppStoreUtil

import com.android.settings.testutils.waitUntilExists

import com.android.settingslib.applications.AppUtils

import com.android.settingslib.spa.testutils.waitUntilExists

import com.android.settingslib.spaprivileged.framework.common.userManager

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

import org.junit.After