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

Commit 737506bb authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge changes from topic "wmflicker-ime" 

* changes:
  Disable test for window IME visibility when IME is shown on app launch
  Enable previously flaky IME related tests
parents 597dbd5d 91c6d18f

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -65,4 +65,11 @@ public class CloseImeAutoOpenWindowToHomeTest extends CloseImeWindowToHomeTest { 
    public void checkVisibility_imeLayerBecomesInvisible() {

    public void checkVisibility_imeLayerBecomesInvisible() {

        super.checkVisibility_imeLayerBecomesInvisible();

        super.checkVisibility_imeLayerBecomesInvisible();

    }

    }



    @FlakyTest(bugId = 157449248)

    @Ignore("Waiting bug feedback")

    @Test

    public void checkVisibility_imeAppWindowBecomesInvisible() {

        super.checkVisibility_imeAppWindowBecomesInvisible();

    }

}
 
}

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

+2 −3
Original line number Original line Diff line number Diff line
@@ -24,7 +24,6 @@ import androidx.test.filters.LargeTest; 
import com.android.server.wm.flicker.helpers.ImeAppHelper;

import com.android.server.wm.flicker.helpers.ImeAppHelper;





import org.junit.FixMethodOrder;

import org.junit.FixMethodOrder;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;

import org.junit.runners.MethodSorters;

import org.junit.runners.MethodSorters;
@@ -62,20 +61,20 @@ public class CloseImeWindowToHomeTest extends NonRotationTestBase { 
                .forAllEntries());

                .forAllEntries());

    }

    }





    @Ignore("Flaky")

    @Test

    @Test

    public void checkVisibility_imeLayerBecomesInvisible() {

    public void checkVisibility_imeLayerBecomesInvisible() {

        checkResults(result -> LayersTraceSubject.assertThat(result)

        checkResults(result -> LayersTraceSubject.assertThat(result)

                .skipUntilFirstAssertion()

                .showsLayer(IME_WINDOW_TITLE)

                .showsLayer(IME_WINDOW_TITLE)

                .then()

                .then()

                .hidesLayer(IME_WINDOW_TITLE)

                .hidesLayer(IME_WINDOW_TITLE)

                .forAllEntries());

                .forAllEntries());

    }

    }





    @Ignore("Flaky")

    @Test

    @Test

    public void checkVisibility_imeAppLayerBecomesInvisible() {

    public void checkVisibility_imeAppLayerBecomesInvisible() {

        checkResults(result -> LayersTraceSubject.assertThat(result)

        checkResults(result -> LayersTraceSubject.assertThat(result)

                .skipUntilFirstAssertion()

                .showsLayer(mTestApp.getPackage())

                .showsLayer(mTestApp.getPackage())

                .then()

                .then()

                .hidesLayer(mTestApp.getPackage())

                .hidesLayer(mTestApp.getPackage())