Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable open split screen test"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-07-08 11:08:11 +00:00
committed by Android (Google) Code Review
parent b6b1389d58 28dca240f7
commit 55fa99d887
2 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppToSplitScreenTest.java
View File

@@ -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)

13
tests/FlickerTests/src/com/android/server/wm/flicker/SplitScreenToLauncherTest.java
View File

@@ -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());