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

Commit 28dca240 authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Enable open split screen test

Tests were previously disabled because of a bug, that has already been fixed.

Bug: 151632128
Test: atest OpenAppToSplitScreenTest
Change-Id: I766bcc410848fe8c8b3283bc998a0c80e0bcff88
parent d8ad89c4
Loading
Loading
Loading
Loading
+0 −13
Original line number Diff line number Diff line
@@ -19,11 +19,9 @@ package com.android.server.wm.flicker;
import static com.android.server.wm.flicker.CommonTransitions.appToSplitScreen;

import androidx.test.InstrumentationRegistry;
import androidx.test.filters.FlakyTest;
import androidx.test.filters.LargeTest;

import org.junit.FixMethodOrder;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
@@ -36,8 +34,6 @@ import org.junit.runners.Parameterized;
@LargeTest
@RunWith(Parameterized.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@FlakyTest(bugId = 151632128)
@Ignore("Waiting bug feedback")
public class OpenAppToSplitScreenTest extends NonRotationTestBase {

    public OpenAppToSplitScreenTest(String beginRotationName, int beginRotation) {
@@ -66,15 +62,6 @@ public class OpenAppToSplitScreenTest extends NonRotationTestBase {
                .showsAboveAppWindow(STATUS_BAR_WINDOW_TITLE).forAllEntries());
    }

    @Test
    public void checkVisibility_dividerWindowBecomesVisible() {
        checkResults(result -> WmTraceSubject.assertThat(result)
                .hidesAboveAppWindow(DOCKED_STACK_DIVIDER)
                .then()
                .showsAboveAppWindow(DOCKED_STACK_DIVIDER)
                .forAllEntries());
    }

    @Test
    public void checkVisibility_dividerLayerBecomesVisible() {
        checkResults(result -> LayersTraceSubject.assertThat(result)
+0 −13
Original line number Diff line number Diff line
@@ -24,14 +24,12 @@ import static com.android.server.wm.flicker.helpers.AutomationUtils.isInSplitScr
import android.view.Surface;

import androidx.test.InstrumentationRegistry;
import androidx.test.filters.FlakyTest;
import androidx.test.filters.LargeTest;
import androidx.test.runner.AndroidJUnit4;
import androidx.test.uiautomator.UiDevice;

import org.junit.AfterClass;
import org.junit.FixMethodOrder;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
@@ -43,8 +41,6 @@ import org.junit.runners.MethodSorters;
@LargeTest
@RunWith(AndroidJUnit4.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@FlakyTest(bugId = 140856143)
@Ignore("Waiting bug feedback")
public class SplitScreenToLauncherTest extends FlickerTestBase {

    public SplitScreenToLauncherTest() {
@@ -95,15 +91,6 @@ public class SplitScreenToLauncherTest extends FlickerTestBase {
                .showsAboveAppWindow(STATUS_BAR_WINDOW_TITLE).forAllEntries());
    }

    @Test
    public void checkVisibility_dividerWindowBecomesInVisible() {
        checkResults(result -> WmTraceSubject.assertThat(result)
                .showsAboveAppWindow(DOCKED_STACK_DIVIDER)
                .then()
                .hidesAboveAppWindow(DOCKED_STACK_DIVIDER)
                .forAllEntries());
    }

    @AfterClass
    public static void teardown() {
        UiDevice device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());