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

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

Merge "Enable app launch test: "app replaces wallpaper""

parents 7e97d567 f04b8748

tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppColdTest.java

+5 −18
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ package com.android.server.wm.flicker; 
import static com.android.server.wm.flicker.CommonTransitions.openAppCold;

import static com.android.server.wm.flicker.WmTraceSubject.assertThat;



import android.view.Surface;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.FlakyTest;

import androidx.test.filters.LargeTest;
@@ -75,23 +73,12 @@ public class OpenAppColdTest extends NonRotationTestBase { 
                .forAllEntries());

    }



    @Ignore("Flaky. Pending debug")

    @Test

    public void checkVisibility_wallpaperLayerBecomesInvisible() {

        if (mBeginRotation == Surface.ROTATION_0) {

        checkResults(result -> LayersTraceSubject.assertThat(result)

                .showsLayer("Wallpaper")

                .then()

                .replaceVisibleLayer("Wallpaper", mTestApp.getPackage())

                .forAllEntries());

        } else {

            checkResults(result -> LayersTraceSubject.assertThat(result)

                    .showsLayer("Wallpaper")

                    .then()

                    .replaceVisibleLayer("Wallpaper", SCREENSHOT_LAYER)

                    .then()

                    .showsLayer(mTestApp.getPackage())

                    .forAllEntries());

        }

    }

}

tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppWarmTest.java

+5 −18
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ package com.android.server.wm.flicker; 
import static com.android.server.wm.flicker.CommonTransitions.openAppWarm;

import static com.android.server.wm.flicker.WmTraceSubject.assertThat;



import android.view.Surface;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.FlakyTest;

import androidx.test.filters.LargeTest;
@@ -75,23 +73,12 @@ public class OpenAppWarmTest extends NonRotationTestBase { 
                .forAllEntries());

    }



    @Ignore("Flaky. Pending debug")

    @Test

    public void checkVisibility_wallpaperLayerBecomesInvisible() {

        if (mBeginRotation == Surface.ROTATION_0) {

        checkResults(result -> LayersTraceSubject.assertThat(result)

                .showsLayer("Wallpaper")

                .then()

                .replaceVisibleLayer("Wallpaper", mTestApp.getPackage())

                .forAllEntries());

        } else {

            checkResults(result -> LayersTraceSubject.assertThat(result)

                    .showsLayer("Wallpaper")

                    .then()

                    .replaceVisibleLayer("Wallpaper", SCREENSHOT_LAYER)

                    .then()

                    .showsLayer(mTestApp.getPackage())

                    .forAllEntries());

        }

    }

}