diff options
author | Scott Mertz <scott@cyngn.com> | 2015-05-27 17:36:58 -0700 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2016-12-30 20:15:20 +0200 |
commit | 60ed0c8f09c204bcaf36e9eebfe5e5d8358d112d (patch) | |
tree | 9751f9099db4381fb925ca409f6d33d791656921 /tests | |
parent | 6991e08a79f65908595b3d708f79f21cfa46712e (diff) | |
download | android_packages_apps_Email-60ed0c8f09c204bcaf36e9eebfe5e5d8358d112d.tar.gz android_packages_apps_Email-60ed0c8f09c204bcaf36e9eebfe5e5d8358d112d.tar.bz2 android_packages_apps_Email-60ed0c8f09c204bcaf36e9eebfe5e5d8358d112d.zip |
EmailTests: fix api change
Change-Id: I170478bb91d847ba9d42515c5d5c29a92f3765dc
Diffstat (limited to 'tests')
3 files changed, 13 insertions, 13 deletions
diff --git a/tests/src/com/android/email/LegacyConversionsTests.java b/tests/src/com/android/email/LegacyConversionsTests.java index 82f333ae7..b91fbd095 100644 --- a/tests/src/com/android/email/LegacyConversionsTests.java +++ b/tests/src/com/android/email/LegacyConversionsTests.java @@ -388,7 +388,7 @@ public class LegacyConversionsTests extends ProviderTestCase2<EmailProvider> { String get1Text = null; String get1Html = null; for (Part viewable : viewables) { - String text = MimeUtility.getTextFromPart(viewable); + String text = MimeUtility.getTextFromPart(viewable, true); if (viewable.getMimeType().equalsIgnoreCase("text/html")) { get1Html = text; } else { diff --git a/tests/src/com/android/email/mail/store/ImapStoreUnitTests.java b/tests/src/com/android/email/mail/store/ImapStoreUnitTests.java index 5e9efe617..1cb747ec3 100644 --- a/tests/src/com/android/email/mail/store/ImapStoreUnitTests.java +++ b/tests/src/com/android/email/mail/store/ImapStoreUnitTests.java @@ -1105,7 +1105,7 @@ public class ImapStoreUnitTests extends InstrumentationTestCase { MimeUtility.collectParts(message1, viewables, attachments); assertTrue(viewables.size() == 1); emptyBodyPart = viewables.get(0); - String text = MimeUtility.getTextFromPart(emptyBodyPart); + String text = MimeUtility.getTextFromPart(emptyBodyPart, true); assertNull(text); } diff --git a/tests/src/com/android/emailcommon/internet/MimeUtilityTest.java b/tests/src/com/android/emailcommon/internet/MimeUtilityTest.java index d05220ea0..db254a1ab 100644 --- a/tests/src/com/android/emailcommon/internet/MimeUtilityTest.java +++ b/tests/src/com/android/emailcommon/internet/MimeUtilityTest.java @@ -369,19 +369,19 @@ public class MimeUtilityTest extends TestCase { // 1. test basic text/plain mode p.setHeader(MimeHeader.HEADER_CONTENT_TYPE, "text/plain"); p.setBody(tb); - String gotText = MimeUtility.getTextFromPart(p); + String gotText = MimeUtility.getTextFromPart(p, true); assertEquals(theText, gotText); // 2. mixed case is OK p.setHeader(MimeHeader.HEADER_CONTENT_TYPE, "TEXT/PLAIN"); p.setBody(tb); - gotText = MimeUtility.getTextFromPart(p); + gotText = MimeUtility.getTextFromPart(p, true); assertEquals(theText, gotText); // 3. wildcards OK p.setHeader(MimeHeader.HEADER_CONTENT_TYPE, "text/other"); p.setBody(tb); - gotText = MimeUtility.getTextFromPart(p); + gotText = MimeUtility.getTextFromPart(p, true); assertEquals(theText, gotText); } @@ -411,13 +411,13 @@ public class MimeUtilityTest extends TestCase { p.setBody(tb); // We call setHeader after setBody, since setBody overwrites Content-Type p.setHeader(MimeHeader.HEADER_CONTENT_TYPE, "text/html; charset=utf-8"); - gotText = MimeUtility.getTextFromPart(p); + gotText = MimeUtility.getTextFromPart(p, true); assertTrue(MimeUtility.mimeTypeMatches(p.getMimeType(), "text/html")); assertEquals(UNICODE_EXPECT, gotText); p.setBody(tb); p.setHeader(MimeHeader.HEADER_CONTENT_TYPE, "text/html; charset=windows-1252"); - gotText = MimeUtility.getTextFromPart(p); + gotText = MimeUtility.getTextFromPart(p, true); assertTrue(MimeUtility.mimeTypeMatches(p.getMimeType(), "text/html")); assertEquals(WINDOWS1252_EXPECT, gotText); @@ -425,14 +425,14 @@ public class MimeUtilityTest extends TestCase { p.setBody(tb); p.setHeader(MimeHeader.HEADER_CONTENT_TYPE, "text/html; prop1 = \"test\"; charset = \"utf-8\"; prop2 = \"test\""); - gotText = MimeUtility.getTextFromPart(p); + gotText = MimeUtility.getTextFromPart(p, true); assertTrue(MimeUtility.mimeTypeMatches(p.getMimeType(), "text/html")); assertEquals(UNICODE_EXPECT, gotText); p.setBody(tb); p.setHeader(MimeHeader.HEADER_CONTENT_TYPE, "text/html; prop1 = \"test\"; charset = \"windows-1252\"; prop2 = \"test\""); - gotText = MimeUtility.getTextFromPart(p); + gotText = MimeUtility.getTextFromPart(p, true); assertTrue(MimeUtility.mimeTypeMatches(p.getMimeType(), "text/html")); assertEquals(WINDOWS1252_EXPECT, gotText); @@ -442,13 +442,13 @@ public class MimeUtilityTest extends TestCase { p.setBody(tb); p.setHeader(MimeHeader.HEADER_CONTENT_TYPE, "TEXT/HtmL ; CHARseT=utf-8"); - gotText = MimeUtility.getTextFromPart(p); + gotText = MimeUtility.getTextFromPart(p, true); assertTrue(MimeUtility.mimeTypeMatches(p.getMimeType(), "text/html")); assertEquals(UNICODE_EXPECT, gotText); p.setBody(tb); p.setHeader(MimeHeader.HEADER_CONTENT_TYPE, "TEXT/HtmL ; CHARseT=windows-1252"); - gotText = MimeUtility.getTextFromPart(p); + gotText = MimeUtility.getTextFromPart(p, true); assertTrue(MimeUtility.mimeTypeMatches(p.getMimeType(), "text/html")); assertEquals(WINDOWS1252_EXPECT, gotText); @@ -459,7 +459,7 @@ public class MimeUtilityTest extends TestCase { p.setBody(tb); p.setHeader(MimeHeader.HEADER_CONTENT_TYPE, "text/html; charset=utf-8 (Plain text)"); - gotText = MimeUtility.getTextFromPart(p); + gotText = MimeUtility.getTextFromPart(p, true); assertTrue(MimeUtility.mimeTypeMatches(p.getMimeType(), "text/html")); // Note: This test does not pass. //assertEquals(UNICODE_EXPECT, gotText); @@ -467,7 +467,7 @@ public class MimeUtilityTest extends TestCase { p.setBody(tb); p.setHeader(MimeHeader.HEADER_CONTENT_TYPE, "text/html; charset=windows-1252 (Plain text)"); - gotText = MimeUtility.getTextFromPart(p); + gotText = MimeUtility.getTextFromPart(p, true); assertTrue(MimeUtility.mimeTypeMatches(p.getMimeType(), "text/html")); // Note: These tests does not pass. //assertEquals(WINDOWS1252_EXPECT, gotText); |