Move account backup/restore to userdata in AccountManager

Change-Id: Iea9f2a1b1f2d87e07d63cbb1df5a0d6355ea4031

3 files changed, 0 insertions, 124 deletions

diff --git a/tests/src/com/android/email/provider/AccountBackupRestoreTests.java b/tests/src/com/android/email/provider/AccountBackupRestoreTests.java
index a641c7793..c9b902d5d 100644
--- a/tests/src/com/android/email/provider/AccountBackupRestoreTests.java
+++ b/tests/src/com/android/email/provider/AccountBackupRestoreTests.java
@@ -67,8 +67,6 @@ public class AccountBackupRestoreTests extends ProviderTestCase2<EmailProvider>
         assertEquals(" mSenderName", expect.mSenderName, actual.mSenderName);
         assertEquals(" mProtocolVersion", expect.mProtocolVersion,
                 actual.mProtocolVersion);
-        assertEquals(" mNewMessageCount", expect.mNewMessageCount,
-                actual.mNewMessageCount);
         assertEquals(" mSignature", expect.mSignature, actual.mSignature);
 
         // Nulled out by backup
diff --git a/tests/src/com/android/email/provider/ProviderTestUtils.java b/tests/src/com/android/email/provider/ProviderTestUtils.java
index a723a9450..0b8a05fa3 100644
--- a/tests/src/com/android/email/provider/ProviderTestUtils.java
+++ b/tests/src/com/android/email/provider/ProviderTestUtils.java
@@ -60,7 +60,6 @@ public class ProviderTestUtils extends Assert {
         account.mFlags = 4;
         account.mSenderName = name;
         account.mProtocolVersion = "2.5" + name;
-        account.mNewMessageCount = 5 + name.length();
         account.mPolicyKey = 0;
         account.mSecuritySyncKey = "sec-sync-key-" + name;
         account.mSignature = "signature-" + name;
@@ -303,8 +302,6 @@ public class ProviderTestUtils extends Assert {
         assertEquals(caller + " mSenderName", expect.mSenderName, actual.mSenderName);
         assertEquals(caller + " mProtocolVersion", expect.mProtocolVersion,
                 actual.mProtocolVersion);
-        assertEquals(caller + " mNewMessageCount", expect.mNewMessageCount,
-                actual.mNewMessageCount);
         assertEquals(caller + " mSecuritySyncKey", expect.mSecuritySyncKey,
                 actual.mSecuritySyncKey);
         assertEquals(caller + " mSignature", expect.mSignature, actual.mSignature);
diff --git a/tests/src/com/android/email/provider/ProviderTests.java b/tests/src/com/android/email/provider/ProviderTests.java
index 21ffd6175..b7e692290 100644
--- a/tests/src/com/android/email/provider/ProviderTests.java
+++ b/tests/src/com/android/email/provider/ProviderTests.java
@@ -2045,125 +2045,6 @@ public class ProviderTests extends ProviderTestCase2<EmailProvider> {
     }
 
     /**
-     * Check if update to {@link Account#RESET_NEW_MESSAGE_COUNT_URI} resets the new message count.
-     */
-    public void testResetNewMessageCount() {
-        final Context c = mMockContext;
-        final ContentResolver cr = c.getContentResolver();
-
-        // Prepare test data
-        Account a1 = ProviderTestUtils.setupAccount("acct1", false, c);
-        a1.mNewMessageCount = 1;
-        a1.save(c);
-        Account a2 = ProviderTestUtils.setupAccount("acct2", false, c);
-        a2.mNewMessageCount = 2;
-        a2.save(c);
-        Account a3 = ProviderTestUtils.setupAccount("acct3", false, c);
-        a3.mNewMessageCount = 3;
-        a3.save(c);
-        Account a4 = ProviderTestUtils.setupAccount("acct4", false, c);
-        a4.mNewMessageCount = 4;
-        a4.save(c);
-        Account a5 = ProviderTestUtils.setupAccount("acct5", false, c);
-        a5.mNewMessageCount = 5;
-        a5.save(c);
-
-        // With ID in URI, no selection
-        cr.update(ContentUris.withAppendedId(Account.RESET_NEW_MESSAGE_COUNT_URI, a1.mId), null,
-                null, null);
-        assertEquals(0, Account.restoreAccountWithId(c, a1.mId).mNewMessageCount);
-        assertEquals(2, Account.restoreAccountWithId(c, a2.mId).mNewMessageCount);
-        assertEquals(3, Account.restoreAccountWithId(c, a3.mId).mNewMessageCount);
-        assertEquals(4, Account.restoreAccountWithId(c, a4.mId).mNewMessageCount);
-        assertEquals(5, Account.restoreAccountWithId(c, a5.mId).mNewMessageCount);
-
-        // No ID in URI, with selection
-        cr.update(Account.RESET_NEW_MESSAGE_COUNT_URI, null, EmailContent.ID_SELECTION,
-                new String[] {Long.toString(a2.mId)});
-        assertEquals(0, Account.restoreAccountWithId(c, a1.mId).mNewMessageCount);
-        assertEquals(0, Account.restoreAccountWithId(c, a2.mId).mNewMessageCount);
-        assertEquals(3, Account.restoreAccountWithId(c, a3.mId).mNewMessageCount);
-        assertEquals(4, Account.restoreAccountWithId(c, a4.mId).mNewMessageCount);
-        assertEquals(5, Account.restoreAccountWithId(c, a5.mId).mNewMessageCount);
-
-        // With ID, with selection
-        cr.update(ContentUris.withAppendedId(Account.RESET_NEW_MESSAGE_COUNT_URI, a3.mId), null,
-                EmailContent.ID_SELECTION, new String[] {Long.toString(a3.mId)});
-        assertEquals(0, Account.restoreAccountWithId(c, a1.mId).mNewMessageCount);
-        assertEquals(0, Account.restoreAccountWithId(c, a2.mId).mNewMessageCount);
-        assertEquals(0, Account.restoreAccountWithId(c, a3.mId).mNewMessageCount);
-        assertEquals(4, Account.restoreAccountWithId(c, a4.mId).mNewMessageCount);
-        assertEquals(5, Account.restoreAccountWithId(c, a5.mId).mNewMessageCount);
-
-        // No ID in URI, no selection
-        cr.update(Account.RESET_NEW_MESSAGE_COUNT_URI, null, null, null);
-        assertEquals(0, Account.restoreAccountWithId(c, a1.mId).mNewMessageCount);
-        assertEquals(0, Account.restoreAccountWithId(c, a2.mId).mNewMessageCount);
-        assertEquals(0, Account.restoreAccountWithId(c, a3.mId).mNewMessageCount);
-        assertEquals(0, Account.restoreAccountWithId(c, a4.mId).mNewMessageCount);
-        assertEquals(0, Account.restoreAccountWithId(c, a5.mId).mNewMessageCount);
-    }
-
-    /**
-     * Check if update on ACCOUNT_ID_ADD_TO_FIELD updates the cache properly.
-     */
-    public void testUpdateCacheAccountIdAddToField() {
-        final Context c = mMockContext;
-
-        // make sure Account.CONTENT_URI is defined
-        EmailContent.init(c);
-        Account.initAccount();
-
-        Account a1 = ProviderTestUtils.setupAccount("a1", true, c);
-
-        int start = Account.restoreAccountWithId(c, a1.mId).mNewMessageCount;
-
-        // +1 to NEW_MESSAGE_COUNT
-        ContentValues cv = new ContentValues();
-        cv.put(EmailContent.FIELD_COLUMN_NAME, AccountColumns.NEW_MESSAGE_COUNT);
-        cv.put(EmailContent.ADD_COLUMN_NAME, 1);
-        mProvider.update(ContentUris.withAppendedId(Account.CONTENT_URI, a1.mId), cv, null, null);
-
-        // Check
-        assertEquals(start + 1, Account.restoreAccountWithId(c, a1.mId).mNewMessageCount);
-    }
-
-    /**
-     * Check if update on ACCOUNT_RESET_NEW_COUNT updates the cache properly.
-     */
-    public void testUpdateCacheAccountResetNewCount() {
-        final Context c = mMockContext;
-        Account a1 = ProviderTestUtils.setupAccount("a1", true, c);
-
-        // precondition
-        assertTrue(Account.restoreAccountWithId(c, a1.mId).mNewMessageCount > 0);
-
-        // Reset
-        mProvider.update(Account.RESET_NEW_MESSAGE_COUNT_URI, null, null, null);
-
-        // Check
-        assertEquals(0, Account.restoreAccountWithId(c, a1.mId).mNewMessageCount);
-    }
-
-    /**
-     * Check if update on ACCOUNT_RESET_NEW_COUNT_ID updates the cache properly.
-     */
-    public void testUpdateCacheAccountResetNewCountId() {
-        final Context c = mMockContext;
-        Account a1 = ProviderTestUtils.setupAccount("a1", true, c);
-
-        // precondition
-        assertTrue(Account.restoreAccountWithId(c, a1.mId).mNewMessageCount > 0);
-
-        // Reset
-        mProvider.update(ContentUris.withAppendedId(Account.RESET_NEW_MESSAGE_COUNT_URI, a1.mId),
-                null, null, null);
-
-        // Check
-        assertEquals(0, Account.restoreAccountWithId(c, a1.mId).mNewMessageCount);
-    }
-
-    /**
      * Check that we're handling illegal uri's properly (by throwing an exception unless it's a
      * query for an id of -1, in which case we return a zero-length cursor)
      */