2 files changed, 32 insertions, 3 deletions
diff --git a/Swiften/Base/UnitTest/ByteArrayTest.cpp b/Swiften/Base/UnitTest/ByteArrayTest.cpp
index cb10dd4..ecd0439 100644
--- a/Swiften/Base/UnitTest/ByteArrayTest.cpp
+++ b/Swiften/Base/UnitTest/ByteArrayTest.cpp
@@ -7,20 +7,49 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
-#include "Swiften/Base/ByteArray.h"
+#include <Swiften/Base/ByteArray.h>
+#include <boost/lexical_cast.hpp>
 
 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();
 
 	public:
 		void testGetData_NoData() {
 			ByteArray testling;
 
-			CPPUNIT_ASSERT_EQUAL(reinterpret_cast<const char*>(NULL), reinterpret_cast<const char*>(testling.getData()));
+			CPPUNIT_ASSERT_EQUAL(reinterpret_cast<const char*>(NULL), reinterpret_cast<const char*>(vecptr(testling)));
+		}
+
+		void testToString() {
+			ByteArray testling(createByteArray("abcde"));
+
+			CPPUNIT_ASSERT_EQUAL(std::string("abcde"), byteArrayToString(testling));
+		}
+
+		void testToString_NullTerminated() {
+			ByteArray testling(createByteArray("abcde\0", 6));
+
+			CPPUNIT_ASSERT_EQUAL(std::string("abcde"), byteArrayToString(testling));
+		}
+
+		void testToString_TwoNullTerminated() {
+			ByteArray testling(createByteArray("abcde\0\0", 7));
+
+			CPPUNIT_ASSERT_EQUAL(std::string("abcde"), byteArrayToString(testling));
+		}
+
+		void testToString_AllNull() {
+			ByteArray testling(createByteArray("\0\0", 2));
+
+			CPPUNIT_ASSERT_EQUAL(std::string(""), byteArrayToString(testling));
 		}
 };
 
diff --git a/Swiften/Base/UnitTest/IDGeneratorTest.cpp b/Swiften/Base/UnitTest/IDGeneratorTest.cpp
index 4874684..610138f 100644
--- a/Swiften/Base/UnitTest/IDGeneratorTest.cpp
+++ b/Swiften/Base/UnitTest/IDGeneratorTest.cpp
@@ -8,7 +8,7 @@
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <set>
 
-#include "Swiften/Base/IDGenerator.h"
+#include <Swiften/Base/IDGenerator.h>
 
 using namespace Swift;