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

Removing support for adding legacy shortcuts.

Browse Source 
All existing legacy shortcuts will be migrated one-time to deep shortcuts
This shortcuts are pinned under the Launcher package, with custom badging

Bug: 275875209
Test: Updated unit tests
Flag: N/A
Change-Id: I7da001f724776ad8d6c807517b7e4e259de626c2
This commit is contained in:
Sunny Goyal
2023-03-29 16:52:27 -07:00
parent f6bf07a5fe
commit 84b48d8deb
19 changed files with 375 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/com/android/launcher3/model/DbDowngradeHelperTest.java
+47 -29
View File
@@ -108,6 +108,21 @@ public class DbDowngradeHelperTest {
assertEquals(0, mSchemaFile.lastModified());
}
@Test
public void testDowngrade_success_v31() throws Exception {
setupTestDb();
try (SQLiteOpenHelper helper = new MyDatabaseHelper()) {
assertFalse(hasFavoritesColumn(helper.getWritableDatabase(), "iconPackage"));
assertFalse(hasFavoritesColumn(helper.getWritableDatabase(), "iconResource"));
}
try (TestOpenHelper helper = new TestOpenHelper(24)) {
assertTrue(hasFavoritesColumn(helper.getWritableDatabase(), "iconPackage"));
assertTrue(hasFavoritesColumn(helper.getWritableDatabase(), "iconResource"));
}
}
@Test
public void testDowngrade_success_v24() throws Exception {
setupTestDb();
@@ -121,34 +136,18 @@ public class DbDowngradeHelperTest {
public void testDowngrade_success_v22() throws Exception {
setupTestDb();
SQLiteOpenHelper helper = new TestOpenHelper(22);
assertEquals(22, helper.getWritableDatabase().getVersion());
// Check column does not exist
try (Cursor c = helper.getWritableDatabase().query(Favorites.TABLE_NAME,
null, null, null, null, null, null)) {
assertEquals(-1, c.getColumnIndex(Favorites.OPTIONS));
// Check data is present
assertEquals(10, c.getCount());
try (SQLiteOpenHelper helper = new TestOpenHelper(22)) {
assertEquals(22, helper.getWritableDatabase().getVersion());
assertFalse(hasFavoritesColumn(helper.getWritableDatabase(), Favorites.OPTIONS));
assertEquals(10, getFavoriteDataCount(helper.getWritableDatabase()));
}
helper.close();
helper = new DatabaseHelper(mContext, DB_FILE, false) {
@Override
public void onOpen(SQLiteDatabase db) { }
};
assertEquals(DatabaseHelper.SCHEMA_VERSION, helper.getWritableDatabase().getVersion());
try (Cursor c = helper.getWritableDatabase().query(Favorites.TABLE_NAME,
null, null, null, null, null, null)) {
// Check column exists
assertNotSame(-1, c.getColumnIndex(Favorites.OPTIONS));
// Check data is present
assertEquals(10, c.getCount());
try (SQLiteOpenHelper helper = new MyDatabaseHelper()) {
assertEquals(DatabaseHelper.SCHEMA_VERSION,
helper.getWritableDatabase().getVersion());
assertTrue(hasFavoritesColumn(helper.getWritableDatabase(), Favorites.OPTIONS));
assertEquals(10, getFavoriteDataCount(helper.getWritableDatabase()));
}
helper.close();
}
@Test(expected = DowngradeFailException.class)
@@ -165,10 +164,7 @@ public class DbDowngradeHelperTest {
DbDowngradeHelper.updateSchemaFile(mSchemaFile, DatabaseHelper.SCHEMA_VERSION, mContext);
DatabaseHelper dbHelper = new DatabaseHelper(mContext, DB_FILE, false) {
@Override
public void onOpen(SQLiteDatabase db) { }
};
DatabaseHelper dbHelper = new MyDatabaseHelper();
// Insert mock data
for (int i = 0; i < 10; i++) {
ContentValues values = new ContentValues();
@@ -210,4 +206,26 @@ public class DbDowngradeHelperTest {
super(e);
}
}
private static boolean hasFavoritesColumn(SQLiteDatabase db, String columnName) {
try (Cursor c = db.query(Favorites.TABLE_NAME, null, null, null, null, null, null)) {
return c.getColumnIndex(columnName) >= 0;
}
}
public static int getFavoriteDataCount(SQLiteDatabase db) {
try (Cursor c = db.query(Favorites.TABLE_NAME, null, null, null, null, null, null)) {
return c.getCount();
}
}
private class MyDatabaseHelper extends DatabaseHelper {
MyDatabaseHelper() {
super(mContext, DB_FILE, false);
}
@Override
public void onOpen(SQLiteDatabase db) { }
}
}