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

Commit 501bc728 authored by SongFerng Wang's avatar SongFerng Wang Committed by Android (Google) Code Review
Browse files

Merge "Add the awaitIdle" into main

parents 96f76c33 0fae9c34
Loading
Loading
Loading
Loading
+2 −0
Original line number Original line Diff line number Diff line
@@ -39,6 +39,7 @@ import com.android.settings.R
import com.android.settings.network.SimOnboardingService
import com.android.settings.network.SimOnboardingService
import com.android.settingslib.spa.testutils.waitUntilExists
import com.android.settingslib.spa.testutils.waitUntilExists
import org.junit.Assert.assertEquals
import org.junit.Assert.assertEquals
import org.junit.Ignore
import org.junit.Rule
import org.junit.Rule
import org.junit.Test
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runner.RunWith
@@ -129,6 +130,7 @@ class SimOnboardingLabelSimTest {
    }
    }


    @Test
    @Test
    @Ignore
    fun simOnboardingLabelSimImpl_showItem_show3Items() {
    fun simOnboardingLabelSimImpl_showItem_show3Items() {
        preSetupContent()
        preSetupContent()


+2 −3
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.settings.R
import com.android.settings.R
import com.android.settings.network.SimOnboardingService
import com.android.settings.network.SimOnboardingService
import com.android.settingslib.spa.testutils.waitUntilExists
import com.android.settingslib.spa.testutils.waitUntilExists
import org.junit.Ignore
import org.junit.Rule
import org.junit.Rule
import org.junit.Test
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runner.RunWith
@@ -142,6 +143,7 @@ class SimOnboardingSelectSimTest {
    }
    }


    @Test
    @Test
    @Ignore
    fun simOnboardingSelectSimImpl_showItem_show3Items() {
    fun simOnboardingSelectSimImpl_showItem_show3Items() {
        mockSimOnboardingService.stub {
        mockSimOnboardingService.stub {
            on { targetSubId }.doReturn(SUB_ID_1)
            on { targetSubId }.doReturn(SUB_ID_1)
@@ -168,9 +170,6 @@ class SimOnboardingSelectSimTest {
                SimOnboardingSelectSimImpl(nextAction, cancelAction, mockSimOnboardingService)
                SimOnboardingSelectSimImpl(nextAction, cancelAction, mockSimOnboardingService)
            }
            }
        }
        }
//        composeTestRule.setContent {
//            SimOnboardingSelectSimImpl(nextAction, cancelAction, mockSimOnboardingService)
//        }


        composeTestRule.onNodeWithText(DISPLAY_NAME_1).assertIsDisplayed()
        composeTestRule.onNodeWithText(DISPLAY_NAME_1).assertIsDisplayed()
        composeTestRule.waitUntilExists(hasText(NUMBER_1))
        composeTestRule.waitUntilExists(hasText(NUMBER_1))