1 files changed, 26 insertions, 39 deletions
diff --git a/Swiften/Base/UnitTest/ByteArrayTest.cpp b/Swiften/Base/UnitTest/ByteArrayTest.cpp
index ecd0439..f1732ae 100644
--- a/Swiften/Base/UnitTest/ByteArrayTest.cpp
+++ b/Swiften/Base/UnitTest/ByteArrayTest.cpp
@@ -1,56 +1,43 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
-
-#include <Swiften/Base/ByteArray.h>
 #include <boost/lexical_cast.hpp>
 
-using namespace Swift;
+#include <gtest/gtest.h>
 
-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();
+#include <Swiften/Base/ByteArray.h>
 
-	public:
-		void testGetData_NoData() {
-			ByteArray testling;
+using namespace Swift;
 
-			CPPUNIT_ASSERT_EQUAL(reinterpret_cast<const char*>(NULL), reinterpret_cast<const char*>(vecptr(testling)));
-		}
+TEST(ByteArrayTest, testGetData_NoData) {
+    ByteArray testling;
 
-		void testToString() {
-			ByteArray testling(createByteArray("abcde"));
+    ASSERT_EQ(reinterpret_cast<const char*>(NULL), reinterpret_cast<const char*>(vecptr(testling)));
+}
 
-			CPPUNIT_ASSERT_EQUAL(std::string("abcde"), byteArrayToString(testling));
-		}
+TEST(ByteArrayTest, testToString) {
+    ByteArray testling(createByteArray("abcde"));
 
-		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_NullTerminated) {
+    ByteArray testling(createByteArray("abcde\0", 6));
 
-		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_TwoNullTerminated) {
+    ByteArray testling(createByteArray("abcde\0\0", 7));
 
-		void testToString_AllNull() {
-			ByteArray testling(createByteArray("\0\0", 2));
+    ASSERT_EQ(std::string("abcde"), byteArrayToString(testling));
+}
 
-			CPPUNIT_ASSERT_EQUAL(std::string(""), byteArrayToString(testling));
-		}
-};
+TEST(ByteArrayTest, testToString_AllNull) {
+    ByteArray testling(createByteArray("\0\0", 2));
 
-CPPUNIT_TEST_SUITE_REGISTRATION(ByteArrayTest);
+    ASSERT_EQ(std::string(""), byteArrayToString(testling));
+}