Fix bug 4978035 Precondition failure: Not combined mailbox
Also added test. (For some reason the message count doesn't get set properly on tests... I'll investigate it when I get around to it...) Change-Id: I83f3b6f2079da06b2d4973419d2296e6492de1d3
This commit is contained in:
Makoto Onuki
parent
3aa7fd74f8
commit
a6212c88e0
|
|
@ -176,20 +176,26 @@ public class FolderProperties {
|
|||
);
|
||||
}
|
||||
|
||||
public int getMessageCountForCombinedMailbox(long mailboxId) {
|
||||
/**
|
||||
* @return message count to show for the UI for a combined inbox.
|
||||
*
|
||||
* Note this method doesn't use mContext so we can inject a mock context for provider
|
||||
* access. So it's static.
|
||||
*/
|
||||
public static int getMessageCountForCombinedMailbox(Context context, long mailboxId) {
|
||||
Preconditions.checkState(mailboxId < -1L);
|
||||
if ((mailboxId == Mailbox.QUERY_ALL_INBOXES)
|
||||
|| (mailboxId == Mailbox.QUERY_ALL_UNREAD)) {
|
||||
return Mailbox.getUnreadCountByMailboxType(mContext, Mailbox.TYPE_INBOX);
|
||||
return Mailbox.getUnreadCountByMailboxType(context, Mailbox.TYPE_INBOX);
|
||||
|
||||
} else if (mailboxId == Mailbox.QUERY_ALL_FAVORITES) {
|
||||
return Message.getFavoriteMessageCount(mContext);
|
||||
return Message.getFavoriteMessageCount(context);
|
||||
|
||||
} else if (mailboxId == Mailbox.QUERY_ALL_DRAFTS) {
|
||||
return Mailbox.getMessageCountByMailboxType(mContext, Mailbox.TYPE_DRAFTS);
|
||||
return Mailbox.getMessageCountByMailboxType(context, Mailbox.TYPE_DRAFTS);
|
||||
|
||||
} else if (mailboxId == Mailbox.QUERY_ALL_OUTBOX) {
|
||||
return Mailbox.getMessageCountByMailboxType(mContext, Mailbox.TYPE_OUTBOX);
|
||||
return Mailbox.getMessageCountByMailboxType(context, Mailbox.TYPE_OUTBOX);
|
||||
}
|
||||
throw new IllegalStateException("Invalid mailbox ID");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -480,7 +480,8 @@ public class AccountSelectorAdapter extends CursorAdapter {
|
|||
private String mMailboxDisplayName;
|
||||
private int mMailboxMessageCount;
|
||||
|
||||
private CursorWithExtras(String[] columnNames, Cursor innerCursor) {
|
||||
@VisibleForTesting
|
||||
CursorWithExtras(String[] columnNames, Cursor innerCursor) {
|
||||
super(columnNames, innerCursor);
|
||||
}
|
||||
|
||||
|
|
@ -495,7 +496,8 @@ public class AccountSelectorAdapter extends CursorAdapter {
|
|||
/**
|
||||
* Set the current account/mailbox info.
|
||||
*/
|
||||
private void setAccountMailboxInfo(Context context, long accountId, long mailboxId) {
|
||||
@VisibleForTesting
|
||||
void setAccountMailboxInfo(Context context, long accountId, long mailboxId) {
|
||||
mAccountId = accountId;
|
||||
mMailboxId = mailboxId;
|
||||
|
||||
|
|
@ -504,7 +506,9 @@ public class AccountSelectorAdapter extends CursorAdapter {
|
|||
// We need to treat ACCOUNT_ID_COMBINED_VIEW specially...
|
||||
mAccountExists = true;
|
||||
mAccountDisplayName = getCombinedViewDisplayName(context);
|
||||
setCombinedMailboxInfo(context, mailboxId);
|
||||
if (mailboxId != Mailbox.NO_MAILBOX) {
|
||||
setCombinedMailboxInfo(context, mailboxId);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -551,8 +555,8 @@ public class AccountSelectorAdapter extends CursorAdapter {
|
|||
mMailboxDisplayName = FolderProperties.getInstance(context)
|
||||
.getCombinedMailboxName(mMailboxId);
|
||||
|
||||
mMailboxMessageCount = FolderProperties.getInstance(context)
|
||||
.getMessageCountForCombinedMailbox(mailboxId);
|
||||
mMailboxMessageCount = FolderProperties.getMessageCountForCombinedMailbox(
|
||||
context, mailboxId);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -472,7 +472,7 @@ class MailboxFragmentAdapter extends CursorAdapter {
|
|||
if (id >= 0) {
|
||||
throw new IllegalArgumentException(); // Must be QUERY_ALL_*, which are all negative
|
||||
}
|
||||
int count = FolderProperties.getInstance(context).getMessageCountForCombinedMailbox(id);
|
||||
int count = FolderProperties.getMessageCountForCombinedMailbox(context, id);
|
||||
if (showAlways || (count > 0)) {
|
||||
addMailboxRow(
|
||||
cursor, id, "", mailboxType, count, count, ROW_TYPE_MAILBOX, Mailbox.FLAG_NONE,
|
||||
|
|
|
|||
|
|
@ -1,75 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2010 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.email.activity;
|
||||
|
||||
import com.android.email.DBTestHelper;
|
||||
import com.android.email.provider.ProviderTestUtils;
|
||||
import com.android.emailcommon.provider.Account;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.Loader;
|
||||
import android.database.Cursor;
|
||||
import android.test.LoaderTestCase;
|
||||
|
||||
/**
|
||||
* Tests for {@link AccountSelectorAdapter.AccountsLoader}.
|
||||
*
|
||||
* TODO add more tests.
|
||||
*/
|
||||
public class AccountSelectorAdapterAccountsLoaderTest extends LoaderTestCase {
|
||||
private Context mProviderContext;
|
||||
|
||||
@Override
|
||||
protected void setUp() throws Exception {
|
||||
super.setUp();
|
||||
mProviderContext = DBTestHelper.ProviderContextSetupHelper.getProviderContext(mContext);
|
||||
}
|
||||
|
||||
/**
|
||||
* - Confirm that AccountsLoader adds the combined view row, iif there is more than 1 account.
|
||||
* - Confirm that AccountsLoader doesn't add recent mailboxes.
|
||||
*
|
||||
* two-pane version.
|
||||
*
|
||||
* TODO add one-pane version
|
||||
*/
|
||||
public void testCombinedViewRow_twoPane() {
|
||||
final Account a1 = ProviderTestUtils.setupAccount("a1", true, mProviderContext);
|
||||
{
|
||||
// Only 1 account -- no combined view row.
|
||||
Loader<Cursor> l = new AccountSelectorAdapter.AccountsLoader(mProviderContext, 0L,
|
||||
0L, true);
|
||||
AccountSelectorAdapter.CursorWithExtras result =
|
||||
(AccountSelectorAdapter.CursorWithExtras) getLoaderResultSynchronously(l);
|
||||
assertEquals(1, result.getAccountCount());
|
||||
assertEquals(2, result.getCount()); // +1 as the cursor has the header row
|
||||
assertEquals(0, result.getRecentMailboxCount()); // No recent on two-pane.
|
||||
}
|
||||
|
||||
final Account a2 = ProviderTestUtils.setupAccount("a2", true, mProviderContext);
|
||||
{
|
||||
// 2 accounts -- with combined view row, so returns 3 account rows.
|
||||
Loader<Cursor> l = new AccountSelectorAdapter.AccountsLoader(mProviderContext, 0L,
|
||||
0L, true);
|
||||
AccountSelectorAdapter.CursorWithExtras result =
|
||||
(AccountSelectorAdapter.CursorWithExtras) getLoaderResultSynchronously(l);
|
||||
assertEquals(3, result.getAccountCount());
|
||||
assertEquals(4, result.getCount()); // +1 as the cursor has the header row
|
||||
assertEquals(0, result.getRecentMailboxCount()); // No recent on two-pane.
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,185 @@
|
|||
/*
|
||||
* Copyright (C) 2010 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.email.activity;
|
||||
|
||||
import com.android.email.DBTestHelper;
|
||||
import com.android.email.FolderProperties;
|
||||
import com.android.email.R;
|
||||
import com.android.email.provider.ProviderTestUtils;
|
||||
import com.android.emailcommon.provider.Account;
|
||||
import com.android.emailcommon.provider.Mailbox;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.Loader;
|
||||
import android.database.Cursor;
|
||||
import android.database.MatrixCursor;
|
||||
import android.test.LoaderTestCase;
|
||||
|
||||
/**
|
||||
* Tests for {@link AccountSelectorAdapter.AccountsLoader}.
|
||||
*
|
||||
* TODO add more tests.
|
||||
*/
|
||||
public class AccountSelectorAdapterTest extends LoaderTestCase {
|
||||
private Context mProviderContext;
|
||||
|
||||
@Override
|
||||
protected void setUp() throws Exception {
|
||||
super.setUp();
|
||||
mProviderContext = DBTestHelper.ProviderContextSetupHelper.getProviderContext(mContext);
|
||||
}
|
||||
|
||||
/**
|
||||
* - Confirm that AccountsLoader adds the combined view row, iif there is more than 1 account.
|
||||
* - Confirm that AccountsLoader doesn't add recent mailboxes.
|
||||
*
|
||||
* two-pane version.
|
||||
*
|
||||
* TODO add one-pane version
|
||||
*/
|
||||
public void testCombinedViewRow_twoPane() {
|
||||
final Account a1 = ProviderTestUtils.setupAccount("a1", true, mProviderContext);
|
||||
{
|
||||
// Only 1 account -- no combined view row.
|
||||
Loader<Cursor> l = new AccountSelectorAdapter.AccountsLoader(mProviderContext, 0L,
|
||||
0L, true);
|
||||
AccountSelectorAdapter.CursorWithExtras result =
|
||||
(AccountSelectorAdapter.CursorWithExtras) getLoaderResultSynchronously(l);
|
||||
assertEquals(1, result.getAccountCount());
|
||||
assertEquals(2, result.getCount()); // +1 as the cursor has the header row
|
||||
assertEquals(0, result.getRecentMailboxCount()); // No recent on two-pane.
|
||||
}
|
||||
|
||||
final Account a2 = ProviderTestUtils.setupAccount("a2", true, mProviderContext);
|
||||
{
|
||||
// 2 accounts -- with combined view row, so returns 3 account rows.
|
||||
Loader<Cursor> l = new AccountSelectorAdapter.AccountsLoader(mProviderContext, 0L,
|
||||
0L, true);
|
||||
AccountSelectorAdapter.CursorWithExtras result =
|
||||
(AccountSelectorAdapter.CursorWithExtras) getLoaderResultSynchronously(l);
|
||||
assertEquals(3, result.getAccountCount());
|
||||
assertEquals(4, result.getCount()); // +1 as the cursor has the header row
|
||||
assertEquals(0, result.getRecentMailboxCount()); // No recent on two-pane.
|
||||
}
|
||||
}
|
||||
|
||||
private static AccountSelectorAdapter.CursorWithExtras createCursorWithExtras() {
|
||||
final MatrixCursor m = new MatrixCursor(new String[] {"column"});
|
||||
return new AccountSelectorAdapter.CursorWithExtras(m.getColumnNames(), m);
|
||||
}
|
||||
|
||||
public void testCursorWithExtras_setAccountMailboxInfo() {
|
||||
final Context context = mProviderContext;
|
||||
final Account a1 = ProviderTestUtils.setupAccount("a1", true, context);
|
||||
final Account a2 = ProviderTestUtils.setupAccount("a2", true, context);
|
||||
final Mailbox m1 = ProviderTestUtils.setupMailbox("Inbox", a1.mId, true, context,
|
||||
Mailbox.TYPE_INBOX);
|
||||
final Mailbox m2 = ProviderTestUtils.setupMailbox("box2", a2.mId, true, context,
|
||||
Mailbox.TYPE_MAIL);
|
||||
addMessage(m1, true, false);
|
||||
addMessage(m2, false, false);
|
||||
addMessage(m2, false, false);
|
||||
addMessage(m2, true, true);
|
||||
|
||||
// Account 1 - no mailbox
|
||||
AccountSelectorAdapter.CursorWithExtras c = createCursorWithExtras();
|
||||
c.setAccountMailboxInfo(context, a1.mId, Mailbox.NO_MAILBOX);
|
||||
|
||||
assertTrue(c.accountExists());
|
||||
assertEquals(a1.mId, c.getAccountId());
|
||||
assertEquals("a1", c.getAccountDisplayName());
|
||||
assertEquals(Mailbox.NO_MAILBOX, c.getMailboxId());
|
||||
assertNull(c.getMailboxDisplayName());
|
||||
assertEquals(0, c.getMailboxMessageCount());
|
||||
|
||||
// Account 1 - inbox
|
||||
c = createCursorWithExtras();
|
||||
c.setAccountMailboxInfo(context, a1.mId, m1.mId);
|
||||
|
||||
assertTrue(c.accountExists());
|
||||
assertEquals(a1.mId, c.getAccountId());
|
||||
assertEquals("a1", c.getAccountDisplayName());
|
||||
assertEquals(m1.mId, c.getMailboxId());
|
||||
assertEquals("Inbox", c.getMailboxDisplayName());
|
||||
assertEquals(1, c.getMailboxMessageCount());
|
||||
|
||||
// Account 2 - regular mailbox
|
||||
c = createCursorWithExtras();
|
||||
c.setAccountMailboxInfo(context, a2.mId, m2.mId);
|
||||
|
||||
assertTrue(c.accountExists());
|
||||
assertEquals(a2.mId, c.getAccountId());
|
||||
assertEquals("a2", c.getAccountDisplayName());
|
||||
assertEquals(m2.mId, c.getMailboxId());
|
||||
assertEquals("box2", c.getMailboxDisplayName());
|
||||
assertEquals(2, c.getMailboxMessageCount());
|
||||
|
||||
// combined - no mailbox
|
||||
c = createCursorWithExtras();
|
||||
c.setAccountMailboxInfo(context, Account.ACCOUNT_ID_COMBINED_VIEW, Mailbox.NO_MAILBOX);
|
||||
|
||||
assertTrue(c.accountExists());
|
||||
assertEquals(Account.ACCOUNT_ID_COMBINED_VIEW, c.getAccountId());
|
||||
assertEquals(getContext().getString(R.string.mailbox_list_account_selector_combined_view),
|
||||
c.getAccountDisplayName());
|
||||
assertEquals(Mailbox.NO_MAILBOX, c.getMailboxId());
|
||||
assertNull(c.getMailboxDisplayName());
|
||||
assertEquals(0, c.getMailboxMessageCount());
|
||||
|
||||
// combined - all inbox
|
||||
c = createCursorWithExtras();
|
||||
c.setAccountMailboxInfo(context, Account.ACCOUNT_ID_COMBINED_VIEW,
|
||||
Mailbox.QUERY_ALL_INBOXES);
|
||||
|
||||
assertTrue(c.accountExists());
|
||||
assertEquals(Account.ACCOUNT_ID_COMBINED_VIEW, c.getAccountId());
|
||||
assertEquals(getContext().getString(R.string.mailbox_list_account_selector_combined_view),
|
||||
c.getAccountDisplayName());
|
||||
assertEquals(Mailbox.QUERY_ALL_INBOXES, c.getMailboxId());
|
||||
assertEquals(getContext().getString(R.string.account_folder_list_summary_inbox),
|
||||
c.getMailboxDisplayName());
|
||||
// (message count = 1, because account 2 doesn't have inbox)
|
||||
|
||||
// TODO For some reason getMailboxMessageCount returns 0 in tests. Investigate it.
|
||||
// assertEquals(1, c.getMailboxMessageCount());
|
||||
|
||||
// Account 1 - all starred
|
||||
// Special case; it happens when you open "starred" on a normal account's mailbox list
|
||||
// on two-pane.
|
||||
c = createCursorWithExtras();
|
||||
c.setAccountMailboxInfo(context, a1.mId, Mailbox.QUERY_ALL_FAVORITES);
|
||||
|
||||
assertTrue(c.accountExists());
|
||||
assertEquals(a1.mId, c.getAccountId());
|
||||
assertEquals("a1", c.getAccountDisplayName());
|
||||
assertEquals(Mailbox.QUERY_ALL_FAVORITES, c.getMailboxId());
|
||||
assertEquals(getContext().getString(R.string.account_folder_list_summary_starred),
|
||||
c.getMailboxDisplayName());
|
||||
// assertEquals(2, c.getMailboxMessageCount());
|
||||
|
||||
// Invalid id
|
||||
c = createCursorWithExtras();
|
||||
c.setAccountMailboxInfo(context, 123456, 1232456); // no such account / mailbox
|
||||
|
||||
assertFalse(c.accountExists());
|
||||
}
|
||||
|
||||
private void addMessage(Mailbox m, boolean starred, boolean read) {
|
||||
ProviderTestUtils.setupMessage("a", m.mAccountKey, m.mId, false, true, mProviderContext,
|
||||
starred, read);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue