From 9d2703c376d2ee7501ed78be8c962203fbfd098f Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Mon, 25 Mar 2013 12:32:48 +0100 Subject: Added support for charset conversion with ICU (thanks to Mehmet Bozkurt). --- tests/parser/charsetFilteredOutputStreamTest.cpp | 10 ++++++++++ tests/parser/charsetTest.cpp | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'tests/parser') diff --git a/tests/parser/charsetFilteredOutputStreamTest.cpp b/tests/parser/charsetFilteredOutputStreamTest.cpp index 08eeb63c..92c7a595 100644 --- a/tests/parser/charsetFilteredOutputStreamTest.cpp +++ b/tests/parser/charsetFilteredOutputStreamTest.cpp @@ -49,6 +49,8 @@ VMIME_TEST_SUITE_BEGIN(charsetFilteredOutputStreamTest) vmime::utility::outputStreamStringAdapter os(output); vmime::ref cfos = cc->getFilteredOutputStream(os); + VASSERT_NOT_NULL("filteredOutputStream availability", cfos); + // føo = 66 c3 b8 6f [UTF8] // føo = 66 c3 b8 6f [latin1] @@ -79,6 +81,8 @@ VMIME_TEST_SUITE_BEGIN(charsetFilteredOutputStreamTest) vmime::ref os = conv->getFilteredOutputStream(osa); + VASSERT_NOT_NULL("filteredOutputStream availability", os); + vmime::utility::inputStreamStringAdapter is(in); vmime::utility::stream::value_type buffer[16]; @@ -116,6 +120,8 @@ VMIME_TEST_SUITE_BEGIN(charsetFilteredOutputStreamTest) vmime::ref os = conv->getFilteredOutputStream(osa); + VASSERT_NOT_NULL("filteredOutputStream availability", os); + vmime::utility::inputStreamStringAdapter is(in); vmime::utility::bufferedStreamCopy(is, *os); @@ -151,6 +157,8 @@ VMIME_TEST_SUITE_BEGIN(charsetFilteredOutputStreamTest) vmime::ref os = conv->getFilteredOutputStream(osa); + VASSERT_NOT_NULL("filteredOutputStream availability", os); + vmime::utility::inputStreamStringAdapter is(in); vmime::utility::stream::value_type buffer[16]; @@ -189,6 +197,8 @@ VMIME_TEST_SUITE_BEGIN(charsetFilteredOutputStreamTest) vmime::ref os = conv->getFilteredOutputStream(osa); + VASSERT_NOT_NULL("filteredOutputStream availability", os); + vmime::utility::inputStreamStringAdapter is(in); vmime::utility::stream::value_type buffer[16]; diff --git a/tests/parser/charsetTest.cpp b/tests/parser/charsetTest.cpp index 2aab7550..915b8560 100644 --- a/tests/parser/charsetTest.cpp +++ b/tests/parser/charsetTest.cpp @@ -141,7 +141,8 @@ VMIME_TEST_SUITE_BEGIN(charsetTest) void testUTF7Support() { // Ensure UTF-7 is supported, because it is used for IMAP - VASSERT_EQ("1", "VMime +ACY UTF-7 encoding", convertHelper("VMime & UTF-7 encoding", "utf-8", "utf-7")); + VASSERT_EQ("1", "VMime +- UTF-7 encoding", convertHelper("VMime + UTF-7 encoding", "utf-8", "utf-7")); + VASSERT_EQ("2", "f+APg-o", convertHelper("\x66\xc3\xb8\x6f", "utf-8", "utf-7")); } VMIME_TEST_SUITE_END -- cgit