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

Commit febc63f9 authored by Fan Wu's avatar Fan Wu Committed by Android (Google) Code Review
Browse files

Merge "Ignore failing tests in MainlineModuleVersionPreferenceControllerTest" into main

parents 8579dec1 950a30c8
Loading
Loading
Loading
Loading
+5 −0
Original line number Original line Diff line number Diff line
@@ -40,6 +40,7 @@ import android.platform.test.flag.junit.DeviceFlagsValueProvider;
import androidx.preference.Preference;
import androidx.preference.Preference;


import org.junit.Before;
import org.junit.Before;
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;
@@ -114,6 +115,7 @@ public class MainlineModuleVersionPreferenceControllerTest {
        assertThat(controller.getAvailabilityStatus()).isEqualTo(AVAILABLE);
        assertThat(controller.getAvailabilityStatus()).isEqualTo(AVAILABLE);
    }
    }


    @Ignore("b/313567396")
    @Test
    @Test
    public void updateState_canHandleV2Intent_setIntentToPreference() throws Exception {
    public void updateState_canHandleV2Intent_setIntentToPreference() throws Exception {
        setupModulePackage("test version 123");
        setupModulePackage("test version 123");
@@ -127,6 +129,7 @@ public class MainlineModuleVersionPreferenceControllerTest {
        assertThat(mPreference.getIntent()).isEqualTo(MODULE_UPDATE_V2_INTENT);
        assertThat(mPreference.getIntent()).isEqualTo(MODULE_UPDATE_V2_INTENT);
    }
    }


    @Ignore("b/313567396")
    @Test
    @Test
    public void updateState_canHandleV2Intent_preferenceShouldBeSelectable() throws Exception {
    public void updateState_canHandleV2Intent_preferenceShouldBeSelectable() throws Exception {
        setupModulePackage("test version 123");
        setupModulePackage("test version 123");
@@ -140,6 +143,7 @@ public class MainlineModuleVersionPreferenceControllerTest {
        assertThat(mPreference.isSelectable()).isTrue();
        assertThat(mPreference.isSelectable()).isTrue();
    }
    }


    @Ignore("b/313567396")
    @RequiresFlagsEnabled(com.android.settings.flags.Flags.FLAG_MAINLINE_MODULE_EXPLICIT_INTENT)
    @RequiresFlagsEnabled(com.android.settings.flags.Flags.FLAG_MAINLINE_MODULE_EXPLICIT_INTENT)
    @Test
    @Test
    public void updateState_canHandleIntent_setIntentToPreference() throws Exception {
    public void updateState_canHandleIntent_setIntentToPreference() throws Exception {
@@ -155,6 +159,7 @@ public class MainlineModuleVersionPreferenceControllerTest {
        assertThat(mPreference.getIntent()).isEqualTo(MODULE_UPDATE_INTENT);
        assertThat(mPreference.getIntent()).isEqualTo(MODULE_UPDATE_INTENT);
    }
    }


    @Ignore("b/313567396")
    @RequiresFlagsEnabled(com.android.settings.flags.Flags.FLAG_MAINLINE_MODULE_EXPLICIT_INTENT)
    @RequiresFlagsEnabled(com.android.settings.flags.Flags.FLAG_MAINLINE_MODULE_EXPLICIT_INTENT)
    @Test
    @Test
    public void updateState_canHandleIntent_preferenceShouldBeSelectable() throws Exception {
    public void updateState_canHandleIntent_preferenceShouldBeSelectable() throws Exception {