From 3dd85723a1af5537e23e4b05bdc361cce9cd42be Mon Sep 17 00:00:00 2001 From: Tony Mantler Date: Fri, 11 Apr 2014 14:42:28 -0700 Subject: Cleanup in EmailContent Change-Id: Ifa251eb206779f59ea003f99395d454c7e407bc2 --- tests/src/com/android/email/provider/ProviderTests.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') 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 { 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 { 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 -- cgit v1.2.3