diff options
author | Andy Huang <ath@google.com> | 2012-11-21 15:33:17 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-21 15:33:17 -0800 |
commit | 12ec6a3dbd5593f600c6c2bb5eb7bdfc9ffb121a (patch) | |
tree | 4de3eaafee794d81de633646c9af5b161e5adbde /tests/src | |
parent | 30cda4fdef8040cb02c5f474168864bd7b6fbb2f (diff) | |
parent | 74832489d1740ca381ad996d8e52b415cae46656 (diff) | |
download | android_packages_apps_UnifiedEmail-12ec6a3dbd5593f600c6c2bb5eb7bdfc9ffb121a.tar.gz android_packages_apps_UnifiedEmail-12ec6a3dbd5593f600c6c2bb5eb7bdfc9ffb121a.tar.bz2 android_packages_apps_UnifiedEmail-12ec6a3dbd5593f600c6c2bb5eb7bdfc9ffb121a.zip |
am 74832489: Merge "sanitize user input in Conversation/MessageInfo" into jb-ub-mail
* commit '74832489d1740ca381ad996d8e52b415cae46656':
sanitize user input in Conversation/MessageInfo
Diffstat (limited to 'tests/src')
-rw-r--r-- | tests/src/com/android/mail/browse/SendersFormattingTests.java | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/tests/src/com/android/mail/browse/SendersFormattingTests.java b/tests/src/com/android/mail/browse/SendersFormattingTests.java index dec742c43..a4d9881a9 100644 --- a/tests/src/com/android/mail/browse/SendersFormattingTests.java +++ b/tests/src/com/android/mail/browse/SendersFormattingTests.java @@ -18,6 +18,7 @@ package com.android.mail.browse; import android.test.AndroidTestCase; +import android.test.suitebuilder.annotation.SmallTest; import android.text.SpannableString; import com.android.mail.providers.ConversationInfo; @@ -25,6 +26,7 @@ import com.android.mail.providers.MessageInfo; import com.google.android.common.html.parser.HtmlParser; import com.google.android.common.html.parser.HtmlTreeBuilder; +@SmallTest public class SendersFormattingTests extends AndroidTestCase { private static ConversationInfo createConversationInfo(int count) { @@ -85,4 +87,40 @@ public class SendersFormattingTests extends AndroidTestCase { } assertEquals(1, count); } + + public void testSenderNameBadInput() { + final ConversationInfo conv = createConversationInfo(1); + final MessageInfo msg = new MessageInfo(false, false, "****^****", 0); + conv.addMessage(msg); + + final String serialized = ConversationInfo.toString(conv); + + ConversationInfo conv2 = ConversationInfo.fromString(serialized); + assertEquals(1, conv2.messageInfos.size()); + assertEquals(msg.sender, conv2.messageInfos.get(0).sender); + } + + public void testConversationSnippetsBadInput() { + final String firstSnippet = "*^*"; + final String firstUnreadSnippet = "*^*^*"; + final String lastSnippet = "*^*^*^*"; + + final ConversationInfo conv = new ConversationInfo(42, 49, firstSnippet, firstUnreadSnippet, + lastSnippet); + final MessageInfo msg = new MessageInfo(false, false, "Foo Bar", 0); + conv.addMessage(msg); + + assertEquals(firstSnippet, conv.firstSnippet); + assertEquals(firstUnreadSnippet, conv.firstUnreadSnippet); + assertEquals(lastSnippet, conv.lastSnippet); + + final String serialized = ConversationInfo.toString(conv); + + ConversationInfo conv2 = ConversationInfo.fromString(serialized); + + assertEquals(conv.firstSnippet, conv2.firstSnippet); + assertEquals(conv.firstUnreadSnippet, conv2.firstUnreadSnippet); + assertEquals(conv.lastSnippet, conv2.lastSnippet); + } + } |