diff options
| author | Makoto Onuki <omakoto@google.com> | 2016-09-29 18:00:53 -0700 |
|---|---|---|
| committer | Makoto Onuki <omakoto@google.com> | 2016-09-30 08:31:19 -0700 |
| commit | 2ade5dd4d4b79e621b053ec12ea6f29727b38fb7 (patch) | |
| tree | 7511ae3640e53b4cdd3ff35c4a460b00bb497f4d /tests | |
| parent | 3ef6a5aaa0e822a3862a252c4ee4b32153bd157b (diff) | |
| download | ContactsProvider-2ade5dd4d4b79e621b053ec12ea6f29727b38fb7.tar.gz | |
Simplify ContactsDatabaseHelperUpgradeTest
Test: adb shell am instrument -w com.android.providers.contacts.tests
Change-Id: Ibbae2d6713d83f7a4390e3125853142c13c7fff6
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/com/android/providers/contacts/ContactsDatabaseHelperUpgradeTest.java | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/tests/src/com/android/providers/contacts/ContactsDatabaseHelperUpgradeTest.java b/tests/src/com/android/providers/contacts/ContactsDatabaseHelperUpgradeTest.java index dc5c7aa4..4db79f26 100644 --- a/tests/src/com/android/providers/contacts/ContactsDatabaseHelperUpgradeTest.java +++ b/tests/src/com/android/providers/contacts/ContactsDatabaseHelperUpgradeTest.java @@ -115,29 +115,30 @@ public class ContactsDatabaseHelperUpgradeTest extends BaseDatabaseHelperUpgrade */ public void testDatabaseUpgrade_Incremental() { create1108(mDb); - upgradeTo1109(1108); - upgradeTo1110(1109); - upgradeTo1200(1110); + + int oldVersion = 1108; + oldVersion = upgradeTo1109(oldVersion); + oldVersion = upgrade(oldVersion, ContactsDatabaseHelper.DATABASE_VERSION); + assertEquals(ContactsDatabaseHelper.DATABASE_VERSION, oldVersion); assertDatabaseStructureSameAsList(TABLE_LIST, /* isNewDatabase =*/ false); } - private void upgradeTo1109(int upgradeFrom) { - mHelper.onUpgrade(mDb, upgradeFrom, 1109); + private int upgradeTo1109(int upgradeFrom) { + final int MY_VERSION = 1109; + mHelper.onUpgrade(mDb, upgradeFrom, MY_VERSION); TableStructure calls = new TableStructure(mDb, "calls"); calls.assertHasColumn(Calls.LAST_MODIFIED, INTEGER, false, "0"); TableStructure voicemailStatus = new TableStructure(mDb, "voicemail_status"); voicemailStatus.assertHasColumn(Status.QUOTA_OCCUPIED, INTEGER, false, "-1"); voicemailStatus.assertHasColumn(Status.QUOTA_TOTAL, INTEGER, false, "-1"); - } - private void upgradeTo1110(int upgradeFrom) { - mHelper.onUpgrade(mDb, upgradeFrom, 1110); - // TODO: Test this upgrade. + return MY_VERSION; } - private void upgradeTo1200(int upgradeFrom) { - mHelper.onUpgrade(mDb, upgradeFrom, 1200); + private int upgrade(int upgradeFrom, int upgradeTo) { + mHelper.onUpgrade(mDb, upgradeFrom, upgradeTo); + return upgradeTo; } /** |