Merge "Fix ReorderWidgets by removing faulty 4x4 cases" into tm-qpr-dev am: 9eeeeacf30

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20003360

Change-Id: I3eafdb4bd3c95786a267604854462b7fa5cf6d7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sebastián Franco
2022-10-07 21:06:14 +00:00
committed by Automerger Merge Worker
2 changed files with 2 additions and 38 deletions

View File

@@ -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<Point, ReorderTestCase> 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);
}

View File

@@ -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<Point, ReorderTestCase> 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);
}