From 347d06015e05e32f0a47ae09addb29af71bac074 Mon Sep 17 00:00:00 2001 From: Todd Kennedy Date: Thu, 28 Apr 2011 17:22:23 -0700 Subject: [PATCH] Fix unit tests bug: 4361079 Change-Id: I4463187e4b7b6cc6b9c9e6bce5f4c1d690f52a79 --- proguard.flags | 2 +- .../email/mail/store/ImapStoreUnitTests.java | 37 +++++++++++-------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/proguard.flags b/proguard.flags index b39a18242..b51383a2b 100644 --- a/proguard.flags +++ b/proguard.flags @@ -192,7 +192,7 @@ *** getBody(); } --keepclasseswithmembers class com.android.email.mail.FolderProperties { +-keepclasseswithmembers class com.android.email.FolderProperties { *** getDisplayName(int); } diff --git a/tests/src/com/android/email/mail/store/ImapStoreUnitTests.java b/tests/src/com/android/email/mail/store/ImapStoreUnitTests.java index 5c67d84e7..5f6506fe2 100644 --- a/tests/src/com/android/email/mail/store/ImapStoreUnitTests.java +++ b/tests/src/com/android/email/mail/store/ImapStoreUnitTests.java @@ -79,15 +79,15 @@ import java.util.regex.Pattern; public class ImapStoreUnitTests extends InstrumentationTestCase { 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"; - - /** - * Folder name encoded in UTF-7. - */ + /** Folder name encoded in UTF-7. */ 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( "* CAPABILITY IMAP4rev1 STARTTLS"); @@ -1254,16 +1254,23 @@ public class ImapStoreUnitTests extends InstrumentationTestCase { getNextTag(true) + " oK SUCCESS" }); Folder[] folders = mStore.updateFolders(); + ImapFolder testFolder; - ArrayList list = new ArrayList(); - for (Folder f : folders) { - list.add(f.getName()); - } - MoreAsserts.assertEquals( - new String[] {"INBOX", "\u65E5\u672C\u8A9E", "Drafts"}, - list.toArray(new String[0]) - ); + testFolder = (ImapFolder) folders[0]; + assertEquals("INBOX", testFolder.getName()); + assertEquals(SELECTABLE_BITS, testFolder.mMailbox.mFlags & SELECTABLE_BITS); + 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 NO response. }