From a44d255c8fe2f3cf0a8ee62fc6ddf4c8329b49e6 Mon Sep 17 00:00:00 2001 From: Sebastian Franco Date: Tue, 20 Sep 2022 17:41:13 -0500 Subject: [PATCH] Fix ReorderWidgets by removing faulty 4x4 cases Fix: 242323136 Test: atest ReorderWidgets (the device has to be cf_x86_64_phone-userdebug) Change-Id: Ic545409ecc20420be6c7377513c704822dbaf75e --- .../testcases/MoveOutReorderCase.java | 20 +------------------ .../celllayout/testcases/PushReorderCase.java | 20 +------------------ 2 files changed, 2 insertions(+), 38 deletions(-) diff --git a/tests/src/com/android/launcher3/celllayout/testcases/MoveOutReorderCase.java b/tests/src/com/android/launcher3/celllayout/testcases/MoveOutReorderCase.java index a222d3d551..047d3422df 100644 --- a/tests/src/com/android/launcher3/celllayout/testcases/MoveOutReorderCase.java +++ b/tests/src/com/android/launcher3/celllayout/testcases/MoveOutReorderCase.java @@ -63,25 +63,7 @@ public class MoveOutReorderCase { MOVE_TO_6x5, END_BOARD_STR_6x5); - /** 4x4 Test - **/ - private static final String START_BOARD_STR_4x4 = "" - + "xxxx\n" - + "34-m\n" - + "3511\n" - + "3211"; - private static final Point MOVE_TO_4x4 = new Point(1, 2); - private static final String END_BOARD_STR_4x4 = "" - + "xxxx\n" - + "345-\n" - + "3m11\n" - + "3211"; - private static final ReorderTestCase TEST_CASE_4x4 = new ReorderTestCase(START_BOARD_STR_4x4, - MOVE_TO_4x4, - END_BOARD_STR_4x4); - public static final Map TEST_BY_GRID_SIZE = Map.of(new Point(5, 5), TEST_CASE_5x5, - new Point(6, 5), TEST_CASE_6x5, - new Point(4, 4), TEST_CASE_4x4); + new Point(6, 5), TEST_CASE_6x5); } diff --git a/tests/src/com/android/launcher3/celllayout/testcases/PushReorderCase.java b/tests/src/com/android/launcher3/celllayout/testcases/PushReorderCase.java index e16ff42a8b..38c9aee0fd 100644 --- a/tests/src/com/android/launcher3/celllayout/testcases/PushReorderCase.java +++ b/tests/src/com/android/launcher3/celllayout/testcases/PushReorderCase.java @@ -64,25 +64,7 @@ public class PushReorderCase { MOVE_TO_6x5, END_BOARD_STR_6x5); - /** 4x4 Test - **/ - private static final String START_BOARD_STR_4x4 = "" - + "xxxx\n" - + "222m\n" - + "-111\n" - + "----"; - private static final Point MOVE_TO_4x4 = new Point(2, 1); - private static final String END_BOARD_STR_4x4 = "" - + "xxxx\n" - + "--m-\n" - + "222-\n" - + "-111"; - private static final ReorderTestCase TEST_CASE_4x4 = new ReorderTestCase(START_BOARD_STR_4x4, - MOVE_TO_4x4, - END_BOARD_STR_4x4); - public static final Map TEST_BY_GRID_SIZE = Map.of(new Point(5, 5), TEST_CASE_5x5, - new Point(6, 5), TEST_CASE_6x5, - new Point(4, 4), TEST_CASE_4x4); + new Point(6, 5), TEST_CASE_6x5); }