Martchus
/
cpp-utilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Apply clang-format

This commit is contained in:
Martchus 2017-05-04 22:44:00 +02:00
parent 53ff69130c
commit db46948f2f
14 changed files with 213 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/argumentparsertests.cpp
View File

@ -11,11 +11,11 @@
#include "resources/config.h" #include "resources/config.h"
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/TestFixture.h> #include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <cstring>
#include <cstdlib> #include <cstdlib>
#include <cstring>
using namespace std; using namespace std;
using namespace ApplicationUtilities; using namespace ApplicationUtilities;
@ -26,8 +26,7 @@ using namespace CPPUNIT_NS;
/*! /*!
* \brief The ArgumentParserTests class tests the ArgumentParser and Argument classes. * \brief The ArgumentParserTests class tests the ArgumentParser and Argument classes.
*/ */
class ArgumentParserTests : public TestFixture class ArgumentParserTests : public TestFixture {
{
CPPUNIT_TEST_SUITE(ArgumentParserTests); CPPUNIT_TEST_SUITE(ArgumentParserTests);
CPPUNIT_TEST(testArgument); CPPUNIT_TEST(testArgument);
CPPUNIT_TEST(testParsing); CPPUNIT_TEST(testParsing);
@ -51,10 +50,12 @@ private:
CPPUNIT_TEST_SUITE_REGISTRATION(ArgumentParserTests); CPPUNIT_TEST_SUITE_REGISTRATION(ArgumentParserTests);
void ArgumentParserTests::setUp() void ArgumentParserTests::setUp()
{} {
}
void ArgumentParserTests::tearDown() void ArgumentParserTests::tearDown()
{} {
}
/*! /*!
* \brief Tests the behaviour of the argument class. * \brief Tests the behaviour of the argument class.
@ -338,7 +339,8 @@ void ArgumentParserTests::testParsing()
CPPUNIT_FAIL("Exception expected."); CPPUNIT_FAIL("Exception expected.");
} catch (const Failure &e) { } catch (const Failure &e) {
CPPUNIT_ASSERT(!qtConfigArgs.qtWidgetsGuiArg().isPresent()); CPPUNIT_ASSERT(!qtConfigArgs.qtWidgetsGuiArg().isPresent());
CPPUNIT_ASSERT(!strcmp(e.what(), "Not all parameter for argument \"fields\" provided. You have to provide the following parameter: title album artist trackpos")); CPPUNIT_ASSERT(!strcmp(e.what(),
"Not all parameter for argument \"fields\" provided. You have to provide the following parameter: title album artist trackpos"));
} }
// nested operations // nested operations
@ -528,9 +530,11 @@ void ArgumentParserTests::testBashCompletion()
// order for file names is not specified // order for file names is not specified
const string res(buffer.str()); const string res(buffer.str());
if (res.find(".mkv") < res.find(".ini")) { if (res.find(".mkv") < res.find(".ini")) {
CPPUNIT_ASSERT_EQUAL("COMPREPLY=('" % mkvFilePath % " '\"'\"'with quote'\"'\"'.mkv' '" % iniFilePath + ".ini' ); compopt -o filenames\n", buffer.str()); CPPUNIT_ASSERT_EQUAL(
"COMPREPLY=('" % mkvFilePath % " '\"'\"'with quote'\"'\"'.mkv' '" % iniFilePath + ".ini' ); compopt -o filenames\n", buffer.str());
} else { } else {
CPPUNIT_ASSERT_EQUAL("COMPREPLY=('" % iniFilePath % ".ini' '" % mkvFilePath + " '\"'\"'with quote'\"'\"'.mkv' ); compopt -o filenames\n", buffer.str()); CPPUNIT_ASSERT_EQUAL(
"COMPREPLY=('" % iniFilePath % ".ini' '" % mkvFilePath + " '\"'\"'with quote'\"'\"'.mkv' ); compopt -o filenames\n", buffer.str());
} }
// sub arguments // sub arguments

17
tests/chronotests.cpp
View File

@ -1,11 +1,11 @@
#include "../chrono/datetime.h" #include "../chrono/datetime.h"
#include "../chrono/timespan.h"
#include "../chrono/period.h"
#include "../chrono/format.h" #include "../chrono/format.h"
#include "../chrono/period.h"
#include "../chrono/timespan.h"
#include "../conversion/conversionexception.h" #include "../conversion/conversionexception.h"
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/TestFixture.h> #include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <iostream> #include <iostream>
@ -18,8 +18,7 @@ using namespace CPPUNIT_NS;
/*! /*!
* \brief The ChronoTests class tests classes and methods of the ChronoUtilities namespace. * \brief The ChronoTests class tests classes and methods of the ChronoUtilities namespace.
*/ */
class ChronoTests : public TestFixture class ChronoTests : public TestFixture {
{
CPPUNIT_TEST_SUITE(ChronoTests); CPPUNIT_TEST_SUITE(ChronoTests);
CPPUNIT_TEST(testDateTime); CPPUNIT_TEST(testDateTime);
CPPUNIT_TEST(testTimeSpan); CPPUNIT_TEST(testTimeSpan);
@ -28,8 +27,12 @@ class ChronoTests : public TestFixture
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
public: public:
void setUp() {} void setUp()
void tearDown() {} {
}
void tearDown()
{
}
void testDateTime(); void testDateTime();
void testTimeSpan(); void testTimeSpan();

87
tests/conversiontests.cpp
View File

@ -1,15 +1,15 @@
#include "../conversion/binaryconversion.h" #include "../conversion/binaryconversion.h"
#include "../conversion/stringconversion.h"
#include "../conversion/stringbuilder.h" #include "../conversion/stringbuilder.h"
#include "../conversion/stringconversion.h"
#include "../tests/testutils.h" #include "../tests/testutils.h"
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/TestFixture.h> #include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <random>
#include <sstream>
#include <functional> #include <functional>
#include <initializer_list> #include <initializer_list>
#include <random>
#include <sstream>
using namespace std; using namespace std;
using namespace ConversionUtilities; using namespace ConversionUtilities;
@ -20,8 +20,7 @@ using namespace CPPUNIT_NS;
/*! /*!
* \brief The ConversionTests class tests classes and methods of the ConversionUtilities namespace. * \brief The ConversionTests class tests classes and methods of the ConversionUtilities namespace.
*/ */
class ConversionTests : public TestFixture class ConversionTests : public TestFixture {
{
CPPUNIT_TEST_SUITE(ConversionTests); CPPUNIT_TEST_SUITE(ConversionTests);
CPPUNIT_TEST(testEndianness); CPPUNIT_TEST(testEndianness);
CPPUNIT_TEST(testBinaryConversions); CPPUNIT_TEST(testBinaryConversions);
@ -34,8 +33,12 @@ class ConversionTests : public TestFixture
public: public:
ConversionTests(); ConversionTests();
void setUp() {} void setUp()
void tearDown() {} {
}
void tearDown()
{
}
void testEndianness(); void testEndianness();
void testBinaryConversions(); void testBinaryConversions();
@ -55,10 +58,11 @@ private:
CPPUNIT_TEST_SUITE_REGISTRATION(ConversionTests); CPPUNIT_TEST_SUITE_REGISTRATION(ConversionTests);
ConversionTests::ConversionTests() : ConversionTests::ConversionTests()
m_randomDevice(), : m_randomDevice()
m_randomEngine(m_randomDevice()) , m_randomEngine(m_randomDevice())
{} {
}
/*! /*!
* \brief Tests whether macros for endianness are correct. * \brief Tests whether macros for endianness are correct.
@ -87,7 +91,8 @@ void ConversionTests::testEndianness()
} }
template <typename intType> template <typename intType>
void ConversionTests::testConversion(const char *message, function<void (intType, char *)> vice, function<intType (const char *)> versa, intType min, intType max) void ConversionTests::testConversion(
const char *message, function<void(intType, char *)> vice, function<intType(const char *)> versa, intType min, intType max)
{ {
const intType random = uniform_int_distribution<intType>(min, max)(m_randomEngine); const intType random = uniform_int_distribution<intType>(min, max)(m_randomEngine);
stringstream msg; stringstream msg;
@ -96,35 +101,20 @@ void ConversionTests::testConversion(const char *message, function<void (intType
CPPUNIT_ASSERT_MESSAGE(msg.str(), versa(m_buff) == random); CPPUNIT_ASSERT_MESSAGE(msg.str(), versa(m_buff) == random);
} }
#define TEST_TYPE(endianness, function) \ #define TEST_TYPE(endianness, function) decltype(endianness::function(m_buff))
decltype(endianness::function(m_buff))
#define TEST_CONVERSION(function, endianness) \ #define TEST_CONVERSION(function, endianness) \
testConversion<TEST_TYPE(endianness, function)>( \ testConversion<TEST_TYPE(endianness, function)>("testing " #function, \
"testing " #function, \ static_cast<void (*)(TEST_TYPE(endianness, function), char *)>(&endianness::getBytes), endianness::function, \
static_cast<void(*)(TEST_TYPE(endianness, function), char *)>(&endianness::getBytes), \ numeric_limits<TEST_TYPE(endianness, function)>::min(), numeric_limits<TEST_TYPE(endianness, function)>::max())
endianness::function, \
numeric_limits<TEST_TYPE(endianness, function)>::min(), \
numeric_limits<TEST_TYPE(endianness, function)>::max() \
)
#define TEST_BE_CONVERSION(function) \ #define TEST_BE_CONVERSION(function) TEST_CONVERSION(function, BE)
TEST_CONVERSION( \
function, BE \
)
#define TEST_LE_CONVERSION(function) \ #define TEST_LE_CONVERSION(function) TEST_CONVERSION(function, LE)
TEST_CONVERSION( \
function, LE \
)
#define TEST_CUSTOM_CONVERSION(vice, versa, endianness, min, max) \ #define TEST_CUSTOM_CONVERSION(vice, versa, endianness, min, max) \
testConversion<TEST_TYPE(endianness, versa)>( \ testConversion<TEST_TYPE(endianness, versa)>( \
"testing " #versa, \ "testing " #versa, static_cast<void (*)(TEST_TYPE(endianness, versa), char *)>(&endianness::vice), endianness::versa, min, max)
static_cast<void(*)(TEST_TYPE(endianness, versa), char *)>(&endianness::vice), \
endianness::versa, \
min, max \
)
/*! /*!
* \brief Tests most important binary conversions. * \brief Tests most important binary conversions.
@ -213,17 +203,23 @@ void ConversionTests::testStringEncodingConversions()
// test conversion to UTF-8 // test conversion to UTF-8
assertEqual("Latin-1 to UTF-8 (simple)", simpleString, 4, convertLatin1ToUtf8(reinterpret_cast<const char *>(simpleString), 4)); assertEqual("Latin-1 to UTF-8 (simple)", simpleString, 4, convertLatin1ToUtf8(reinterpret_cast<const char *>(simpleString), 4));
assertEqual("Latin-1 to UTF-8", utf8String, 6, convertLatin1ToUtf8(reinterpret_cast<const char *>(latin1String), 5)); assertEqual("Latin-1 to UTF-8", utf8String, 6, convertLatin1ToUtf8(reinterpret_cast<const char *>(latin1String), 5));
assertEqual("UTF-16LE to UTF-8 (simple)", simpleString, 4, convertUtf16LEToUtf8(reinterpret_cast<const char *>(LE_STR_FOR_ENDIANNESS(simpleUtf16)), 8)); assertEqual(
"UTF-16LE to UTF-8 (simple)", simpleString, 4, convertUtf16LEToUtf8(reinterpret_cast<const char *>(LE_STR_FOR_ENDIANNESS(simpleUtf16)), 8));
assertEqual("UTF-16LE to UTF-8", utf8String, 6, convertUtf16LEToUtf8(reinterpret_cast<const char *>(LE_STR_FOR_ENDIANNESS(utf16)), 10)); assertEqual("UTF-16LE to UTF-8", utf8String, 6, convertUtf16LEToUtf8(reinterpret_cast<const char *>(LE_STR_FOR_ENDIANNESS(utf16)), 10));
assertEqual("UTF-16BE to UTF-8 (simple)", simpleString, 4, convertUtf16BEToUtf8(reinterpret_cast<const char *>(BE_STR_FOR_ENDIANNESS(simpleUtf16)), 8)); assertEqual(
"UTF-16BE to UTF-8 (simple)", simpleString, 4, convertUtf16BEToUtf8(reinterpret_cast<const char *>(BE_STR_FOR_ENDIANNESS(simpleUtf16)), 8));
assertEqual("UTF-16BE to UTF-8", utf8String, 6, convertUtf16BEToUtf8(reinterpret_cast<const char *>(BE_STR_FOR_ENDIANNESS(utf16)), 10)); assertEqual("UTF-16BE to UTF-8", utf8String, 6, convertUtf16BEToUtf8(reinterpret_cast<const char *>(BE_STR_FOR_ENDIANNESS(utf16)), 10));
// test conversion from UTF-8 // test conversion from UTF-8
assertEqual("UTF-8 to Latin-1 (simple)", simpleString, 4, convertUtf8ToLatin1(reinterpret_cast<const char *>(simpleString), 4)); assertEqual("UTF-8 to Latin-1 (simple)", simpleString, 4, convertUtf8ToLatin1(reinterpret_cast<const char *>(simpleString), 4));
assertEqual("UTF-8 to Latin-1", latin1String, 5, convertUtf8ToLatin1(reinterpret_cast<const char *>(utf8String), 6)); assertEqual("UTF-8 to Latin-1", latin1String, 5, convertUtf8ToLatin1(reinterpret_cast<const char *>(utf8String), 6));
assertEqual("UTF-8 to UFT-16LE (simple)", reinterpret_cast<const byte *>(LE_STR_FOR_ENDIANNESS(simpleUtf16)), 8, convertUtf8ToUtf16LE(reinterpret_cast<const char *>(simpleString), 4)); assertEqual("UTF-8 to UFT-16LE (simple)", reinterpret_cast<const byte *>(LE_STR_FOR_ENDIANNESS(simpleUtf16)), 8,
assertEqual("UTF-8 to UFT-16LE", reinterpret_cast<const byte *>(LE_STR_FOR_ENDIANNESS(utf16)), 10, convertUtf8ToUtf16LE(reinterpret_cast<const char *>(utf8String), 6)); convertUtf8ToUtf16LE(reinterpret_cast<const char *>(simpleString), 4));
assertEqual("UTF-8 to UFT-16BE (simple)", reinterpret_cast<const byte *>(BE_STR_FOR_ENDIANNESS(simpleUtf16)), 8, convertUtf8ToUtf16BE(reinterpret_cast<const char *>(simpleString), 4)); assertEqual("UTF-8 to UFT-16LE", reinterpret_cast<const byte *>(LE_STR_FOR_ENDIANNESS(utf16)), 10,
assertEqual("UTF-8 to UFT-16BE", reinterpret_cast<const byte *>(BE_STR_FOR_ENDIANNESS(utf16)), 10, convertUtf8ToUtf16BE(reinterpret_cast<const char *>(utf8String), 6)); convertUtf8ToUtf16LE(reinterpret_cast<const char *>(utf8String), 6));
assertEqual("UTF-8 to UFT-16BE (simple)", reinterpret_cast<const byte *>(BE_STR_FOR_ENDIANNESS(simpleUtf16)), 8,
convertUtf8ToUtf16BE(reinterpret_cast<const char *>(simpleString), 4));
assertEqual("UTF-8 to UFT-16BE", reinterpret_cast<const byte *>(BE_STR_FOR_ENDIANNESS(utf16)), 10,
convertUtf8ToUtf16BE(reinterpret_cast<const char *>(utf8String), 6));
} }
/*! /*!
@ -315,8 +311,11 @@ void ConversionTests::testStringBuilder()
CPPUNIT_ASSERT_EQUAL(string("v2.3.0"), argsToString("v2.", 3, '.', 0)); CPPUNIT_ASSERT_EQUAL(string("v2.3.0"), argsToString("v2.", 3, '.', 0));
// construction of string-tuple and final conversion to string works // construction of string-tuple and final conversion to string works
CPPUNIT_ASSERT_EQUAL_MESSAGE("result can be passed to any function taking a std::string"s, "123456789"s, functionTakingString("12" % string("34") % '5' % 67 + "89")); CPPUNIT_ASSERT_EQUAL_MESSAGE(
"result can be passed to any function taking a std::string"s, "123456789"s, functionTakingString("12" % string("34") % '5' % 67 + "89"));
constexpr double velocityExample = 27.0; constexpr double velocityExample = 27.0;
CPPUNIT_ASSERT_EQUAL_MESSAGE("real-word example"s, "velocity: 27 km/h (7.5 m/s)"s, functionTakingString("velocity: " % numberToString(velocityExample) % " km/h (" % numberToString(velocityExample / 3.6) + " m/s)")); CPPUNIT_ASSERT_EQUAL_MESSAGE("real-word example"s, "velocity: 27 km/h (7.5 m/s)"s,
CPPUNIT_ASSERT_EQUAL_MESSAGE("regular + operator still works (no problems with ambiguity)"s, "regular + still works"s, "regular"s + " + still works"); functionTakingString("velocity: " % numberToString(velocityExample) % " km/h (" % numberToString(velocityExample / 3.6) + " m/s)"));
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"regular + operator still works (no problems with ambiguity)"s, "regular + still works"s, "regular"s + " + still works");
} }

20
tests/iotests.cpp
View File

@ -3,17 +3,17 @@
#include "../io/binaryreader.h" #include "../io/binaryreader.h"
#include "../io/binarywriter.h" #include "../io/binarywriter.h"
#include "../io/bitreader.h" #include "../io/bitreader.h"
#include "../io/path.h"
#include "../io/inifile.h"
#include "../io/copy.h"
#include "../io/catchiofailure.h" #include "../io/catchiofailure.h"
#include "../io/copy.h"
#include "../io/inifile.h"
#include "../io/path.h"
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/TestFixture.h> #include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <algorithm>
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>
#include <algorithm>
using namespace std; using namespace std;
using namespace IoUtilities; using namespace IoUtilities;
@ -23,8 +23,7 @@ using namespace CPPUNIT_NS;
/*! /*!
* \brief The IoTests class tests classes and methods of the IoUtilities namespace. * \brief The IoTests class tests classes and methods of the IoUtilities namespace.
*/ */
class IoTests : public TestFixture class IoTests : public TestFixture {
{
CPPUNIT_TEST_SUITE(IoTests); CPPUNIT_TEST_SUITE(IoTests);
CPPUNIT_TEST(testFailure); CPPUNIT_TEST(testFailure);
CPPUNIT_TEST(testBinaryReader); CPPUNIT_TEST(testBinaryReader);
@ -51,10 +50,12 @@ public:
CPPUNIT_TEST_SUITE_REGISTRATION(IoTests); CPPUNIT_TEST_SUITE_REGISTRATION(IoTests);
void IoTests::setUp() void IoTests::setUp()
{} {
}
void IoTests::tearDown() void IoTests::tearDown()
{} {
}
/*! /*!
* \brief Tests for GCC Bug 66145. * \brief Tests for GCC Bug 66145.
@ -221,7 +222,6 @@ void IoTests::testBitReader()
} catch (...) { } catch (...) {
catchIoFailure(); catchIoFailure();
} }
} }
/*! /*!