diff options
author | Zennoe <agrar.pfurtz@gmail.com> | 2017-06-07 23:32:03 +0200 |
---|---|---|
committer | Harry Youd <harry@harryyoud.co.uk> | 2017-06-08 08:16:11 +0000 |
commit | ea4eb75bf2ea04cb2985275e7d1478114fa286c3 (patch) | |
tree | 52cf15bb0dec256491fcc63cb37e8159fce2776c | |
parent | b76ada5c52890087d42258d80e664ccbedeeb116 (diff) | |
download | android_packages_apps_Email-ea4eb75bf2ea04cb2985275e7d1478114fa286c3.tar.gz android_packages_apps_Email-ea4eb75bf2ea04cb2985275e7d1478114fa286c3.tar.bz2 android_packages_apps_Email-ea4eb75bf2ea04cb2985275e7d1478114fa286c3.zip |
Adjust Email UnitTests to e353ae2ea19c9ea800d10b37e05de7b0ea1aeeb4
The mentioned commit changed the parameter type expected by getTextFromPart(Part part, boolean closeInput) to getTextFromPart(Part part, ArrayList<InputStream> outInputStreams).
Instead of setting closeInput to true we now have to provide a null object, if we want new input streams to be closed after use.
This commit adjusts the UnitTests to the new behaviour.
Change-Id: I6e8196c73e275ff17c06e79b7ed2f64d73f8e9cf
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 b91fbd095..27775ab69 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, true); + String text = MimeUtility.getTextFromPart(viewable, null); 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 1cb747ec3..4450f1881 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, true); + String text = MimeUtility.getTextFromPart(emptyBodyPart, null); assertNull(text); } diff --git a/tests/src/com/android/emailcommon/internet/MimeUtilityTest.java b/tests/src/com/android/emailcommon/internet/MimeUtilityTest.java index db254a1ab..24ea0633e 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, true); + String gotText = MimeUtility.getTextFromPart(p, null); assertEquals(theText, gotText); // 2. mixed case is OK p.setHeader(MimeHeader.HEADER_CONTENT_TYPE, "TEXT/PLAIN"); p.setBody(tb); - gotText = MimeUtility.getTextFromPart(p, true); + gotText = MimeUtility.getTextFromPart(p, null); assertEquals(theText, gotText); // 3. wildcards OK p.setHeader(MimeHeader.HEADER_CONTENT_TYPE, "text/other"); p.setBody(tb); - gotText = MimeUtility.getTextFromPart(p, true); + gotText = MimeUtility.getTextFromPart(p, null); 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, true); + gotText = MimeUtility.getTextFromPart(p, null); 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, true); + gotText = MimeUtility.getTextFromPart(p, null); 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, true); + gotText = MimeUtility.getTextFromPart(p, null); 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, true); + gotText = MimeUtility.getTextFromPart(p, null); 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, true); + gotText = MimeUtility.getTextFromPart(p, null); 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, true); + gotText = MimeUtility.getTextFromPart(p, null); 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, true); + gotText = MimeUtility.getTextFromPart(p, null); 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, true); + gotText = MimeUtility.getTextFromPart(p, null); assertTrue(MimeUtility.mimeTypeMatches(p.getMimeType(), "text/html")); // Note: These tests does not pass. //assertEquals(WINDOWS1252_EXPECT, gotText); |