summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2017-01-10 20:22:26 (GMT)
committerTobias Markmann <tm@ayena.de>2017-01-11 18:23:48 (GMT)
commit3b0cde2e6dbf26a01a59b0004e4041199731cbc8 (patch)
tree0b2ba6addb161f1d3e437a64685ea797341a149b /Swiften/Base
parenta0c339f80e4585341179edef1898defd21a0d36a (diff)
downloadswift-3b0cde2e6dbf26a01a59b0004e4041199731cbc8.zip
swift-3b0cde2e6dbf26a01a59b0004e4041199731cbc8.tar.bz2
Integrate googletest and googlemock libraries to 3rdParty
googletest and googlemock from release 1.8.0 have been copied to the 3rdParty folder. With this commit tests for Swift project can also written using googletest and googlemock APIs. The test runners will execute test suites written to either test library. Passing —-xml to a test runner will now create two test report XML files, namely $programName-report.cppunit.xml and $programName-report.gtest.xml. The ByteArrayTest has been converted to use googletest instead of googlemock to serve as an example and test the integration. Test-Information: Build all tests via ‘./scons test=all’ and verified all tests are run. Build all tests via ‘./scons test=all checker_report=1’ and verified that two report XML files are generated per test runner executed. Change-Id: I81a9fb2c7ea5612fc1b34eef70ed7e711bfeea81
Diffstat (limited to 'Swiften/Base')
-rw-r--r--Swiften/Base/UnitTest/ByteArrayTest.cpp56
1 files changed, 21 insertions, 35 deletions
diff --git a/Swiften/Base/UnitTest/ByteArrayTest.cpp b/Swiften/Base/UnitTest/ByteArrayTest.cpp
index 2eb601b..f1732ae 100644
--- a/Swiften/Base/UnitTest/ByteArrayTest.cpp
+++ b/Swiften/Base/UnitTest/ByteArrayTest.cpp
@@ -6,52 +6,38 @@
#include <boost/lexical_cast.hpp>
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <gtest/gtest.h>
#include <Swiften/Base/ByteArray.h>
using namespace Swift;
-class ByteArrayTest : public CppUnit::TestFixture {
- CPPUNIT_TEST_SUITE(ByteArrayTest);
- CPPUNIT_TEST(testGetData_NoData);
- CPPUNIT_TEST(testToString);
- CPPUNIT_TEST(testToString_NullTerminated);
- CPPUNIT_TEST(testToString_TwoNullTerminated);
- CPPUNIT_TEST(testToString_AllNull);
- CPPUNIT_TEST_SUITE_END();
+TEST(ByteArrayTest, testGetData_NoData) {
+ ByteArray testling;
- public:
- void testGetData_NoData() {
- ByteArray testling;
+ ASSERT_EQ(reinterpret_cast<const char*>(NULL), reinterpret_cast<const char*>(vecptr(testling)));
+}
- CPPUNIT_ASSERT_EQUAL(reinterpret_cast<const char*>(NULL), reinterpret_cast<const char*>(vecptr(testling)));
- }
+TEST(ByteArrayTest, testToString) {
+ ByteArray testling(createByteArray("abcde"));
- void testToString() {
- ByteArray testling(createByteArray("abcde"));
+ ASSERT_EQ(std::string("abcde"), byteArrayToString(testling));
+}
- CPPUNIT_ASSERT_EQUAL(std::string("abcde"), byteArrayToString(testling));
- }
+TEST(ByteArrayTest, testToString_NullTerminated) {
+ ByteArray testling(createByteArray("abcde\0", 6));
- void testToString_NullTerminated() {
- ByteArray testling(createByteArray("abcde\0", 6));
+ ASSERT_EQ(std::string("abcde"), byteArrayToString(testling));
+}
- CPPUNIT_ASSERT_EQUAL(std::string("abcde"), byteArrayToString(testling));
- }
+TEST(ByteArrayTest, testToString_TwoNullTerminated) {
+ ByteArray testling(createByteArray("abcde\0\0", 7));
- void testToString_TwoNullTerminated() {
- ByteArray testling(createByteArray("abcde\0\0", 7));
+ ASSERT_EQ(std::string("abcde"), byteArrayToString(testling));
+}
- CPPUNIT_ASSERT_EQUAL(std::string("abcde"), byteArrayToString(testling));
- }
+TEST(ByteArrayTest, testToString_AllNull) {
+ ByteArray testling(createByteArray("\0\0", 2));
- void testToString_AllNull() {
- ByteArray testling(createByteArray("\0\0", 2));
-
- CPPUNIT_ASSERT_EQUAL(std::string(""), byteArrayToString(testling));
- }
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(ByteArrayTest);
+ ASSERT_EQ(std::string(""), byteArrayToString(testling));
+}