summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTony Mantler <nicoya@google.com>2014-04-11 14:42:28 -0700
committerTony Mantler <nicoya@google.com>2014-04-14 12:54:39 -0700
commit3dd85723a1af5537e23e4b05bdc361cce9cd42be (patch)
tree02e1977d5a9cfbe75cd1d3188d4588a1c3fafb33 /tests
parent80d76769852635096227ea467ce6375e61bfe01d (diff)
downloadandroid_packages_apps_Email-3dd85723a1af5537e23e4b05bdc361cce9cd42be.tar.gz
android_packages_apps_Email-3dd85723a1af5537e23e4b05bdc361cce9cd42be.tar.bz2
android_packages_apps_Email-3dd85723a1af5537e23e4b05bdc361cce9cd42be.zip
Cleanup in EmailContent
Change-Id: Ifa251eb206779f59ea003f99395d454c7e407bc2
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/email/provider/ProviderTests.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/src/com/android/email/provider/ProviderTests.java b/tests/src/com/android/email/provider/ProviderTests.java
index 4b63f89a5..5ba761a7d 100644
--- a/tests/src/com/android/email/provider/ProviderTests.java
+++ b/tests/src/com/android/email/provider/ProviderTests.java
@@ -416,7 +416,7 @@ public class ProviderTests extends ProviderTestCase2<EmailProvider> {
Cursor c = null;
try {
c = mMockContext.getContentResolver().query(EmailContent.Body.CONTENT_URI,
- EmailContent.Body.CONTENT_PROJECTION, EmailContent.Body.MESSAGE_KEY + "=?",
+ EmailContent.Body.CONTENT_PROJECTION, BodyColumns.MESSAGE_KEY + "=?",
new String[] {String.valueOf(messageId)}, null);
int numBodies = c.getCount();
assertTrue("at most one body", numBodies < 2);
@@ -2432,10 +2432,10 @@ public class ProviderTests extends ProviderTestCase2<EmailProvider> {
ContentCache.invalidateAllCaches();
// Delete orphaned mailboxes/messages/policies
EmailProvider.deleteUnlinked(db, Mailbox.TABLE_NAME, MailboxColumns.ACCOUNT_KEY,
- AccountColumns.ID, Account.TABLE_NAME);
+ AccountColumns._ID, Account.TABLE_NAME);
EmailProvider.deleteUnlinked(db, Message.TABLE_NAME, MessageColumns.ACCOUNT_KEY,
- AccountColumns.ID, Account.TABLE_NAME);
- EmailProvider.deleteUnlinked(db, Policy.TABLE_NAME, PolicyColumns.ID,
+ AccountColumns._ID, Account.TABLE_NAME);
+ EmailProvider.deleteUnlinked(db, Policy.TABLE_NAME, PolicyColumns._ID,
AccountColumns.POLICY_KEY, Account.TABLE_NAME);
// Make sure the orphaned mailboxes are gone