4 files changed, 24 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
@@ -1,57 +1,43 @@
 /*
  * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #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));
+}
diff --git a/Swiften/QA/NetworkTest/SConscript b/Swiften/QA/NetworkTest/SConscript
index 387bafc..606af5d 100644
--- a/Swiften/QA/NetworkTest/SConscript
+++ b/Swiften/QA/NetworkTest/SConscript
@@ -1,22 +1,23 @@
 import os
 
 Import("env")
 
 if env["TEST"] :
     myenv = env.Clone()
     if "test_ipv6" in ARGUMENTS :
         myenv.Append(CPPDEFINES = ["TEST_IPV6"])
     myenv.MergeFlags(myenv["CHECKER_FLAGS"])
     myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
     myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"])
     myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
+    myenv.MergeFlags(myenv["GOOGLETEST_FLAGS"])
 
     if env.get("unbound", False) :
         myenv.Append(CPPDEFINES = ["USE_UNBOUND"])
 
     tester = myenv.Program("NetworkTest", [
             "BoostConnectionServerTest.cpp",
             "BoostConnectionTest.cpp",
             "DomainNameResolverTest.cpp",
         ])
     myenv.Test(tester, "system", is_checker = True)
diff --git a/Swiften/QA/StorageTest/SConscript b/Swiften/QA/StorageTest/SConscript
index bb1a2c6..b8360ec 100644
--- a/Swiften/QA/StorageTest/SConscript
+++ b/Swiften/QA/StorageTest/SConscript
@@ -1,22 +1,23 @@
 import os
 
 Import("env")
 
 if env["TEST"] :
     myenv = env.Clone()
     myenv.MergeFlags(myenv["CHECKER_FLAGS"])
     myenv.MergeFlags(myenv["SWIFTOOLS_FLAGS"])
     myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
     myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
+    myenv.MergeFlags(myenv["GOOGLETEST_FLAGS"])
     myenv.MergeFlags(myenv["BOOST_FLAGS"])
     myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
     myenv.MergeFlags(myenv.get("EXPAT_FLAGS", {}))
     myenv.MergeFlags(myenv.get("LIBXML_FLAGS", {}))
     myenv.MergeFlags(myenv["PLATFORM_FLAGS"])
 
     tester = myenv.Program("StorageTest", [
             #"VCardFileStorageTest.cpp",
             "FileReadBytestreamTest.cpp",
             "FileWriteBytestreamTest.cpp",
         ])
     myenv.Test(tester, "system", is_checker = True)
diff --git a/Swiften/QA/TLSTest/SConscript b/Swiften/QA/TLSTest/SConscript
index b7bfc7d..7811b50 100644
--- a/Swiften/QA/TLSTest/SConscript
+++ b/Swiften/QA/TLSTest/SConscript
@@ -1,26 +1,27 @@
 import os
 
 Import("env")
 
 if env["TEST"] :
     myenv = env.Clone()
     myenv.MergeFlags(myenv["CHECKER_FLAGS"])
     myenv.MergeFlags(myenv["SWIFTOOLS_FLAGS"])
     myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
     myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"])
     myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
+    myenv.MergeFlags(myenv["GOOGLETEST_FLAGS"])
 
     if myenv.get("HAVE_OPENSSL", 0) :
         myenv.Append(CPPDEFINES = "HAVE_OPENSSL")
         myenv.MergeFlags(myenv["OPENSSL_FLAGS"])
     elif myenv.get("HAVE_SCHANNEL", 0) :
         myenv.Append(CPPDEFINES = "HAVE_SCHANNEL")
     elif myenv.get("HAVE_SECURETRANSPORT", 0) :
         myenv.Append(CPPDEFINES = "HAVE_SECURETRANSPORT")
 
     tester = myenv.Program("TLSTest", [
             "CertificateTest.cpp",
             # Reenable if either http://www.tls-o-matic.com/ is fixed or we have setup a replacement.
             #"CertificateErrorTest.cpp"
         ])
     myenv.Test(tester, "system")
 \ No newline at end of file