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

Commit 2c37d7a5 authored by Pablo Gamito's avatar Pablo Gamito Committed by Android (Google) Code Review
Browse files

Merge "Remove fass assertions from tests"

parents de1ab851 b85d6f1a

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipTest.kt

+0 −18
Original line number Diff line number Diff line
@@ -71,24 +71,6 @@ class EnterPipTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) { 
            }

        }



    @FlakyTest

    @Test

    fun runPresubmitAssertion() {

        flickerRule.checkPresubmitAssertions()

    }



    @FlakyTest

    @Test

    fun runPostsubmitAssertion() {

        flickerRule.checkPostsubmitAssertions()

    }



    @FlakyTest

    @Test

    fun runFlakyAssertion() {

        flickerRule.checkFlakyAssertions()

    }



    /** {@inheritDoc}  */

    @FlakyTest(bugId = 206753786)

    @Test

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaIntentTest.kt

+0 −18
Original line number Diff line number Diff line
@@ -78,24 +78,6 @@ class ExitPipViaIntentTest(testSpec: FlickerTestParameter) : ExitPipToAppTransit 
            }

        }



    @FlakyTest

    @Test

    fun runPresubmitAssertion() {

        flickerRule.checkPresubmitAssertions()

    }



    @FlakyTest

    @Test

    fun runPostsubmitAssertion() {

        flickerRule.checkPostsubmitAssertions()

    }



    @FlakyTest

    @Test

    fun runFlakyAssertion() {

        flickerRule.checkFlakyAssertions()

    }



    /** {@inheritDoc}  */

    @FlakyTest(bugId = 206753786)

    @Test

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipWithDismissButtonTest.kt

+1 −19
Original line number Diff line number Diff line
@@ -67,24 +67,6 @@ class ExitPipWithDismissButtonTest(testSpec: FlickerTestParameter) : ExitPipTran 
            }

        }



    @FlakyTest

    @Test

    fun runPresubmitAssertion() {

        flickerRule.checkPresubmitAssertions()

    }



    @FlakyTest

    @Test

    fun runPostsubmitAssertion() {

        flickerRule.checkPostsubmitAssertions()

    }



    @FlakyTest

    @Test

    fun runFlakyAssertion() {

        flickerRule.checkFlakyAssertions()

    }



    /** {@inheritDoc}  */

    @FlakyTest(bugId = 206753786)

    @Test

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppTransition.kt

+1 −20
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.server.wm.flicker.close 


import android.app.Instrumentation

import android.platform.test.annotations.Presubmit

import androidx.test.filters.FlakyTest

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.FlickerBuilderProvider

import com.android.server.wm.flicker.FlickerTestParameter
@@ -194,22 +193,4 @@ abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter) 
    open fun launcherLayerReplacesApp() {

        testSpec.replacesLayer(testApp.component, LAUNCHER_COMPONENT)

    }



    @FlakyTest

    @Test

    fun runPresubmitAssertion() {

        flickerRule.checkPresubmitAssertions()

    }



    @FlakyTest

    @Test

    fun runPostsubmitAssertion() {

        flickerRule.checkPostsubmitAssertions()

    }



    @FlakyTest

    @Test

    fun runFlakyAssertion() {

        flickerRule.checkFlakyAssertions()

    }

}

tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt

+1 −19
Original line number Diff line number Diff line
@@ -96,24 +96,6 @@ class ChangeAppRotationTest( 
            }

        }



    @FlakyTest

    @Test

    fun runPresubmitAssertion() {

        flickerRule.checkPresubmitAssertions()

    }



    @FlakyTest

    @Test

    fun runPostsubmitAssertion() {

        flickerRule.checkPostsubmitAssertions()

    }



    @FlakyTest

    @Test

    fun runFlakyAssertion() {

        flickerRule.checkFlakyAssertions()

    }



    /**

     * Windows maybe recreated when rotated. Checks that the focus does not change or if it does,

     * focus returns to [testApp]