9e2c6bd5f2
* Numerous classes modified to deal with this change * Fixes bugs 1993292 and 1994671 * Renamed various setter and getter methods to reflect the underlying field names * Renamed syncFrequency to syncInterval in Account and Mailbox * Convenience method added to AccountSettings to save only user settings * Calls to content.update(context, content.toContentValues()), which save all fields, should be double-checked for correctness, making sure that content has current data and will not conflict with other threads that might modify that data * Ran all unit tests to confirm proper function NOTE: The logic to enforce single default account no longer works, because that logic is in Account.save() and does not run via Account.update(). I have patched out a small section of the relevant unit test and will file a bug to come back for this fix.
154 lines
6.0 KiB
Java
154 lines
6.0 KiB
Java
/*
|
|
* Copyright (C) 2009 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;
|
|
|
|
import com.android.email.mail.Folder;
|
|
import com.android.email.mail.MockFolder;
|
|
import com.android.email.provider.EmailContent;
|
|
|
|
import android.content.ContentUris;
|
|
import android.content.Context;
|
|
import android.net.Uri;
|
|
import android.test.AndroidTestCase;
|
|
import android.test.suitebuilder.annotation.SmallTest;
|
|
|
|
/**
|
|
* This is a series of unit tests for the MessagingController class.
|
|
*
|
|
* Technically these are functional because they use the underlying provider framework.
|
|
*/
|
|
@SmallTest
|
|
public class MessagingControllerUnitTests extends AndroidTestCase {
|
|
|
|
private long mAccountId;
|
|
private EmailContent.Account mAccount;
|
|
|
|
/**
|
|
* Delete any dummy accounts we set up for this test
|
|
*/
|
|
@Override
|
|
protected void tearDown() throws Exception {
|
|
super.tearDown();
|
|
|
|
if (mAccount != null) {
|
|
Uri uri = ContentUris.withAppendedId(
|
|
EmailContent.Account.CONTENT_URI, mAccountId);
|
|
getContext().getContentResolver().delete(uri, null, null);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Test the code that copies server-supplied folder names into the account data
|
|
*
|
|
* TODO: custom folder naming is being re-implemented using folder types, and the notion
|
|
* of saving the names in the Account will probably go away. This test should be replaced
|
|
* by an equivalent test, once there is a new implementation to look at.
|
|
*/
|
|
public void disabled_testUpdateAccountFolderNames() {
|
|
MessagingController mc = MessagingController.getInstance(getContext());
|
|
// Create a dummy account
|
|
createTestAccount();
|
|
// Refresh it to fill in all fields (many will have default values)
|
|
mAccount.refresh(getContext());
|
|
|
|
// Replace one entry, others are not included
|
|
Folder[] folders1 = new Folder[] {
|
|
new MyMockFolder(Folder.FolderRole.DRAFTS, "DRAFTS_1"),
|
|
};
|
|
mc.updateAccountFolderNames(mAccount, folders1);
|
|
checkServerFolderNames("folders1", mAccount, "DRAFTS_1", "Sent", "Trash", "Outbox");
|
|
|
|
// test that the data is shared across multiple account instantiations
|
|
EmailContent.Account account2 = EmailContent.Account.
|
|
restoreAccountWithId(getContext(), mAccountId);
|
|
checkServerFolderNames("folders1-2", account2, "DRAFTS_1", "Sent", "Trash", "Outbox");
|
|
|
|
// Replace one entry, others are included but called out as unknown
|
|
Folder[] folders2 = new Folder[] {
|
|
new MyMockFolder(Folder.FolderRole.UNKNOWN, "DRAFTS_2"),
|
|
new MyMockFolder(Folder.FolderRole.SENT, "SENT_2"),
|
|
new MyMockFolder(Folder.FolderRole.UNKNOWN, "TRASH_2"),
|
|
new MyMockFolder(Folder.FolderRole.UNKNOWN, "OUTBOX_2"),
|
|
};
|
|
mc.updateAccountFolderNames(mAccount, folders2);
|
|
checkServerFolderNames("folders2", mAccount, "DRAFTS_1", "SENT_2", "Trash", "Outbox");
|
|
|
|
// test that the data is shared across multiple account instantiations
|
|
account2 = EmailContent.Account.restoreAccountWithId(getContext(), mAccountId);
|
|
checkServerFolderNames("folders2-2", account2, "DRAFTS_1", "SENT_2", "Trash", "Outbox");
|
|
|
|
// Replace one entry, check that "other" is ignored, check that Outbox is ignored
|
|
Folder[] folders3 = new Folder[] {
|
|
new MyMockFolder(Folder.FolderRole.OTHER, "OTHER_3a"),
|
|
new MyMockFolder(Folder.FolderRole.TRASH, "TRASH_3"),
|
|
new MyMockFolder(Folder.FolderRole.OTHER, "OTHER_3b"),
|
|
new MyMockFolder(Folder.FolderRole.OUTBOX, "OUTBOX_3"),
|
|
};
|
|
mc.updateAccountFolderNames(mAccount, folders3);
|
|
checkServerFolderNames("folders3", mAccount, "DRAFTS_1", "SENT_2", "TRASH_3", "Outbox");
|
|
|
|
// test that the data is shared across multiple account instantiations
|
|
account2 = EmailContent.Account.restoreAccountWithId(getContext(), mAccountId);
|
|
checkServerFolderNames("folders3-2", account2, "DRAFTS_1", "SENT_2", "TRASH_3", "Outbox");
|
|
}
|
|
|
|
/**
|
|
* Quickly check all four folder name slots in mAccount
|
|
*/
|
|
private void checkServerFolderNames(String diagnostic, EmailContent.Account account,
|
|
String drafts, String sent, String trash, String outbox) {
|
|
Context context = getContext();
|
|
assertEquals(diagnostic, drafts, account.getDraftsFolderName(context));
|
|
assertEquals(diagnostic, sent, account.getSentFolderName(context));
|
|
assertEquals(diagnostic, trash, account.getTrashFolderName(context));
|
|
assertEquals(diagnostic, outbox, account.getOutboxFolderName(context));
|
|
}
|
|
|
|
/**
|
|
* MockFolder allows setting and retrieving role & name
|
|
*/
|
|
private static class MyMockFolder extends MockFolder {
|
|
private FolderRole mRole;
|
|
private String mName;
|
|
|
|
public MyMockFolder(FolderRole role, String name) {
|
|
mRole = role;
|
|
mName = name;
|
|
}
|
|
|
|
public String getName() {
|
|
return mName;
|
|
}
|
|
|
|
@Override
|
|
public FolderRole getRole() {
|
|
return mRole;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Create a dummy account with minimal fields
|
|
*/
|
|
private void createTestAccount() {
|
|
mAccount = new EmailContent.Account();
|
|
mAccount.save(getContext());
|
|
|
|
mAccountId = mAccount.mId;
|
|
}
|
|
|
|
}
|