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

Fix unit tests

Browse Source 
bug: 4361079
Change-Id: I4463187e4b7b6cc6b9c9e6bce5f4c1d690f52a79
This commit is contained in:
Todd Kennedy 2011-04-28 17:22:23 -07:00
parent 688f5355e3
commit 347d06015e
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proguard.flags
View File

@ -192,7 +192,7 @@
*** getBody(); *** getBody();
} }
-keepclasseswithmembers class com.android.email.mail.FolderProperties { -keepclasseswithmembers class com.android.email.FolderProperties {
*** getDisplayName(int); *** getDisplayName(int);
} }

37
tests/src/com/android/email/mail/store/ImapStoreUnitTests.java
View File

@ -79,15 +79,15 @@ import java.util.regex.Pattern;
public class ImapStoreUnitTests extends InstrumentationTestCase { public class ImapStoreUnitTests extends InstrumentationTestCase {
private final static String[] NO_REPLY = new String[0]; private final static String[] NO_REPLY = new String[0];
/** /** Default folder name. In order to test for encoding, we use a non-ascii name. */
* Default folder name. In order to test for encoding, we use a non-ascii name.
*/
private final static String FOLDER_NAME = "\u65E5"; private final static String FOLDER_NAME = "\u65E5";
/** Folder name encoded in UTF-7. */
/**
* Folder name encoded in UTF-7.
*/
private final static String FOLDER_ENCODED = "&ZeU-"; private final static String FOLDER_ENCODED = "&ZeU-";
/**
* Flag bits to specify whether or not a folder can be selected. This corresponds to
* {@link Mailbox#FLAG_ACCEPTS_MOVED_MAIL} and {@link Mailbox#FLAG_HOLDS_MAIL}.
*/
private final static int SELECTABLE_BITS = 0x18;
private final static ImapResponse CAPABILITY_RESPONSE = ImapTestUtils.parseResponse( private final static ImapResponse CAPABILITY_RESPONSE = ImapTestUtils.parseResponse(
"* CAPABILITY IMAP4rev1 STARTTLS"); "* CAPABILITY IMAP4rev1 STARTTLS");
@ -1254,16 +1254,23 @@ public class ImapStoreUnitTests extends InstrumentationTestCase {
getNextTag(true) + " oK SUCCESS" getNextTag(true) + " oK SUCCESS"
}); });
Folder[] folders = mStore.updateFolders(); Folder[] folders = mStore.updateFolders();
ImapFolder testFolder;
ArrayList<String> list = new ArrayList<String>(); testFolder = (ImapFolder) folders[0];
for (Folder f : folders) { assertEquals("INBOX", testFolder.getName());
list.add(f.getName()); assertEquals(SELECTABLE_BITS, testFolder.mMailbox.mFlags & SELECTABLE_BITS);
}
MoreAsserts.assertEquals(
new String[] {"INBOX", "\u65E5\u672C\u8A9E", "Drafts"},
list.toArray(new String[0])
);
testFolder = (ImapFolder) folders[1];
assertEquals("no select", testFolder.getName());
assertEquals(0, testFolder.mMailbox.mFlags & SELECTABLE_BITS);
testFolder = (ImapFolder) folders[2];
assertEquals("\u65E5\u672C\u8A9E", testFolder.getName());
assertEquals(SELECTABLE_BITS, testFolder.mMailbox.mFlags & SELECTABLE_BITS);
testFolder = (ImapFolder) folders[3];
assertEquals("Drafts", testFolder.getName());
assertEquals(SELECTABLE_BITS, testFolder.mMailbox.mFlags & SELECTABLE_BITS);
// TODO test with path prefix // TODO test with path prefix
// TODO: Test NO response. // TODO: Test NO response.
} }