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

Commit e8365006 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Ignore failing tests of com.android.settings.wallpaper" into main

parents 5fcecbb7 82b6f8fd

tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ import android.os.Handler; 
import com.android.settings.FallbackHome;

import com.android.settings.FallbackHome;





import org.junit.Before;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;

import org.mockito.MockitoAnnotations;

import org.mockito.MockitoAnnotations;
@@ -64,6 +65,7 @@ public class FallbackHomeActivityTest { 
        mController = Robolectric.buildActivity(FallbackHome.class);

        mController = Robolectric.buildActivity(FallbackHome.class);

    }

    }





    @Ignore("b/315124270")

    @Test

    @Test

    @Config(shadows = ShadowWallpaperManager.class)

    @Config(shadows = ShadowWallpaperManager.class)

    public void wallpaperColorsChangedListener_ensured_removed() {

    public void wallpaperColorsChangedListener_ensured_removed() {

tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ import com.google.android.setupcompat.util.WizardManagerHelper; 




import org.junit.After;

import org.junit.After;

import org.junit.Before;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.Mock;
@@ -100,6 +101,7 @@ public class WallpaperSuggestionActivityTest { 
                .isTrue();

                .isTrue();

    }

    }





    @Ignore("b/315124270")

    @Test

    @Test

    public void addExtras_intentFromSetupWizard_extrasHasWallpaperOnlyAndLaunchedSuw() {

    public void addExtras_intentFromSetupWizard_extrasHasWallpaperOnlyAndLaunchedSuw() {

        WallpaperSuggestionActivity activity =

        WallpaperSuggestionActivity activity =
@@ -117,6 +119,7 @@ public class WallpaperSuggestionActivityTest { 
                .isEqualTo("app_launched_suw");

                .isEqualTo("app_launched_suw");

    }

    }





    @Ignore("b/315124270")

    @Test

    @Test

    public void addExtras_intentNotFromSetupWizard_extrasHasFocusWallpaper() {

    public void addExtras_intentNotFromSetupWizard_extrasHasFocusWallpaper() {

        WallpaperSuggestionActivity activity = Robolectric.buildActivity(

        WallpaperSuggestionActivity activity = Robolectric.buildActivity(

tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ import androidx.preference.Preference; 
import com.android.settings.core.BasePreferenceController;

import com.android.settings.core.BasePreferenceController;





import org.junit.Before;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;

import org.mockito.MockitoAnnotations;

import org.mockito.MockitoAnnotations;
@@ -50,12 +51,14 @@ public class WallpaperTypePreferenceControllerTest { 
        mPreference = new Preference(mContext);

        mPreference = new Preference(mContext);

    }

    }





    @Ignore("b/315124270")

    @Test

    @Test

    public void getAvailabilityStatus_byDefault_shouldBeShown() {

    public void getAvailabilityStatus_byDefault_shouldBeShown() {

        assertThat(mController.getAvailabilityStatus())

        assertThat(mController.getAvailabilityStatus())

                .isEqualTo(BasePreferenceController.AVAILABLE);

                .isEqualTo(BasePreferenceController.AVAILABLE);

    }

    }





    @Ignore("b/315124270")

    @Test

    @Test

    public void testHandlePreferenceTreeClick_intentNull_shouldDoNothing() {

    public void testHandlePreferenceTreeClick_intentNull_shouldDoNothing() {

        mPreference.setIntent(null);

        mPreference.setIntent(null);
@@ -65,6 +68,7 @@ public class WallpaperTypePreferenceControllerTest { 
        assertThat(handled).isFalse();

        assertThat(handled).isFalse();

    }

    }





    @Ignore("b/315124270")

    @Test

    @Test

    public void testHandlePreferenceTreeClick_shouldLaunchIntent() {

    public void testHandlePreferenceTreeClick_shouldLaunchIntent() {

        mPreference.setIntent(mIntent);

        mPreference.setIntent(mIntent);