PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use the number of shown hotseat icons instead of database items to store into the DB" into main

Browse Source
This commit is contained in:
Sebastián Franco
2023-11-16 15:33:51 +00:00
committed by Android (Google) Code Review
parent cc9ae30a91 2d023e26c6
commit da18b9e435
8 changed files with 83 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/com/android/launcher3/celllayout/CellPosMapperTest.java
+46 -22
View File
@@ -39,44 +39,46 @@ public class CellPosMapperTest {
@Test
public void testMapModelToPresenter_default() {
assertThat(CellPosMapper.DEFAULT.mapModelToPresenter(
CellPosMapper mapper = CellPosMapper.DEFAULT;
assertThat(mapper.mapModelToPresenter(
createInfo(0, 0, 0, CONTAINER_DESKTOP))).isEqualTo(new CellPos(0, 0, 0));
assertThat(CellPosMapper.DEFAULT.mapModelToPresenter(
assertThat(mapper.mapModelToPresenter(
createInfo(0, 0, 1, CONTAINER_DESKTOP))).isEqualTo(new CellPos(0, 0, 1));
assertThat(CellPosMapper.DEFAULT.mapModelToPresenter(
assertThat(mapper.mapModelToPresenter(
createInfo(5, 0, 1, CONTAINER_DESKTOP))).isEqualTo(new CellPos(5, 0, 1));
assertThat(CellPosMapper.DEFAULT.mapModelToPresenter(
assertThat(mapper.mapModelToPresenter(
createInfo(5, 0, 0, CONTAINER_DESKTOP))).isEqualTo(new CellPos(5, 0, 0));
assertThat(CellPosMapper.DEFAULT.mapModelToPresenter(
assertThat(mapper.mapModelToPresenter(
createInfo(0, 0, 0, CONTAINER_HOTSEAT))).isEqualTo(new CellPos(0, 0, 0));
assertThat(CellPosMapper.DEFAULT.mapModelToPresenter(
assertThat(mapper.mapModelToPresenter(
createInfo(0, 0, 1, CONTAINER_HOTSEAT))).isEqualTo(new CellPos(0, 0, 1));
assertThat(CellPosMapper.DEFAULT.mapModelToPresenter(
assertThat(mapper.mapModelToPresenter(
createInfo(5, 0, 1, CONTAINER_HOTSEAT))).isEqualTo(new CellPos(5, 0, 1));
assertThat(CellPosMapper.DEFAULT.mapModelToPresenter(
assertThat(mapper.mapModelToPresenter(
createInfo(5, 0, 0, CONTAINER_HOTSEAT))).isEqualTo(new CellPos(5, 0, 0));
}
@Test
public void testMapPresenterToModel_default() {
assertThat(CellPosMapper.DEFAULT.mapPresenterToModel(
CellPosMapper mapper = CellPosMapper.DEFAULT;
assertThat(mapper.mapPresenterToModel(
0, 0, 0, CONTAINER_DESKTOP)).isEqualTo(new CellPos(0, 0, 0));
assertThat(CellPosMapper.DEFAULT.mapPresenterToModel(
assertThat(mapper.mapPresenterToModel(
0, 0, 1, CONTAINER_DESKTOP)).isEqualTo(new CellPos(0, 0, 1));
assertThat(CellPosMapper.DEFAULT.mapPresenterToModel(
assertThat(mapper.mapPresenterToModel(
5, 0, 1, CONTAINER_DESKTOP)).isEqualTo(new CellPos(5, 0, 1));
assertThat(CellPosMapper.DEFAULT.mapPresenterToModel(
assertThat(mapper.mapPresenterToModel(
5, 0, 0, CONTAINER_DESKTOP)).isEqualTo(new CellPos(5, 0, 0));
assertThat(CellPosMapper.DEFAULT.mapPresenterToModel(
assertThat(mapper.mapPresenterToModel(
0, 0, 0, CONTAINER_HOTSEAT)).isEqualTo(new CellPos(0, 0, 0));
assertThat(CellPosMapper.DEFAULT.mapPresenterToModel(
0, 0, 1, CONTAINER_HOTSEAT)).isEqualTo(new CellPos(0, 0, 1));
assertThat(CellPosMapper.DEFAULT.mapPresenterToModel(
5, 0, 1, CONTAINER_HOTSEAT)).isEqualTo(new CellPos(5, 0, 1));
assertThat(CellPosMapper.DEFAULT.mapPresenterToModel(
5, 0, 0, CONTAINER_HOTSEAT)).isEqualTo(new CellPos(5, 0, 0));
assertThat(mapper.mapPresenterToModel(
0, 0, 1, CONTAINER_HOTSEAT)).isEqualTo(new CellPos(0, 0, 0));
assertThat(mapper.mapPresenterToModel(
5, 0, 1, CONTAINER_HOTSEAT)).isEqualTo(new CellPos(5, 0, 5));
assertThat(mapper.mapPresenterToModel(
5, 0, 0, CONTAINER_HOTSEAT)).isEqualTo(new CellPos(5, 0, 5));
}
@Test
@@ -116,11 +118,33 @@ public class CellPosMapperTest {
assertThat(mapper.mapPresenterToModel(
0, 0, 0, CONTAINER_HOTSEAT)).isEqualTo(new CellPos(0, 0, 0));
assertThat(mapper.mapPresenterToModel(
0, 0, 1, CONTAINER_HOTSEAT)).isEqualTo(new CellPos(0, 0, 1));
0, 0, 1, CONTAINER_HOTSEAT)).isEqualTo(new CellPos(0, 0, 0));
assertThat(mapper.mapPresenterToModel(
5, 0, 1, CONTAINER_HOTSEAT)).isEqualTo(new CellPos(5, 0, 1));
5, 0, 1, CONTAINER_HOTSEAT)).isEqualTo(new CellPos(5, 0, 5));
assertThat(mapper.mapPresenterToModel(
5, 0, 0, CONTAINER_HOTSEAT)).isEqualTo(new CellPos(5, 0, 0));
5, 0, 0, CONTAINER_HOTSEAT)).isEqualTo(new CellPos(5, 0, 5));
}
@Test
public void testMapPresenterToModel_VerticalHotseat() {
CellPosMapper mapper = new CellPosMapper(true, 6);
assertThat(mapper.mapPresenterToModel(
0, 0, 0, CONTAINER_DESKTOP)).isEqualTo(new CellPos(0, 0, 0));
assertThat(mapper.mapPresenterToModel(
0, 0, 1, CONTAINER_DESKTOP)).isEqualTo(new CellPos(0, 0, 1));
assertThat(mapper.mapPresenterToModel(
5, 0, 1, CONTAINER_DESKTOP)).isEqualTo(new CellPos(5, 0, 1));
assertThat(mapper.mapPresenterToModel(
5, 0, 0, CONTAINER_DESKTOP)).isEqualTo(new CellPos(5, 0, 0));
assertThat(mapper.mapPresenterToModel(
0, 0, 0, CONTAINER_HOTSEAT)).isEqualTo(new CellPos(0, 0, 5));
assertThat(mapper.mapPresenterToModel(
0, 0, 1, CONTAINER_HOTSEAT)).isEqualTo(new CellPos(0, 0, 5));
assertThat(mapper.mapPresenterToModel(
0, 5, 1, CONTAINER_HOTSEAT)).isEqualTo(new CellPos(0, 5, 0));
assertThat(mapper.mapPresenterToModel(
0, 5, 0, CONTAINER_HOTSEAT)).isEqualTo(new CellPos(0, 5, 0));
}
private ItemInfo createInfo(int cellX, int cellY, int screen, int container) {