diff options
44 files changed, 316 insertions, 353 deletions
@@ -346,7 +346,8 @@ libvmime_tests = [ ] libvmimetest_common = [ - 'tests/testUtils.hpp' + 'tests/testUtils.hpp', + 'tests/utility/encoder/encoderTestUtils.hpp' ] libvmimetest_sources = [ @@ -378,7 +379,8 @@ libvmimetest_sources = [ 'tests/utility/pathTest.cpp', 'tests/utility/urlTest.cpp', 'tests/utility/smartPtrTest.cpp', - 'tests/utility/encoderTest.cpp', + 'tests/utility/encoder/qpEncoderTest.cpp', + 'tests/utility/encoder/b64EncoderTest.cpp', 'tests/utility/outputStreamStringAdapterTest.cpp', 'tests/utility/outputStreamSocketAdapterTest.cpp', 'tests/utility/outputStreamByteArrayAdapterTest.cpp', diff --git a/tests/misc/importanceHelperTest.cpp b/tests/misc/importanceHelperTest.cpp index 1227cb40..f4696efb 100644 --- a/tests/misc/importanceHelperTest.cpp +++ b/tests/misc/importanceHelperTest.cpp @@ -26,11 +26,7 @@ #include "vmime/misc/importanceHelper.hpp" -#define VMIME_TEST_SUITE importanceHelperTest -#define VMIME_TEST_SUITE_MODULE "Misc" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(importanceHelperTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testResetImportance) diff --git a/tests/net/maildir/maildirStoreTest.cpp b/tests/net/maildir/maildirStoreTest.cpp index d908d471..10de80df 100644 --- a/tests/net/maildir/maildirStoreTest.cpp +++ b/tests/net/maildir/maildirStoreTest.cpp @@ -29,10 +29,6 @@ #include "vmime/net/maildir/maildirFormat.hpp" -#define VMIME_TEST_SUITE maildirStoreTest -#define VMIME_TEST_SUITE_MODULE "Net/Maildir" - - // Shortcuts and helpers typedef vmime::utility::file::path fspath; typedef vmime::utility::file::path::component fspathc; @@ -142,7 +138,7 @@ static const vmime::string TEST_MAILDIRFILES_COURIER[] = // files to create and -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(maildirStoreTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testDetectFormat_KMail) diff --git a/tests/net/pop3/POP3ResponseTest.cpp b/tests/net/pop3/POP3ResponseTest.cpp index 54c36274..1541ce8b 100644 --- a/tests/net/pop3/POP3ResponseTest.cpp +++ b/tests/net/pop3/POP3ResponseTest.cpp @@ -26,14 +26,10 @@ #include "vmime/net/pop3/POP3Response.hpp" -#define VMIME_TEST_SUITE POP3ResponseTest -#define VMIME_TEST_SUITE_MODULE "Net/POP3" - - using namespace vmime::net::pop3; -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(POP3ResponseTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testSingleLineResponseOK) diff --git a/tests/net/pop3/POP3UtilsTest.cpp b/tests/net/pop3/POP3UtilsTest.cpp index f1e4f597..ac92056a 100644 --- a/tests/net/pop3/POP3UtilsTest.cpp +++ b/tests/net/pop3/POP3UtilsTest.cpp @@ -27,14 +27,10 @@ #include "vmime/net/pop3/POP3Response.hpp" -#define VMIME_TEST_SUITE POP3UtilsTest -#define VMIME_TEST_SUITE_MODULE "Net/POP3" - - using namespace vmime::net::pop3; -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(POP3UtilsTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testParseMultiListOrUidlResponse) diff --git a/tests/net/smtp/SMTPCommandSetTest.cpp b/tests/net/smtp/SMTPCommandSetTest.cpp index a315d678..0cf4b03b 100644 --- a/tests/net/smtp/SMTPCommandSetTest.cpp +++ b/tests/net/smtp/SMTPCommandSetTest.cpp @@ -30,11 +30,7 @@ using namespace vmime::net::smtp; -#define VMIME_TEST_SUITE SMTPCommandSetTest -#define VMIME_TEST_SUITE_MODULE "Net/SMTP" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(SMTPCommandSetTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testCreate) diff --git a/tests/net/smtp/SMTPCommandTest.cpp b/tests/net/smtp/SMTPCommandTest.cpp index 0ff52741..10052f3f 100644 --- a/tests/net/smtp/SMTPCommandTest.cpp +++ b/tests/net/smtp/SMTPCommandTest.cpp @@ -29,11 +29,7 @@ using namespace vmime::net::smtp; -#define VMIME_TEST_SUITE SMTPCommandTest -#define VMIME_TEST_SUITE_MODULE "Net/SMTP" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(SMTPCommandTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testCreateCommand) diff --git a/tests/net/smtp/SMTPResponseTest.cpp b/tests/net/smtp/SMTPResponseTest.cpp index 17c7774c..7d8a13c9 100644 --- a/tests/net/smtp/SMTPResponseTest.cpp +++ b/tests/net/smtp/SMTPResponseTest.cpp @@ -26,11 +26,7 @@ #include "vmime/net/smtp/SMTPResponse.hpp" -#define VMIME_TEST_SUITE SMTPResponseTest -#define VMIME_TEST_SUITE_MODULE "Net/SMTP" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(SMTPResponseTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testSingleLineResponse) diff --git a/tests/net/smtp/SMTPTransportTest.cpp b/tests/net/smtp/SMTPTransportTest.cpp index 4f34f71f..4ffda792 100644 --- a/tests/net/smtp/SMTPTransportTest.cpp +++ b/tests/net/smtp/SMTPTransportTest.cpp @@ -24,15 +24,11 @@ #include "tests/testUtils.hpp" -#define VMIME_TEST_SUITE SMTPTransportTest -#define VMIME_TEST_SUITE_MODULE "Net/SMTP" - - class greetingErrorSMTPTestSocket; class MAILandRCPTSMTPTestSocket; -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(SMTPTransportTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testGreetingError) diff --git a/tests/parser/attachmentHelperTest.cpp b/tests/parser/attachmentHelperTest.cpp index c043db23..0ddf2448 100644 --- a/tests/parser/attachmentHelperTest.cpp +++ b/tests/parser/attachmentHelperTest.cpp @@ -24,11 +24,7 @@ #include "tests/testUtils.hpp" -#define VMIME_TEST_SUITE attachmentHelperTest -#define VMIME_TEST_SUITE_MODULE "Parser" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(attachmentHelperTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testAddAttachment1) diff --git a/tests/parser/bodyPartTest.cpp b/tests/parser/bodyPartTest.cpp index 1c5545a2..487b3160 100644 --- a/tests/parser/bodyPartTest.cpp +++ b/tests/parser/bodyPartTest.cpp @@ -24,11 +24,7 @@ #include "tests/testUtils.hpp" -#define VMIME_TEST_SUITE bodyPartTest -#define VMIME_TEST_SUITE_MODULE "Parser" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(bodyPartTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testParse) diff --git a/tests/parser/charsetTest.cpp b/tests/parser/charsetTest.cpp index eaedb218..678dad39 100644 --- a/tests/parser/charsetTest.cpp +++ b/tests/parser/charsetTest.cpp @@ -24,10 +24,6 @@ #include "tests/testUtils.hpp" -#define VMIME_TEST_SUITE charsetTest -#define VMIME_TEST_SUITE_MODULE "Parser" - - // Excerpt from http://www.gnu.org/ static const vmime::charset inputCharset("gb2312"); static const char inputBytes[] = @@ -91,7 +87,7 @@ static const char outputBytes[] = -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(charsetTest) VMIME_TEST_LIST_BEGIN // Test valid input diff --git a/tests/parser/datetimeTest.cpp b/tests/parser/datetimeTest.cpp index 07d77301..90bbebbb 100644 --- a/tests/parser/datetimeTest.cpp +++ b/tests/parser/datetimeTest.cpp @@ -24,11 +24,7 @@ #include "tests/testUtils.hpp" -#define VMIME_TEST_SUITE datetimeTest -#define VMIME_TEST_SUITE_MODULE "Parser" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(datetimeTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testParse) diff --git a/tests/parser/dispositionTest.cpp b/tests/parser/dispositionTest.cpp index 81818dae..7b767caa 100644 --- a/tests/parser/dispositionTest.cpp +++ b/tests/parser/dispositionTest.cpp @@ -24,11 +24,7 @@ #include "tests/testUtils.hpp" -#define VMIME_TEST_SUITE dispositionTest -#define VMIME_TEST_SUITE_MODULE "Parser" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(dispositionTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testParse) diff --git a/tests/parser/emailAddressTest.cpp b/tests/parser/emailAddressTest.cpp index 0185c220..378cc065 100644 --- a/tests/parser/emailAddressTest.cpp +++ b/tests/parser/emailAddressTest.cpp @@ -26,11 +26,7 @@ #include "vmime/platform.hpp" -#define VMIME_TEST_SUITE emailAddressTest -#define VMIME_TEST_SUITE_MODULE "Parser" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(emailAddressTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testParseASCII) diff --git a/tests/parser/headerFieldTest.cpp b/tests/parser/headerFieldTest.cpp index 2c8a954c..c152690f 100644 --- a/tests/parser/headerFieldTest.cpp +++ b/tests/parser/headerFieldTest.cpp @@ -24,11 +24,7 @@ #include "tests/testUtils.hpp" -#define VMIME_TEST_SUITE headerFieldTest -#define VMIME_TEST_SUITE_MODULE "Parser" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(headerFieldTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testBadValueType) diff --git a/tests/parser/headerTest.cpp b/tests/parser/headerTest.cpp index 47bd0ebe..91eb03df 100644 --- a/tests/parser/headerTest.cpp +++ b/tests/parser/headerTest.cpp @@ -24,11 +24,7 @@ #include "tests/testUtils.hpp" -#define VMIME_TEST_SUITE headerTest -#define VMIME_TEST_SUITE_MODULE "Parser" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(headerTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testHas1) diff --git a/tests/parser/htmlTextPartTest.cpp b/tests/parser/htmlTextPartTest.cpp index 08754e72..732fcd8c 100644 --- a/tests/parser/htmlTextPartTest.cpp +++ b/tests/parser/htmlTextPartTest.cpp @@ -25,11 +25,7 @@ #include "vmime/htmlTextPart.hpp" -#define VMIME_TEST_SUITE htmlTextPartTest -#define VMIME_TEST_SUITE_MODULE "Parser" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(htmlTextPartTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testParseText) diff --git a/tests/parser/mailboxTest.cpp b/tests/parser/mailboxTest.cpp index 9e48a235..a6e46577 100644 --- a/tests/parser/mailboxTest.cpp +++ b/tests/parser/mailboxTest.cpp @@ -24,11 +24,7 @@ #include "tests/testUtils.hpp" -#define VMIME_TEST_SUITE mailboxTest -#define VMIME_TEST_SUITE_MODULE "Parser" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(mailboxTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testParse) diff --git a/tests/parser/mediaTypeTest.cpp b/tests/parser/mediaTypeTest.cpp index 462f6ae7..4002b714 100644 --- a/tests/parser/mediaTypeTest.cpp +++ b/tests/parser/mediaTypeTest.cpp @@ -24,11 +24,7 @@ #include "tests/testUtils.hpp" -#define VMIME_TEST_SUITE mediaTypeTest -#define VMIME_TEST_SUITE_MODULE "Parser" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(mediaTypeTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testConstructors) diff --git a/tests/parser/messageIdSequenceTest.cpp b/tests/parser/messageIdSequenceTest.cpp index e7dd7e01..ed6d0be3 100644 --- a/tests/parser/messageIdSequenceTest.cpp +++ b/tests/parser/messageIdSequenceTest.cpp @@ -24,11 +24,7 @@ #include "tests/testUtils.hpp" -#define VMIME_TEST_SUITE messageIdSequenceTest -#define VMIME_TEST_SUITE_MODULE "Parser" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(messageIdSequenceTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testParse) diff --git a/tests/parser/messageIdTest.cpp b/tests/parser/messageIdTest.cpp index be8be3f1..9863ae51 100644 --- a/tests/parser/messageIdTest.cpp +++ b/tests/parser/messageIdTest.cpp @@ -24,11 +24,7 @@ #include "tests/testUtils.hpp" -#define VMIME_TEST_SUITE messageIdTest -#define VMIME_TEST_SUITE_MODULE "Parser" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(messageIdTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testParse) diff --git a/tests/parser/parameterTest.cpp b/tests/parser/parameterTest.cpp index 91c5f076..eb3a663a 100644 --- a/tests/parser/parameterTest.cpp +++ b/tests/parser/parameterTest.cpp @@ -24,11 +24,7 @@ #include "tests/testUtils.hpp" -#define VMIME_TEST_SUITE parameterTest -#define VMIME_TEST_SUITE_MODULE "Parser" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(parameterTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testParse) diff --git a/tests/parser/pathTest.cpp b/tests/parser/pathTest.cpp index caa6e0a0..f73dd0d4 100644 --- a/tests/parser/pathTest.cpp +++ b/tests/parser/pathTest.cpp @@ -24,11 +24,7 @@ #include "tests/testUtils.hpp" -#define VMIME_TEST_SUITE pathTest -#define VMIME_TEST_SUITE_MODULE "Parser" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(pathTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testParse) diff --git a/tests/parser/textTest.cpp b/tests/parser/textTest.cpp index 0261a72f..f4f30b1b 100644 --- a/tests/parser/textTest.cpp +++ b/tests/parser/textTest.cpp @@ -24,11 +24,7 @@ #include "tests/testUtils.hpp" -#define VMIME_TEST_SUITE textTest -#define VMIME_TEST_SUITE_MODULE "Parser" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(textTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testConstructors) diff --git a/tests/parser/wordEncoderTest.cpp b/tests/parser/wordEncoderTest.cpp index 269a01bd..9bc4dcfd 100644 --- a/tests/parser/wordEncoderTest.cpp +++ b/tests/parser/wordEncoderTest.cpp @@ -26,11 +26,7 @@ #include "vmime/wordEncoder.hpp" -#define VMIME_TEST_SUITE wordEncoderTest -#define VMIME_TEST_SUITE_MODULE "Parser" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(wordEncoderTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testGetNextChunk) diff --git a/tests/security/digest/md5Test.cpp b/tests/security/digest/md5Test.cpp index 28220693..ec4e62b2 100644 --- a/tests/security/digest/md5Test.cpp +++ b/tests/security/digest/md5Test.cpp @@ -26,17 +26,13 @@ #include "vmime/security/digest/messageDigestFactory.hpp" -#define VMIME_TEST_SUITE md5Test -#define VMIME_TEST_SUITE_MODULE "Security/Digest" - - #define INIT_DIGEST(var, algo) \ vmime::ref <vmime::security::digest::messageDigest> var = \ vmime::security::digest::messageDigestFactory::getInstance()->create(algo) -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(md5Test) VMIME_TEST_LIST_BEGIN VMIME_TEST(testRFC1321_1) diff --git a/tests/security/digest/sha1Test.cpp b/tests/security/digest/sha1Test.cpp index 5ad98e62..2accf8c7 100644 --- a/tests/security/digest/sha1Test.cpp +++ b/tests/security/digest/sha1Test.cpp @@ -26,17 +26,13 @@ #include "vmime/security/digest/messageDigestFactory.hpp" -#define VMIME_TEST_SUITE sha1Test -#define VMIME_TEST_SUITE_MODULE "Security/Digest" - - #define INIT_DIGEST(var, algo) \ vmime::ref <vmime::security::digest::messageDigest> var = \ vmime::security::digest::messageDigestFactory::getInstance()->create(algo) -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(sha1Test) VMIME_TEST_LIST_BEGIN VMIME_TEST(testFIPS180_1) diff --git a/tests/testRunner.cpp b/tests/testRunner.cpp index b6c66850..fb40d3a2 100644 --- a/tests/testRunner.cpp +++ b/tests/testRunner.cpp @@ -192,6 +192,55 @@ void registerTestModule(const char* name_) } +const std::string getNormalizedPath(const std::string& path) +{ + std::string res = path; + + for (std::string::size_type i = 0, n = res.length() ; i < n ; ++i) + { + if (res[i] == '\\') + res[i] = '/'; + } + + return res; +} + + +const std::string getFileNameFromPath(const std::string& path) +{ + const std::string::size_type pos = path.find_last_of('/'); + + if (pos == std::string::npos) + return ""; + + return path.substr(pos + 1); +} + + +const char* getTestModuleNameFromSourceFile(const char *path_) +{ + static std::string moduleName; + + static const std::string testRunnerPath(getNormalizedPath(__FILE__)); + static const std::string testRunnerFileName(getFileNameFromPath(testRunnerPath)); + + const std::string path = getNormalizedPath(path_); + + // "/path/to/testRunner.cpp" --> "/path/to/" + const std::string basePath + (testRunnerPath.begin(), testRunnerPath.end() - testRunnerFileName.length()); + + // "/path/to/module/testFile.cpp" --> "module/testFile.cpp" + const std::string testFileName(getFileNameFromPath(path)); + const std::string testPath(path.begin() + basePath.length(), path.end()); + + // "module/testFile.cpp" --> "module" + moduleName = testPath.substr(0, testPath.length() - testFileName.length() - 1); + + return moduleName.c_str(); +} + + int main(int argc, char* argv[]) { // VMime initialization diff --git a/tests/testUtils.hpp b/tests/testUtils.hpp index 39d9e555..2e5b161f 100644 --- a/tests/testUtils.hpp +++ b/tests/testUtils.hpp @@ -33,8 +33,10 @@ // CppUnit +#pragma GCC diagnostic ignored "-Wold-style-cast" #include <cppunit/TestAssert.h> #include <cppunit/extensions/HelperMacros.h> +#pragma GCC diagnostic warning "-Wold-style-cast" #define VASSERT(msg, cond) \ CPPUNIT_ASSERT_MESSAGE(std::string(msg), cond) @@ -57,18 +59,24 @@ #define VASSERT_NO_THROW(msg, expression) \ CPPUNIT_ASSERT_NO_THROW(expression) -#define VMIME_TEST_SUITE_BEGIN \ - class VMIME_TEST_SUITE : public CppUnit::TestFixture { public: +#define VMIME_TEST_SUITE_BEGIN(testSuiteName) \ + class testSuiteName; \ + typedef testSuiteName VMIME_TEST_SUITE; \ + class testSuiteName : public CppUnit::TestFixture { public: #define VMIME_TEST_SUITE_END \ }; \ \ - static CppUnit::AutoRegisterSuite <VMIME_TEST_SUITE>(autoRegisterRegistry1); \ - static CppUnit::AutoRegisterSuite <VMIME_TEST_SUITE>(autoRegisterRegistry2)(VMIME_TEST_SUITE_MODULE); \ + /*static CppUnit::AutoRegisterSuite <VMIME_TEST_SUITE>(autoRegisterRegistry1);*/ \ + /*static CppUnit::AutoRegisterSuite <VMIME_TEST_SUITE>(autoRegisterRegistry2)(VMIME_TEST_SUITE_MODULE);*/ \ extern void registerTestModule(const char* name); \ + extern const char* getTestModuleNameFromSourceFile(const char *path); \ template <typename T> \ struct AutoRegisterModule { \ AutoRegisterModule() { \ - registerTestModule(VMIME_TEST_SUITE_MODULE); \ + static const char* moduleName = getTestModuleNameFromSourceFile(__FILE__); \ + static CppUnit::AutoRegisterSuite <VMIME_TEST_SUITE>(autoRegisterRegistry1); \ + static CppUnit::AutoRegisterSuite <VMIME_TEST_SUITE>(autoRegisterRegistry2)(moduleName); \ + registerTestModule(moduleName); \ } \ }; \ static AutoRegisterModule <VMIME_TEST_SUITE> autoRegisterModule; diff --git a/tests/utility/datetimeUtilsTest.cpp b/tests/utility/datetimeUtilsTest.cpp index 608a0521..1e21c5f9 100644 --- a/tests/utility/datetimeUtilsTest.cpp +++ b/tests/utility/datetimeUtilsTest.cpp @@ -27,11 +27,7 @@ #include "vmime/utility/datetimeUtils.hpp" -#define VMIME_TEST_SUITE datetimeUtilsTest -#define VMIME_TEST_SUITE_MODULE "Utility" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(datetimeUtilsTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testIsLeapYear) diff --git a/tests/utility/encoder/b64EncoderTest.cpp b/tests/utility/encoder/b64EncoderTest.cpp new file mode 100644 index 00000000..589afaba --- /dev/null +++ b/tests/utility/encoder/b64EncoderTest.cpp @@ -0,0 +1,145 @@ +// +// VMime library (http://www.vmime.org) +// Copyright (C) 2002-2013 Vincent Richard <[email protected]> +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License as +// published by the Free Software Foundation; either version 3 of +// the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with this program; if not, write to the Free Software Foundation, Inc., +// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +// +// Linking this library statically or dynamically with other modules is making +// a combined work based on this library. Thus, the terms and conditions of +// the GNU General Public License cover the whole combination. +// + +#include "tests/testUtils.hpp" + +#include "encoderTestUtils.hpp" + + +VMIME_TEST_SUITE_BEGIN(b64EncoderTest) + + VMIME_TEST_LIST_BEGIN + VMIME_TEST(testBase64) + VMIME_TEST_LIST_END + + + void testBase64() + { + static const vmime::string testSuites[] = + { + // Test 1 + "", + + "", + + // Test 2 + "A", + + "QQ==", + + // Test 3 + "AB", + + "QUI=", + + // Test 4 + "ABC", + + "QUJD", + + // Test 5 + "foo", + + "Zm9v", + + // Test 6 + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", + + "QUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVphYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ejAx" + "MjM0NTY3ODk=", + + // Test 7 + vmime::string( + "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f" + "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f" + "\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f" + "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f" + "\x40\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f" + "\x50\x51\x52\x53\x54\x55\x56\x57\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f" + "\x60\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f" + "\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f" + "\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f" + "\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f" + "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf" + "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf" + "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf" + "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf" + "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef" + "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff", + 256), + + "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1" + "Njc4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWpr" + "bG1ub3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6Ch" + "oqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX" + "2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+/w==" + }; + + + for (unsigned int i = 0 ; i < sizeof(testSuites) / sizeof(testSuites[0]) / 2 ; ++i) + { + const vmime::string decoded = testSuites[i * 2]; + const vmime::string encoded = testSuites[i * 2 + 1]; + + std::ostringstream oss; + oss << "[Base64] Test " << (i + 1) << ": "; + + // Encoding + VASSERT_EQ(oss.str() + "encoding", encoded, encode("base64", decoded)); + + // Decoding + VASSERT_EQ(oss.str() + "decoding", decoded, decode("base64", encoded)); + + // Multiple and successive encoding/decoding + VASSERT_EQ(oss.str() + "multiple1", decoded, + decode("base64", + encode("base64", decoded))); + + VASSERT_EQ(oss.str() + "multiple2", decoded, + decode("base64", + decode("base64", + encode("base64", + encode("base64", decoded))))); + + VASSERT_EQ(oss.str() + "multiple3", decoded, + decode("base64", + decode("base64", + decode("base64", + encode("base64", + encode("base64", + encode("base64", decoded))))))); + + VASSERT_EQ(oss.str() + "multiple4", decoded, + decode("base64", + decode("base64", + decode("base64", + decode("base64", + encode("base64", + encode("base64", + encode("base64", + encode("base64", decoded))))))))); + } + } + +VMIME_TEST_SUITE_END + diff --git a/tests/utility/encoder/encoderTestUtils.hpp b/tests/utility/encoder/encoderTestUtils.hpp new file mode 100644 index 00000000..dd2484ed --- /dev/null +++ b/tests/utility/encoder/encoderTestUtils.hpp @@ -0,0 +1,65 @@ +// +// VMime library (http://www.vmime.org) +// Copyright (C) 2002-2013 Vincent Richard <[email protected]> +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License as +// published by the Free Software Foundation; either version 3 of +// the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with this program; if not, write to the Free Software Foundation, Inc., +// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +// +// Linking this library statically or dynamically with other modules is making +// a combined work based on this library. Thus, the terms and conditions of +// the GNU General Public License cover the whole combination. +// + + +// Encoding helper function +static const vmime::string encode(const vmime::string& name, const vmime::string& in, + int maxLineLength = 0, const vmime::propertySet props = vmime::propertySet()) +{ + vmime::ref <vmime::utility::encoder::encoder> enc = + vmime::utility::encoder::encoderFactory::getInstance()->create(name); + + enc->getProperties() = props; + + if (maxLineLength != 0) + enc->getProperties()["maxlinelength"] = maxLineLength; + + vmime::utility::inputStreamStringAdapter vin(in); + + std::ostringstream out; + vmime::utility::outputStreamAdapter vout(out); + + enc->encode(vin, vout); + + return (out.str()); +} + + +// Decoding helper function +static const vmime::string decode(const vmime::string& name, const vmime::string& in, int maxLineLength = 0) +{ + vmime::ref <vmime::utility::encoder::encoder> enc = + vmime::utility::encoder::encoderFactory::getInstance()->create(name); + + if (maxLineLength != 0) + enc->getProperties()["maxlinelength"] = maxLineLength; + + vmime::utility::inputStreamStringAdapter vin(in); + + std::ostringstream out; + vmime::utility::outputStreamAdapter vout(out); + + enc->decode(vin, vout); + + return (out.str()); +} diff --git a/tests/utility/encoderTest.cpp b/tests/utility/encoder/qpEncoderTest.cpp index 24aba8ea..790c5fb3 100644 --- a/tests/utility/encoderTest.cpp +++ b/tests/utility/encoder/qpEncoderTest.cpp @@ -23,15 +23,12 @@ #include "tests/testUtils.hpp" +#include "encoderTestUtils.hpp" -#define VMIME_TEST_SUITE encoderTest -#define VMIME_TEST_SUITE_MODULE "Parser" - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(qpEncoderTest) VMIME_TEST_LIST_BEGIN - VMIME_TEST(testBase64) VMIME_TEST(testQuotedPrintable) VMIME_TEST(testQuotedPrintable_SoftLineBreaks) VMIME_TEST(testQuotedPrintable_CRLF) @@ -39,156 +36,6 @@ VMIME_TEST_SUITE_BEGIN VMIME_TEST_LIST_END - // Encoding helper function - static const vmime::string encode(const vmime::string& name, const vmime::string& in, - int maxLineLength = 0, const vmime::propertySet props = vmime::propertySet()) - { - vmime::ref <vmime::utility::encoder::encoder> enc = - vmime::utility::encoder::encoderFactory::getInstance()->create(name); - - enc->getProperties() = props; - - if (maxLineLength != 0) - enc->getProperties()["maxlinelength"] = maxLineLength; - - vmime::utility::inputStreamStringAdapter vin(in); - - std::ostringstream out; - vmime::utility::outputStreamAdapter vout(out); - - enc->encode(vin, vout); - - return (out.str()); - } - - // Decoding helper function - static const vmime::string decode(const vmime::string& name, const vmime::string& in, int maxLineLength = 0) - { - vmime::ref <vmime::utility::encoder::encoder> enc = - vmime::utility::encoder::encoderFactory::getInstance()->create(name); - - if (maxLineLength != 0) - enc->getProperties()["maxlinelength"] = maxLineLength; - - vmime::utility::inputStreamStringAdapter vin(in); - - std::ostringstream out; - vmime::utility::outputStreamAdapter vout(out); - - enc->decode(vin, vout); - - return (out.str()); - } - - - void testBase64() - { - static const vmime::string testSuites[] = - { - // Test 1 - "", - - "", - - // Test 2 - "A", - - "QQ==", - - // Test 3 - "AB", - - "QUI=", - - // Test 4 - "ABC", - - "QUJD", - - // Test 5 - "foo", - - "Zm9v", - - // Test 6 - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", - - "QUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVphYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ejAx" - "MjM0NTY3ODk=", - - // Test 7 - vmime::string( - "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f" - "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f" - "\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f" - "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f" - "\x40\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f" - "\x50\x51\x52\x53\x54\x55\x56\x57\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f" - "\x60\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f" - "\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f" - "\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f" - "\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f" - "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf" - "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf" - "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf" - "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf" - "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef" - "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff", - 256), - - "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1" - "Njc4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWpr" - "bG1ub3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6Ch" - "oqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX" - "2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+/w==" - }; - - - for (unsigned int i = 0 ; i < sizeof(testSuites) / sizeof(testSuites[0]) / 2 ; ++i) - { - const vmime::string decoded = testSuites[i * 2]; - const vmime::string encoded = testSuites[i * 2 + 1]; - - std::ostringstream oss; - oss << "[Base64] Test " << (i + 1) << ": "; - - // Encoding - VASSERT_EQ(oss.str() + "encoding", encoded, encode("base64", decoded)); - - // Decoding - VASSERT_EQ(oss.str() + "decoding", decoded, decode("base64", encoded)); - - // Multiple and successive encoding/decoding - VASSERT_EQ(oss.str() + "multiple1", decoded, - decode("base64", - encode("base64", decoded))); - - VASSERT_EQ(oss.str() + "multiple2", decoded, - decode("base64", - decode("base64", - encode("base64", - encode("base64", decoded))))); - - VASSERT_EQ(oss.str() + "multiple3", decoded, - decode("base64", - decode("base64", - decode("base64", - encode("base64", - encode("base64", - encode("base64", decoded))))))); - - VASSERT_EQ(oss.str() + "multiple4", decoded, - decode("base64", - decode("base64", - decode("base64", - decode("base64", - encode("base64", - encode("base64", - encode("base64", - encode("base64", decoded))))))))); - } - } - void testQuotedPrintable() { static const vmime::string testSuites[] = @@ -353,4 +200,3 @@ VMIME_TEST_SUITE_BEGIN // TODO: UUEncode VMIME_TEST_SUITE_END - diff --git a/tests/utility/filteredStreamTest.cpp b/tests/utility/filteredStreamTest.cpp index 8dc4d182..4a869c6e 100644 --- a/tests/utility/filteredStreamTest.cpp +++ b/tests/utility/filteredStreamTest.cpp @@ -26,11 +26,7 @@ #include "vmime/utility/filteredStream.hpp" -#define VMIME_TEST_SUITE filteredStreamTest -#define VMIME_TEST_SUITE_MODULE "Utility" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(filteredStreamTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testDotFilteredInputStream) diff --git a/tests/utility/outputStreamByteArrayAdapterTest.cpp b/tests/utility/outputStreamByteArrayAdapterTest.cpp index e1f6810f..93e49fa1 100644 --- a/tests/utility/outputStreamByteArrayAdapterTest.cpp +++ b/tests/utility/outputStreamByteArrayAdapterTest.cpp @@ -26,11 +26,7 @@ #include "vmime/utility/outputStreamByteArrayAdapter.hpp" -#define VMIME_TEST_SUITE outputStreamByteArrayAdapterTest -#define VMIME_TEST_SUITE_MODULE "Utility" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(outputStreamByteArrayAdapterTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testWrite) diff --git a/tests/utility/outputStreamSocketAdapterTest.cpp b/tests/utility/outputStreamSocketAdapterTest.cpp index ab8ec841..920c7f47 100644 --- a/tests/utility/outputStreamSocketAdapterTest.cpp +++ b/tests/utility/outputStreamSocketAdapterTest.cpp @@ -26,11 +26,7 @@ #include "vmime/utility/outputStreamSocketAdapter.hpp" -#define VMIME_TEST_SUITE outputStreamSocketAdapterTest -#define VMIME_TEST_SUITE_MODULE "Utility" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(outputStreamSocketAdapterTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testWrite) diff --git a/tests/utility/outputStreamStringAdapterTest.cpp b/tests/utility/outputStreamStringAdapterTest.cpp index 9c2e516e..71ab9b38 100644 --- a/tests/utility/outputStreamStringAdapterTest.cpp +++ b/tests/utility/outputStreamStringAdapterTest.cpp @@ -26,11 +26,7 @@ #include "vmime/utility/outputStreamStringAdapter.hpp" -#define VMIME_TEST_SUITE outputStreamStringAdapterTest -#define VMIME_TEST_SUITE_MODULE "Utility" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(outputStreamStringAdapterTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testWrite) diff --git a/tests/utility/pathTest.cpp b/tests/utility/pathTest.cpp index 6b923076..93215586 100644 --- a/tests/utility/pathTest.cpp +++ b/tests/utility/pathTest.cpp @@ -26,11 +26,7 @@ #include "vmime/utility/path.hpp" -#define VMIME_TEST_SUITE pathTest -#define VMIME_TEST_SUITE_MODULE "Utility" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(pathTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testConstruct1) diff --git a/tests/utility/seekableInputStreamRegionAdapterTest.cpp b/tests/utility/seekableInputStreamRegionAdapterTest.cpp index 5cffbb68..3ed024e8 100644 --- a/tests/utility/seekableInputStreamRegionAdapterTest.cpp +++ b/tests/utility/seekableInputStreamRegionAdapterTest.cpp @@ -27,14 +27,10 @@ #include "vmime/utility/seekableInputStreamRegionAdapter.hpp" -#define VMIME_TEST_SUITE seekableInputStreamRegionAdapterTest -#define VMIME_TEST_SUITE_MODULE "Utility" - - using namespace vmime::utility; -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(seekableInputStreamRegionAdapterTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testInitialPosition) diff --git a/tests/utility/smartPtrTest.cpp b/tests/utility/smartPtrTest.cpp index ceaf57e1..584adf3b 100644 --- a/tests/utility/smartPtrTest.cpp +++ b/tests/utility/smartPtrTest.cpp @@ -26,11 +26,7 @@ #include "vmime/utility/smartPtr.hpp" -#define VMIME_TEST_SUITE smartPtrTest -#define VMIME_TEST_SUITE_MODULE "Utility" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(smartPtrTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testNull) diff --git a/tests/utility/stringProxyTest.cpp b/tests/utility/stringProxyTest.cpp index 0dd5ef73..0d888f6a 100644 --- a/tests/utility/stringProxyTest.cpp +++ b/tests/utility/stringProxyTest.cpp @@ -24,11 +24,7 @@ #include "tests/testUtils.hpp" -#define VMIME_TEST_SUITE stringProxyTest -#define VMIME_TEST_SUITE_MODULE "Utility" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(stringProxyTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testConstruct) diff --git a/tests/utility/stringUtilsTest.cpp b/tests/utility/stringUtilsTest.cpp index d0ba187c..efd623db 100644 --- a/tests/utility/stringUtilsTest.cpp +++ b/tests/utility/stringUtilsTest.cpp @@ -26,11 +26,7 @@ #include "vmime/utility/stringUtils.hpp" -#define VMIME_TEST_SUITE stringUtilsTest -#define VMIME_TEST_SUITE_MODULE "Utility" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(stringUtilsTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testIsStringEqualNoCase1) diff --git a/tests/utility/urlTest.cpp b/tests/utility/urlTest.cpp index 524057da..6703ecd3 100644 --- a/tests/utility/urlTest.cpp +++ b/tests/utility/urlTest.cpp @@ -27,11 +27,7 @@ #include "vmime/utility/urlUtils.hpp" -#define VMIME_TEST_SUITE urlTest -#define VMIME_TEST_SUITE_MODULE "Utility" - - -VMIME_TEST_SUITE_BEGIN +VMIME_TEST_SUITE_BEGIN(urlTest) VMIME_TEST_LIST_BEGIN VMIME_TEST(testParse1) |