diff options
| author | Tingting Wang <tingtingw@google.com> | 2021-08-06 22:43:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-08-06 22:43:18 +0000 |
| commit | 43d3cb2822c384d1001dbac2fb31e394ac00938a (patch) | |
| tree | e77a86884e2e7e4cbfe5a51f76613e341d23ab82 /tests/src/com/android | |
| parent | e2e3083963e7bbb3aa45952e1de06606e803b5b3 (diff) | |
| parent | 2ebf68df77e1f74457809ff461a4bb5e210133d1 (diff) | |
| download | ContactsProvider-43d3cb2822c384d1001dbac2fb31e394ac00938a.tar.gz | |
Merge "Add x_is_default column to Accounts table."
Diffstat (limited to 'tests/src/com/android')
| -rw-r--r-- | tests/src/com/android/providers/contacts/ContactsDatabaseHelperUpgradeTest.java | 57 |
1 files changed, 56 insertions, 1 deletions
diff --git a/tests/src/com/android/providers/contacts/ContactsDatabaseHelperUpgradeTest.java b/tests/src/com/android/providers/contacts/ContactsDatabaseHelperUpgradeTest.java index b3a4c53d..7ed996dd 100644 --- a/tests/src/com/android/providers/contacts/ContactsDatabaseHelperUpgradeTest.java +++ b/tests/src/com/android/providers/contacts/ContactsDatabaseHelperUpgradeTest.java @@ -122,6 +122,7 @@ public class ContactsDatabaseHelperUpgradeTest extends BaseDatabaseHelperUpgrade int oldVersion = 1108; oldVersion = upgradeTo1109(oldVersion); oldVersion = upgradeTo1600(oldVersion); + oldVersion = upgradeTo1601(oldVersion); oldVersion = upgrade(oldVersion, ContactsDatabaseHelper.DATABASE_VERSION); assertEquals(ContactsDatabaseHelper.DATABASE_VERSION, oldVersion); assertDatabaseStructureSameAsList(TABLE_LIST, /* isNewDatabase =*/ false); @@ -243,6 +244,59 @@ public class ContactsDatabaseHelperUpgradeTest extends BaseDatabaseHelperUpgrade return MY_VERSION; } + private int upgradeTo1601(int upgradeFrom) { + final int MY_VERSION = 1601; + + mHelper.onUpgrade(mDb, upgradeFrom, MY_VERSION); + + try (Cursor c = mDb.rawQuery("select " + + "_id, account_name, account_type, data_set, ungrouped_visible, should_sync, " + + "x_is_default from accounts order by _id", null)) { + BaseContactsProvider2Test.assertCursorValuesOrderly(c, + cv(Contacts._ID, 1, + "account_name", null, + "account_type", null, + "data_set", null, + "ungrouped_visible", 1, + "should_sync", 0, + "x_is_default", 0 + ), + cv(Contacts._ID, 2, + "account_name", "visible", + "account_type", "type1", + "data_set", null, + "ungrouped_visible", 1, + "should_sync", 1, + "x_is_default", 0 + ), + cv(Contacts._ID, 3, + "account_name", "visible", + "account_type", "type1", + "data_set", "ds_not_visible", + "ungrouped_visible", 0, + "should_sync", 1, + "x_is_default", 0 + ), + cv(Contacts._ID, 4, + "account_name", "not_syncable", + "account_type", "type1", + "data_set", null, + "ungrouped_visible", 0, + "should_sync", 0, + "x_is_default", 0 + ), + cv(Contacts._ID, 5, + "account_name", "no_settings", + "account_type", "type2", + "data_set", null, + "ungrouped_visible", 0, + "should_sync", 1, + "x_is_default", 0 + )); + } + return MY_VERSION; + } + private int upgrade(int upgradeFrom, int upgradeTo) { if (upgradeFrom < upgradeTo) { mHelper.onUpgrade(mDb, upgradeFrom, upgradeTo); @@ -274,7 +328,8 @@ public class ContactsDatabaseHelperUpgradeTest extends BaseDatabaseHelperUpgrade new TableColumn(AccountsColumns.SIM_SLOT_INDEX, INTEGER, false, null), new TableColumn(AccountsColumns.SIM_EF_TYPE, INTEGER, false, null), new TableColumn(AccountsColumns.UNGROUPED_VISIBLE, INTEGER, true, "0"), - new TableColumn(AccountsColumns.SHOULD_SYNC, INTEGER, true, "1") + new TableColumn(AccountsColumns.SHOULD_SYNC, INTEGER, true, "1"), + new TableColumn(AccountsColumns.IS_DEFAULT, INTEGER, true, "0") }; private static final TableColumn[] CONTACTS_COLUMNS = new TableColumn[] { |