ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix tests broken by I2bf5de4e (Clean-ups for EmailProvider)

Browse Source 
My previous CL broke some tests.
- make sure to set 0 to unreadCount when adding a new row
- when updating messageCount in the tests, directly manipulate
  the DB.  (the provider no longer allows this)

Change-Id: Ib569349707007badf4f23600fbca37110c78fa6d
This commit is contained in:
Makoto Onuki 2010-09-10 14:37:01 -07:00
parent f678a8e67a
commit 5b0c2c7f34
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/email/provider/EmailProvider.java
View File

@ -1042,7 +1042,12 @@ public class EmailProvider extends ContentProvider {
Log.v(TAG, "EmailProvider.insert: uri=" + uri + ", match is " + match); Log.v(TAG, "EmailProvider.insert: uri=" + uri + ", match is " + match);
} }
removeAutoColumnsFromContentValues(match, values); // We do NOT allow setting of unreadCount/messageCount via the provider
// These columns are maintained via triggers
if (match == MAILBOX_ID || match == MAILBOX) {
values.put(MailboxColumns.UNREAD_COUNT, 0);
values.put(MailboxColumns.MESSAGE_COUNT, 0);
}
Uri resultUri = null; Uri resultUri = null;
@ -1261,7 +1266,12 @@ public class EmailProvider extends ContentProvider {
Log.v(TAG, "EmailProvider.update: uri=" + uri + ", match is " + match); Log.v(TAG, "EmailProvider.update: uri=" + uri + ", match is " + match);
} }
removeAutoColumnsFromContentValues(match, values); // We do NOT allow setting of unreadCount/messageCount via the provider
// These columns are maintained via triggers
if (match == MAILBOX_ID || match == MAILBOX) {
values.remove(MailboxColumns.UNREAD_COUNT);
values.remove(MailboxColumns.MESSAGE_COUNT);
}
String id; String id;
try { try {
@ -1344,15 +1354,6 @@ public class EmailProvider extends ContentProvider {
return result; return result;
} }
private static void removeAutoColumnsFromContentValues(int match, ContentValues values) {
// We do NOT allow setting of unreadCount/messageCount via the provider
// These columns are maintained via triggers
if (match == MAILBOX_ID || match == MAILBOX) {
values.remove(MailboxColumns.UNREAD_COUNT);
values.remove(MailboxColumns.MESSAGE_COUNT);
}
}
/* (non-Javadoc) /* (non-Javadoc)
* @see android.content.ContentProvider#applyBatch(android.content.ContentProviderOperation) * @see android.content.ContentProvider#applyBatch(android.content.ContentProviderOperation)
*/ */

4
tests/src/com/android/email/provider/ProviderTests.java
View File

@ -1849,7 +1849,9 @@ public class ProviderTests extends ProviderTestCase2<EmailProvider> {
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
values.put(MailboxColumns.MESSAGE_COUNT, -1); values.put(MailboxColumns.MESSAGE_COUNT, -1);
getProvider().update(Mailbox.CONTENT_URI, values, null, null); // EmailProvider.update() doesn't allow updating messageCount, so directly use the DB.
SQLiteDatabase db = getProvider().getDatabase(mMockContext);
db.update(Mailbox.TABLE_NAME, values, null, null);
} }
/** /**