Sebastian Franco
5356ff955c
If the user is changing the X and Y of the reorder, wich requires the user to move at least one Workspace cell from the previous position, then it doesn't make sense to wait for the previous alarm to finish to start a new reorder. Also, I added a new test to run on foldable devices. Fix: 259995663 Fix: 259295374 Test: atest ReorderWidgets (it mostly fails on postsubmit) Test: modify ReorderWidgets.fullReorder to run 20 times and it should work, before the chagne it would fail. Change-Id: Ic6b436ea1088f8092c849e9791862947e9035c9f
110 lines
3.4 KiB
Java
110 lines
3.4 KiB
Java
/*
|
|
* Copyright (C) 2022 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
package com.android.launcher3.celllayout.testcases;
|
|
|
|
import android.graphics.Point;
|
|
|
|
import java.util.Map;
|
|
|
|
/**
|
|
* The grids represent the workspace to be build by TestWorkspaceBuilder, to see what each character
|
|
* in the board mean refer to {@code CellType}
|
|
*/
|
|
public class FullReorderCase {
|
|
|
|
/** 5x5 Test
|
|
**/
|
|
private static final String START_BOARD_STR_5x5 = ""
|
|
+ "xxxxx\n"
|
|
+ "222mm\n"
|
|
+ "222mm\n"
|
|
+ "ii111\n"
|
|
+ "ii111";
|
|
private static final Point MOVE_TO_5x5 = new Point(0, 4);
|
|
private static final String END_BOARD_STR_5x5 = ""
|
|
+ "xxxxx\n"
|
|
+ "222ii\n"
|
|
+ "222ii\n"
|
|
+ "mm111\n"
|
|
+ "mm111";
|
|
private static final ReorderTestCase TEST_CASE_5x5 = new ReorderTestCase(START_BOARD_STR_5x5,
|
|
MOVE_TO_5x5,
|
|
END_BOARD_STR_5x5);
|
|
|
|
/** 6x5 Test
|
|
**/
|
|
private static final String START_BOARD_STR_6x5 = ""
|
|
+ "xxxxxx\n"
|
|
+ "2222mm\n"
|
|
+ "2222mm\n"
|
|
+ "ii1111\n"
|
|
+ "ii1111";
|
|
private static final Point MOVE_TO_6x5 = new Point(0, 4);
|
|
private static final String END_BOARD_STR_6x5 = ""
|
|
+ "xxxxxx\n"
|
|
+ "2222ii\n"
|
|
+ "2222ii\n"
|
|
+ "mm1111\n"
|
|
+ "mm1111";
|
|
private static final ReorderTestCase TEST_CASE_6x5 = new ReorderTestCase(START_BOARD_STR_6x5,
|
|
MOVE_TO_6x5,
|
|
END_BOARD_STR_6x5);
|
|
|
|
/** 4x4 Test
|
|
**/
|
|
private static final String START_BOARD_STR_4x4 = ""
|
|
+ "xxxx\n"
|
|
+ "22mm\n"
|
|
+ "iimm\n"
|
|
+ "ii11";
|
|
private static final Point MOVE_TO_4x4 = new Point(0, 3);
|
|
private static final String END_BOARD_STR_4x4 = ""
|
|
+ "xxxx\n"
|
|
+ "22ii\n"
|
|
+ "mmii\n"
|
|
+ "mm11";
|
|
|
|
private static final ReorderTestCase TEST_CASE_4x4 = new ReorderTestCase(START_BOARD_STR_4x4,
|
|
MOVE_TO_4x4,
|
|
END_BOARD_STR_4x4);
|
|
|
|
/** 4x4 Test
|
|
**/
|
|
private static final String START_BOARD_STR_4x5 = ""
|
|
+ "xxxx\n"
|
|
+ "22mm\n"
|
|
+ "iimm\n"
|
|
+ "ii11\n"
|
|
+ "ii11";
|
|
private static final Point MOVE_TO_4x5 = new Point(0, 3);
|
|
private static final String END_BOARD_STR_4x5 = ""
|
|
+ "xxxx\n"
|
|
+ "22ii\n"
|
|
+ "mmii\n"
|
|
+ "mm11\n"
|
|
+ "ii11";
|
|
|
|
private static final ReorderTestCase TEST_CASE_4x5 = new ReorderTestCase(START_BOARD_STR_4x5,
|
|
MOVE_TO_4x5,
|
|
END_BOARD_STR_4x5);
|
|
|
|
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(4, 5), TEST_CASE_4x5);
|
|
}
|