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

Merge "WM: Promote TaskPositioningControllerTests and ZOrderingTests to non-flaky"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-03-17 23:22:21 +00:00
committed by Android (Google) Code Review
parent 5ddff3f335 c683640f57
commit 5a1e015b5a
2 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/tests/wmtests/src/com/android/server/wm/TaskPositioningControllerTests.java
View File

@@ -32,7 +32,6 @@ import static org.junit.Assert.assertTrue;
import android.platform.test.annotations.Presubmit;
import android.view.InputChannel;
import androidx.test.filters.FlakyTest;
import androidx.test.filters.SmallTest;
import org.junit.Before;
@@ -89,7 +88,6 @@ public class TaskPositioningControllerTests extends WindowTestsBase {
assertNull(mTarget.getDragWindowHandleLocked());
}
@FlakyTest(bugId = 69229402)
@Test
public void testHandleTapOutsideTask() {
synchronized (mWm.mGlobalLock) {

9
services/tests/wmtests/src/com/android/server/wm/ZOrderingTests.java
View File

@@ -43,7 +43,6 @@ import android.platform.test.annotations.Presubmit;
import android.view.SurfaceControl;
import android.view.SurfaceSession;
import androidx.test.filters.FlakyTest;
import androidx.test.filters.SmallTest;
import org.junit.After;
@@ -212,7 +211,6 @@ public class ZOrderingTests extends WindowTestsBase {
return createWindow(null, TYPE_BASE_APPLICATION, mDisplayContent, name);
}
@FlakyTest(bugId = 124088319)
@Test
public void testAssignWindowLayers_ForImeWithNoTarget() {
mDisplayContent.mInputMethodTarget = null;
@@ -230,7 +228,6 @@ public class ZOrderingTests extends WindowTestsBase {
assertWindowHigher(mImeDialogWindow, mImeWindow);
}
@FlakyTest(bugId = 124088319)
@Test
public void testAssignWindowLayers_ForImeWithAppTarget() {
final WindowState imeAppTarget = createWindow("imeAppTarget");
@@ -250,7 +247,6 @@ public class ZOrderingTests extends WindowTestsBase {
assertWindowHigher(mImeDialogWindow, mImeWindow);
}
@FlakyTest(bugId = 124088319)
@Test
public void testAssignWindowLayers_ForImeWithAppTargetWithChildWindows() {
final WindowState imeAppTarget = createWindow("imeAppTarget");
@@ -277,7 +273,6 @@ public class ZOrderingTests extends WindowTestsBase {
assertWindowHigher(mImeDialogWindow, mImeWindow);
}
@FlakyTest(bugId = 124088319)
@Test
public void testAssignWindowLayers_ForImeWithAppTargetAndAppAbove() {
final WindowState appBelowImeTarget = createWindow("appBelowImeTarget");
@@ -301,7 +296,6 @@ public class ZOrderingTests extends WindowTestsBase {
assertWindowHigher(mImeDialogWindow, mImeWindow);
}
@FlakyTest(bugId = 124088319)
@Test
public void testAssignWindowLayers_ForImeNonAppImeTarget() {
final WindowState imeSystemOverlayTarget = createWindow(null, TYPE_SYSTEM_OVERLAY,
@@ -329,7 +323,6 @@ public class ZOrderingTests extends WindowTestsBase {
assertWindowHigher(mImeDialogWindow, mImeWindow);
}
@FlakyTest(bugId = 124088319)
@Test
public void testAssignWindowLayers_ForStatusBarImeTarget() {
mDisplayContent.mInputMethodTarget = mStatusBarWindow;
@@ -344,7 +337,6 @@ public class ZOrderingTests extends WindowTestsBase {
assertWindowHigher(mImeDialogWindow, mImeWindow);
}
@FlakyTest(bugId = 124088319)
@Test
public void testStackLayers() {
final WindowState anyWindow1 = createWindow("anyWindow");
@@ -432,7 +424,6 @@ public class ZOrderingTests extends WindowTestsBase {
}
}
@FlakyTest(bugId = 124088319)
@Test
public void testDockedDividerPosition() {
final WindowState pinnedStackWindow = createWindowOnStack(null, WINDOWING_MODE_PINNED,