GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored unit tests.

Browse Source
This commit is contained in:
Vincent Richard 2013-03-08 08:19:50 +01:00
parent 3bf4797fc7
commit 1df8c6cd0e
44 changed files with 316 additions and 353 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SConstruct
View File

@ -346,7 +346,8 @@ libvmime_tests = [
] ]
libvmimetest_common = [ libvmimetest_common = [
'tests/testUtils.hpp' 'tests/testUtils.hpp',
'tests/utility/encoder/encoderTestUtils.hpp'
] ]
libvmimetest_sources = [ libvmimetest_sources = [
@ -378,7 +379,8 @@ libvmimetest_sources = [
'tests/utility/pathTest.cpp', 'tests/utility/pathTest.cpp',
'tests/utility/urlTest.cpp', 'tests/utility/urlTest.cpp',
'tests/utility/smartPtrTest.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/outputStreamStringAdapterTest.cpp',
'tests/utility/outputStreamSocketAdapterTest.cpp', 'tests/utility/outputStreamSocketAdapterTest.cpp',
'tests/utility/outputStreamByteArrayAdapterTest.cpp', 'tests/utility/outputStreamByteArrayAdapterTest.cpp',

6
tests/misc/importanceHelperTest.cpp
View File

@ -26,11 +26,7 @@
#include "vmime/misc/importanceHelper.hpp" #include "vmime/misc/importanceHelper.hpp"
#define VMIME_TEST_SUITE importanceHelperTest VMIME_TEST_SUITE_BEGIN(importanceHelperTest)
#define VMIME_TEST_SUITE_MODULE "Misc"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testResetImportance) VMIME_TEST(testResetImportance)

6
tests/net/maildir/maildirStoreTest.cpp
View File

@ -29,10 +29,6 @@
#include "vmime/net/maildir/maildirFormat.hpp" #include "vmime/net/maildir/maildirFormat.hpp"
#define VMIME_TEST_SUITE maildirStoreTest
#define VMIME_TEST_SUITE_MODULE "Net/Maildir"
// Shortcuts and helpers // Shortcuts and helpers
typedef vmime::utility::file::path fspath; typedef vmime::utility::file::path fspath;
typedef vmime::utility::file::path::component fspathc; 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_LIST_BEGIN
VMIME_TEST(testDetectFormat_KMail) VMIME_TEST(testDetectFormat_KMail)

6
tests/net/pop3/POP3ResponseTest.cpp
View File

@ -26,14 +26,10 @@
#include "vmime/net/pop3/POP3Response.hpp" #include "vmime/net/pop3/POP3Response.hpp"
#define VMIME_TEST_SUITE POP3ResponseTest
#define VMIME_TEST_SUITE_MODULE "Net/POP3"
using namespace vmime::net::pop3; using namespace vmime::net::pop3;
VMIME_TEST_SUITE_BEGIN VMIME_TEST_SUITE_BEGIN(POP3ResponseTest)
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testSingleLineResponseOK) VMIME_TEST(testSingleLineResponseOK)

6
tests/net/pop3/POP3UtilsTest.cpp
View File

@ -27,14 +27,10 @@
#include "vmime/net/pop3/POP3Response.hpp" #include "vmime/net/pop3/POP3Response.hpp"
#define VMIME_TEST_SUITE POP3UtilsTest
#define VMIME_TEST_SUITE_MODULE "Net/POP3"
using namespace vmime::net::pop3; using namespace vmime::net::pop3;
VMIME_TEST_SUITE_BEGIN VMIME_TEST_SUITE_BEGIN(POP3UtilsTest)
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testParseMultiListOrUidlResponse) VMIME_TEST(testParseMultiListOrUidlResponse)

6
tests/net/smtp/SMTPCommandSetTest.cpp
View File

@ -30,11 +30,7 @@
using namespace vmime::net::smtp; using namespace vmime::net::smtp;
#define VMIME_TEST_SUITE SMTPCommandSetTest VMIME_TEST_SUITE_BEGIN(SMTPCommandSetTest)
#define VMIME_TEST_SUITE_MODULE "Net/SMTP"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testCreate) VMIME_TEST(testCreate)

6
tests/net/smtp/SMTPCommandTest.cpp
View File

@ -29,11 +29,7 @@
using namespace vmime::net::smtp; using namespace vmime::net::smtp;
#define VMIME_TEST_SUITE SMTPCommandTest VMIME_TEST_SUITE_BEGIN(SMTPCommandTest)
#define VMIME_TEST_SUITE_MODULE "Net/SMTP"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testCreateCommand) VMIME_TEST(testCreateCommand)

6
tests/net/smtp/SMTPResponseTest.cpp
View File

@ -26,11 +26,7 @@
#include "vmime/net/smtp/SMTPResponse.hpp" #include "vmime/net/smtp/SMTPResponse.hpp"
#define VMIME_TEST_SUITE SMTPResponseTest VMIME_TEST_SUITE_BEGIN(SMTPResponseTest)
#define VMIME_TEST_SUITE_MODULE "Net/SMTP"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testSingleLineResponse) VMIME_TEST(testSingleLineResponse)

6
tests/net/smtp/SMTPTransportTest.cpp
View File

@ -24,15 +24,11 @@
#include "tests/testUtils.hpp" #include "tests/testUtils.hpp"
#define VMIME_TEST_SUITE SMTPTransportTest
#define VMIME_TEST_SUITE_MODULE "Net/SMTP"
class greetingErrorSMTPTestSocket; class greetingErrorSMTPTestSocket;
class MAILandRCPTSMTPTestSocket; class MAILandRCPTSMTPTestSocket;
VMIME_TEST_SUITE_BEGIN VMIME_TEST_SUITE_BEGIN(SMTPTransportTest)
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testGreetingError) VMIME_TEST(testGreetingError)

6
tests/parser/attachmentHelperTest.cpp
View File

@ -24,11 +24,7 @@
#include "tests/testUtils.hpp" #include "tests/testUtils.hpp"
#define VMIME_TEST_SUITE attachmentHelperTest VMIME_TEST_SUITE_BEGIN(attachmentHelperTest)
#define VMIME_TEST_SUITE_MODULE "Parser"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testAddAttachment1) VMIME_TEST(testAddAttachment1)

6
tests/parser/bodyPartTest.cpp
View File

@ -24,11 +24,7 @@
#include "tests/testUtils.hpp" #include "tests/testUtils.hpp"
#define VMIME_TEST_SUITE bodyPartTest VMIME_TEST_SUITE_BEGIN(bodyPartTest)
#define VMIME_TEST_SUITE_MODULE "Parser"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testParse) VMIME_TEST(testParse)

6
tests/parser/charsetTest.cpp
View File

@ -24,10 +24,6 @@
#include "tests/testUtils.hpp" #include "tests/testUtils.hpp"
#define VMIME_TEST_SUITE charsetTest
#define VMIME_TEST_SUITE_MODULE "Parser"
// Excerpt from http://www.gnu.org/ // Excerpt from http://www.gnu.org/
static const vmime::charset inputCharset("gb2312"); static const vmime::charset inputCharset("gb2312");
static const char inputBytes[] = 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 VMIME_TEST_LIST_BEGIN
// Test valid input // Test valid input

6
tests/parser/datetimeTest.cpp
View File

@ -24,11 +24,7 @@
#include "tests/testUtils.hpp" #include "tests/testUtils.hpp"
#define VMIME_TEST_SUITE datetimeTest VMIME_TEST_SUITE_BEGIN(datetimeTest)
#define VMIME_TEST_SUITE_MODULE "Parser"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testParse) VMIME_TEST(testParse)

6
tests/parser/dispositionTest.cpp
View File

@ -24,11 +24,7 @@
#include "tests/testUtils.hpp" #include "tests/testUtils.hpp"
#define VMIME_TEST_SUITE dispositionTest VMIME_TEST_SUITE_BEGIN(dispositionTest)
#define VMIME_TEST_SUITE_MODULE "Parser"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testParse) VMIME_TEST(testParse)

6
tests/parser/emailAddressTest.cpp
View File

@ -26,11 +26,7 @@
#include "vmime/platform.hpp" #include "vmime/platform.hpp"
#define VMIME_TEST_SUITE emailAddressTest VMIME_TEST_SUITE_BEGIN(emailAddressTest)
#define VMIME_TEST_SUITE_MODULE "Parser"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testParseASCII) VMIME_TEST(testParseASCII)

6
tests/parser/headerFieldTest.cpp
View File

@ -24,11 +24,7 @@
#include "tests/testUtils.hpp" #include "tests/testUtils.hpp"
#define VMIME_TEST_SUITE headerFieldTest VMIME_TEST_SUITE_BEGIN(headerFieldTest)
#define VMIME_TEST_SUITE_MODULE "Parser"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testBadValueType) VMIME_TEST(testBadValueType)

6
tests/parser/headerTest.cpp
View File

@ -24,11 +24,7 @@
#include "tests/testUtils.hpp" #include "tests/testUtils.hpp"
#define VMIME_TEST_SUITE headerTest VMIME_TEST_SUITE_BEGIN(headerTest)
#define VMIME_TEST_SUITE_MODULE "Parser"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testHas1) VMIME_TEST(testHas1)

6
tests/parser/htmlTextPartTest.cpp
View File

@ -25,11 +25,7 @@
#include "vmime/htmlTextPart.hpp" #include "vmime/htmlTextPart.hpp"
#define VMIME_TEST_SUITE htmlTextPartTest VMIME_TEST_SUITE_BEGIN(htmlTextPartTest)
#define VMIME_TEST_SUITE_MODULE "Parser"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testParseText) VMIME_TEST(testParseText)

6
tests/parser/mailboxTest.cpp
View File

@ -24,11 +24,7 @@
#include "tests/testUtils.hpp" #include "tests/testUtils.hpp"
#define VMIME_TEST_SUITE mailboxTest VMIME_TEST_SUITE_BEGIN(mailboxTest)
#define VMIME_TEST_SUITE_MODULE "Parser"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testParse) VMIME_TEST(testParse)

6
tests/parser/mediaTypeTest.cpp
View File

@ -24,11 +24,7 @@
#include "tests/testUtils.hpp" #include "tests/testUtils.hpp"
#define VMIME_TEST_SUITE mediaTypeTest VMIME_TEST_SUITE_BEGIN(mediaTypeTest)
#define VMIME_TEST_SUITE_MODULE "Parser"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testConstructors) VMIME_TEST(testConstructors)

6
tests/parser/messageIdSequenceTest.cpp
View File

@ -24,11 +24,7 @@
#include "tests/testUtils.hpp" #include "tests/testUtils.hpp"
#define VMIME_TEST_SUITE messageIdSequenceTest VMIME_TEST_SUITE_BEGIN(messageIdSequenceTest)
#define VMIME_TEST_SUITE_MODULE "Parser"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testParse) VMIME_TEST(testParse)

6
tests/parser/messageIdTest.cpp
View File

@ -24,11 +24,7 @@
#include "tests/testUtils.hpp" #include "tests/testUtils.hpp"
#define VMIME_TEST_SUITE messageIdTest VMIME_TEST_SUITE_BEGIN(messageIdTest)
#define VMIME_TEST_SUITE_MODULE "Parser"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testParse) VMIME_TEST(testParse)

6
tests/parser/parameterTest.cpp
View File

@ -24,11 +24,7 @@
#include "tests/testUtils.hpp" #include "tests/testUtils.hpp"
#define VMIME_TEST_SUITE parameterTest VMIME_TEST_SUITE_BEGIN(parameterTest)
#define VMIME_TEST_SUITE_MODULE "Parser"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testParse) VMIME_TEST(testParse)

6
tests/parser/pathTest.cpp
View File

@ -24,11 +24,7 @@
#include "tests/testUtils.hpp" #include "tests/testUtils.hpp"
#define VMIME_TEST_SUITE pathTest VMIME_TEST_SUITE_BEGIN(pathTest)
#define VMIME_TEST_SUITE_MODULE "Parser"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testParse) VMIME_TEST(testParse)

6
tests/parser/textTest.cpp
View File

@ -24,11 +24,7 @@
#include "tests/testUtils.hpp" #include "tests/testUtils.hpp"
#define VMIME_TEST_SUITE textTest VMIME_TEST_SUITE_BEGIN(textTest)
#define VMIME_TEST_SUITE_MODULE "Parser"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testConstructors) VMIME_TEST(testConstructors)

6
tests/parser/wordEncoderTest.cpp
View File

@ -26,11 +26,7 @@
#include "vmime/wordEncoder.hpp" #include "vmime/wordEncoder.hpp"
#define VMIME_TEST_SUITE wordEncoderTest VMIME_TEST_SUITE_BEGIN(wordEncoderTest)
#define VMIME_TEST_SUITE_MODULE "Parser"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testGetNextChunk) VMIME_TEST(testGetNextChunk)

6
tests/security/digest/md5Test.cpp
View File

@ -26,17 +26,13 @@
#include "vmime/security/digest/messageDigestFactory.hpp" #include "vmime/security/digest/messageDigestFactory.hpp"
#define VMIME_TEST_SUITE md5Test
#define VMIME_TEST_SUITE_MODULE "Security/Digest"
#define INIT_DIGEST(var, algo) \ #define INIT_DIGEST(var, algo) \
vmime::ref <vmime::security::digest::messageDigest> var = \ vmime::ref <vmime::security::digest::messageDigest> var = \
vmime::security::digest::messageDigestFactory::getInstance()->create(algo) vmime::security::digest::messageDigestFactory::getInstance()->create(algo)
VMIME_TEST_SUITE_BEGIN VMIME_TEST_SUITE_BEGIN(md5Test)
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testRFC1321_1) VMIME_TEST(testRFC1321_1)

6
tests/security/digest/sha1Test.cpp
View File

@ -26,17 +26,13 @@
#include "vmime/security/digest/messageDigestFactory.hpp" #include "vmime/security/digest/messageDigestFactory.hpp"
#define VMIME_TEST_SUITE sha1Test
#define VMIME_TEST_SUITE_MODULE "Security/Digest"
#define INIT_DIGEST(var, algo) \ #define INIT_DIGEST(var, algo) \
vmime::ref <vmime::security::digest::messageDigest> var = \ vmime::ref <vmime::security::digest::messageDigest> var = \
vmime::security::digest::messageDigestFactory::getInstance()->create(algo) vmime::security::digest::messageDigestFactory::getInstance()->create(algo)
VMIME_TEST_SUITE_BEGIN VMIME_TEST_SUITE_BEGIN(sha1Test)
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testFIPS180_1) VMIME_TEST(testFIPS180_1)

49
tests/testRunner.cpp
View File

@ -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[]) int main(int argc, char* argv[])
{ {
// VMime initialization // VMime initialization

18
tests/testUtils.hpp
View File

@ -33,8 +33,10 @@
// CppUnit // CppUnit
#pragma GCC diagnostic ignored "-Wold-style-cast"
#include <cppunit/TestAssert.h> #include <cppunit/TestAssert.h>
#include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/HelperMacros.h>
#pragma GCC diagnostic warning "-Wold-style-cast"
#define VASSERT(msg, cond) \ #define VASSERT(msg, cond) \
CPPUNIT_ASSERT_MESSAGE(std::string(msg), cond) CPPUNIT_ASSERT_MESSAGE(std::string(msg), cond)
@ -57,18 +59,24 @@
#define VASSERT_NO_THROW(msg, expression) \ #define VASSERT_NO_THROW(msg, expression) \
CPPUNIT_ASSERT_NO_THROW(expression) CPPUNIT_ASSERT_NO_THROW(expression)
#define VMIME_TEST_SUITE_BEGIN \ #define VMIME_TEST_SUITE_BEGIN(testSuiteName) \
class VMIME_TEST_SUITE : public CppUnit::TestFixture { public: class testSuiteName; \
typedef testSuiteName VMIME_TEST_SUITE; \
class testSuiteName : public CppUnit::TestFixture { public:
#define VMIME_TEST_SUITE_END \ #define VMIME_TEST_SUITE_END \
}; \ }; \
\ \
static CppUnit::AutoRegisterSuite <VMIME_TEST_SUITE>(autoRegisterRegistry1); \ /*static CppUnit::AutoRegisterSuite <VMIME_TEST_SUITE>(autoRegisterRegistry1);*/ \
static CppUnit::AutoRegisterSuite <VMIME_TEST_SUITE>(autoRegisterRegistry2)(VMIME_TEST_SUITE_MODULE); \ /*static CppUnit::AutoRegisterSuite <VMIME_TEST_SUITE>(autoRegisterRegistry2)(VMIME_TEST_SUITE_MODULE);*/ \
extern void registerTestModule(const char* name); \ extern void registerTestModule(const char* name); \
extern const char* getTestModuleNameFromSourceFile(const char *path); \
template <typename T> \ template <typename T> \
struct AutoRegisterModule { \ struct AutoRegisterModule { \
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; static AutoRegisterModule <VMIME_TEST_SUITE> autoRegisterModule;

6
tests/utility/datetimeUtilsTest.cpp
View File

@ -27,11 +27,7 @@
#include "vmime/utility/datetimeUtils.hpp" #include "vmime/utility/datetimeUtils.hpp"
#define VMIME_TEST_SUITE datetimeUtilsTest VMIME_TEST_SUITE_BEGIN(datetimeUtilsTest)
#define VMIME_TEST_SUITE_MODULE "Utility"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testIsLeapYear) VMIME_TEST(testIsLeapYear)

145
tests/utility/encoder/b64EncoderTest.cpp Normal file
View File

@ -0,0 +1,145 @@
//
// VMime library (http://www.vmime.org)
// Copyright (C) 2002-2013 Vincent Richard <vincent@vmime.org>
//
// 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

65
tests/utility/encoder/encoderTestUtils.hpp Normal file
View File

@ -0,0 +1,65 @@
//
// VMime library (http://www.vmime.org)
// Copyright (C) 2002-2013 Vincent Richard <vincent@vmime.org>
//
// 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());
}

158
tests/utility/encoderTest.cpp → tests/utility/encoder/qpEncoderTest.cpp
View File

@ -23,15 +23,12 @@
#include "tests/testUtils.hpp" #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_LIST_BEGIN
VMIME_TEST(testBase64)
VMIME_TEST(testQuotedPrintable) VMIME_TEST(testQuotedPrintable)
VMIME_TEST(testQuotedPrintable_SoftLineBreaks) VMIME_TEST(testQuotedPrintable_SoftLineBreaks)
VMIME_TEST(testQuotedPrintable_CRLF) VMIME_TEST(testQuotedPrintable_CRLF)
@ -39,156 +36,6 @@ VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_END 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() void testQuotedPrintable()
{ {
static const vmime::string testSuites[] = static const vmime::string testSuites[] =
@ -353,4 +200,3 @@ VMIME_TEST_SUITE_BEGIN
// TODO: UUEncode // TODO: UUEncode
VMIME_TEST_SUITE_END VMIME_TEST_SUITE_END

6
tests/utility/filteredStreamTest.cpp
View File

@ -26,11 +26,7 @@
#include "vmime/utility/filteredStream.hpp" #include "vmime/utility/filteredStream.hpp"
#define VMIME_TEST_SUITE filteredStreamTest VMIME_TEST_SUITE_BEGIN(filteredStreamTest)
#define VMIME_TEST_SUITE_MODULE "Utility"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testDotFilteredInputStream) VMIME_TEST(testDotFilteredInputStream)

6
tests/utility/outputStreamByteArrayAdapterTest.cpp
View File

@ -26,11 +26,7 @@
#include "vmime/utility/outputStreamByteArrayAdapter.hpp" #include "vmime/utility/outputStreamByteArrayAdapter.hpp"
#define VMIME_TEST_SUITE outputStreamByteArrayAdapterTest VMIME_TEST_SUITE_BEGIN(outputStreamByteArrayAdapterTest)
#define VMIME_TEST_SUITE_MODULE "Utility"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testWrite) VMIME_TEST(testWrite)

6
tests/utility/outputStreamSocketAdapterTest.cpp
View File

@ -26,11 +26,7 @@
#include "vmime/utility/outputStreamSocketAdapter.hpp" #include "vmime/utility/outputStreamSocketAdapter.hpp"
#define VMIME_TEST_SUITE outputStreamSocketAdapterTest VMIME_TEST_SUITE_BEGIN(outputStreamSocketAdapterTest)
#define VMIME_TEST_SUITE_MODULE "Utility"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testWrite) VMIME_TEST(testWrite)

6
tests/utility/outputStreamStringAdapterTest.cpp
View File

@ -26,11 +26,7 @@
#include "vmime/utility/outputStreamStringAdapter.hpp" #include "vmime/utility/outputStreamStringAdapter.hpp"
#define VMIME_TEST_SUITE outputStreamStringAdapterTest VMIME_TEST_SUITE_BEGIN(outputStreamStringAdapterTest)
#define VMIME_TEST_SUITE_MODULE "Utility"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testWrite) VMIME_TEST(testWrite)

6
tests/utility/pathTest.cpp
View File

@ -26,11 +26,7 @@
#include "vmime/utility/path.hpp" #include "vmime/utility/path.hpp"
#define VMIME_TEST_SUITE pathTest VMIME_TEST_SUITE_BEGIN(pathTest)
#define VMIME_TEST_SUITE_MODULE "Utility"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testConstruct1) VMIME_TEST(testConstruct1)

6
tests/utility/seekableInputStreamRegionAdapterTest.cpp
View File

@ -27,14 +27,10 @@
#include "vmime/utility/seekableInputStreamRegionAdapter.hpp" #include "vmime/utility/seekableInputStreamRegionAdapter.hpp"
#define VMIME_TEST_SUITE seekableInputStreamRegionAdapterTest
#define VMIME_TEST_SUITE_MODULE "Utility"
using namespace vmime::utility; using namespace vmime::utility;
VMIME_TEST_SUITE_BEGIN VMIME_TEST_SUITE_BEGIN(seekableInputStreamRegionAdapterTest)
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testInitialPosition) VMIME_TEST(testInitialPosition)

6
tests/utility/smartPtrTest.cpp
View File

@ -26,11 +26,7 @@
#include "vmime/utility/smartPtr.hpp" #include "vmime/utility/smartPtr.hpp"
#define VMIME_TEST_SUITE smartPtrTest VMIME_TEST_SUITE_BEGIN(smartPtrTest)
#define VMIME_TEST_SUITE_MODULE "Utility"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testNull) VMIME_TEST(testNull)

6
tests/utility/stringProxyTest.cpp
View File

@ -24,11 +24,7 @@
#include "tests/testUtils.hpp" #include "tests/testUtils.hpp"
#define VMIME_TEST_SUITE stringProxyTest VMIME_TEST_SUITE_BEGIN(stringProxyTest)
#define VMIME_TEST_SUITE_MODULE "Utility"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testConstruct) VMIME_TEST(testConstruct)

6
tests/utility/stringUtilsTest.cpp
View File

@ -26,11 +26,7 @@
#include "vmime/utility/stringUtils.hpp" #include "vmime/utility/stringUtils.hpp"
#define VMIME_TEST_SUITE stringUtilsTest VMIME_TEST_SUITE_BEGIN(stringUtilsTest)
#define VMIME_TEST_SUITE_MODULE "Utility"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testIsStringEqualNoCase1) VMIME_TEST(testIsStringEqualNoCase1)

6
tests/utility/urlTest.cpp
View File

@ -27,11 +27,7 @@
#include "vmime/utility/urlUtils.hpp" #include "vmime/utility/urlUtils.hpp"
#define VMIME_TEST_SUITE urlTest VMIME_TEST_SUITE_BEGIN(urlTest)
#define VMIME_TEST_SUITE_MODULE "Utility"
VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_BEGIN VMIME_TEST_LIST_BEGIN
VMIME_TEST(testParse1) VMIME_TEST(testParse1)