Mercurial > code

diff C++/Tests/Pack/main.cpp @ 290:7433ebe6a8b0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Pack: * Stateful classes * Use << and >> operators for more convenience, * Use PackFileWriter and PackFileReader to write/read a file, * Use PackStringWriter and PackStringReader to write/read a string, * Pack now supports object serialization through Pack::TypeInfo<T>::(un)serialize.
author David Demelier <markand@malikania.fr>
date Thu, 13 Nov 2014 13:08:49 +0100
parents b5d795389387
children 345aaeb5e0ba
line wrap: on
line diff
--- a/C++/Tests/Pack/main.cpp	Tue Nov 11 15:05:18 2014 +0100
+++ b/C++/Tests/Pack/main.cpp	Thu Nov 13 13:08:49 2014 +0100
@@ -23,6 +23,31 @@
 
 #include <Pack.h>
 
+struct Point
+{
+	uint32_t width{};
+	uint32_t height{};
+
+	inline bool operator==(const Point &other) const
+	{
+		return width == other.width && height == other.height;
+	}
+};
+
+template <>
+struct Pack::TypeInfo<Point> : public Pack::Serializable
+{
+	static void serialize(PackWriter &writer, const Point &point)
+	{
+		writer << point.width << point.height;
+	}
+
+	static void unserialize(PackReader &reader, Point &point)
+	{
+		reader >> point.width >> point.height;
+	}
+};
+
 TEST(File, simpleLittleEndian)
 {
 	uint8_t u8(1), r8;
@@ -30,16 +55,16 @@
 	uint32_t u32(3), r32;
 	uint64_t u64(4), r64;
 
+	remove("output.bin");
+
 	try {
-		std::ofstream out;
-		out.open("simple-little.bin", std::ostream::out);
-		Pack::write(out, Pack::Little, u8, u16, u32, u64);
-		out.close();
+		{
+			PackFileWriter writer{"output.bin", Pack::Little};
+			writer << u8 << u16 << u32 << u64;
+		}
 
-		std::ifstream in;
-		in.open("simple-little.bin", std::ostream::in);
-		Pack::read(in, Pack::Little, r8, r16, r32, r64);
-		in.close();
+		PackFileReader reader{"output.bin", Pack::Little};
+		reader >> r8 >> r16 >> r32 >> r64;
 
 		ASSERT_EQ(u8, r8);
 		ASSERT_EQ(u16, r16);
@@ -57,16 +82,84 @@
 	uint32_t u32(3), r32;
 	uint64_t u64(4), r64;
 
+	remove("output.bin");
+
 	try {
-		std::ofstream out;
-		out.open("simple-big.bin", std::ostream::out);
-		Pack::write(out, Pack::Big, u8, u16, u32, u64);
-		out.close();
+		{
+			PackFileWriter writer{"output.bin", Pack::Big};
+			writer << u8 << u16 << u32 << u64;
+		}
+
+		PackFileReader reader{"output.bin", Pack::Big};
+		reader >> r8 >> r16 >> r32 >> r64;
+
+		ASSERT_EQ(u8, r8);
+		ASSERT_EQ(u16, r16);
+		ASSERT_EQ(u32, r32);
+		ASSERT_EQ(u64, r64);
+	} catch (const std::exception &error) {
+		FAIL() << error.what();
+	}
+}
+
+TEST(File, arrayLittleEndian)
+{
+	std::vector<uint8_t> u8 { 1, 2, 3, 4, 5, 6, 7, 8 };
+	std::vector<uint16_t> u16 { 10, 20, 30, 40, 50, 60, 70, 80 };
+	std::vector<uint32_t> u32 { 100, 200, 300, 400, 500, 600, 700, 800 };
+	std::vector<uint64_t> u64 { 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000 };
+
+	std::vector<uint8_t> r8(8);
+	std::vector<uint16_t> r16(8);
+	std::vector<uint32_t> r32(8);
+	std::vector<uint64_t> r64(8);
+
+	remove("output.bin");
+
+	try {
+		{
+			PackFileWriter writer{"output.bin", Pack::Little};
+
+			writer << u8 << u16 << u32 << u64;
+		}
 
-		std::ifstream in;
-		in.open("simple-big.bin", std::ostream::in);
-		Pack::read(in, Pack::Big, r8, r16, r32, r64);
-		in.close();
+		PackFileReader reader{"output.bin", Pack::Little};
+
+		reader >> r8 >> r16 >> r32 >> r64;
+
+		ASSERT_EQ(u8, r8);
+		ASSERT_EQ(u16, r16);
+		ASSERT_EQ(u32, r32);
+		ASSERT_EQ(u64, r64);
+	} catch (const std::exception &error) {
+		FAIL() << error.what();
+	}
+}
+
+TEST(File, arrayBigEndian)
+{
+	std::vector<uint8_t> u8 { 1, 2, 3, 4, 5, 6, 7, 8 };
+	std::vector<uint16_t> u16 { 10, 20, 30, 40, 50, 60, 70, 80 };
+	std::vector<uint32_t> u32 { 100, 200, 300, 400, 500, 600, 700, 800 };
+	std::vector<uint64_t> u64 { 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000 };
+
+	std::vector<uint8_t> r8(8);
+	std::vector<uint16_t> r16(8);
+	std::vector<uint32_t> r32(8);
+	std::vector<uint64_t> r64(8);
+
+	remove("output.bin");
+
+	try {
+		{
+			PackFileWriter writer{"output.bin", Pack::Big};
+
+			writer << u8 << u16 << u32 << u64;
+		}
+
+		PackFileReader reader{"output.bin", Pack::Big};
+
+		reader >> r8 >> r16 >> r32 >> r64;
 
 		ASSERT_EQ(u8, r8);
 		ASSERT_EQ(u16, r16);
@@ -77,6 +170,102 @@
 	}
 }
 
+TEST(File, serializeSimpleLittleEndian)
+{
+	Point point{200, 400};
+	Point result;
+
+	remove("output.bin");
+
+	try {
+		{
+			PackFileWriter writer{"output.bin", Pack::Little};
+
+			writer << point;
+		}
+
+		PackFileReader reader{"output.bin", Pack::Little};
+
+		reader >> result;
+
+		ASSERT_EQ(point, result);
+	} catch (const std::exception &ex) {
+		std::cerr << "warning: " << ex.what() << std::endl;
+	}
+}
+
+TEST(File, serializeSimpleBigEndian)
+{
+	Point point{200, 400};
+	Point result;
+
+	remove("output.bin");
+
+	try {
+		{
+			PackFileWriter writer{"output.bin", Pack::Big};
+
+			writer << point;
+		}
+
+		PackFileReader reader{"output.bin", Pack::Big};
+
+		reader >> result;
+
+		ASSERT_EQ(point, result);
+	} catch (const std::exception &ex) {
+		std::cerr << "warning: " << ex.what() << std::endl;
+	}
+}
+
+TEST(File, serializeArrayLittleEndian)
+{
+	std::vector<Point> points{{10, 20}, {30, 40}};
+	std::vector<Point> rpoints(2);
+
+	remove("output.bin");
+
+	try {
+		{
+			PackFileWriter writer{"output.bin", Pack::Little};
+
+			writer << points;
+		}
+
+		PackFileReader reader{"output.bin", Pack::Little};
+
+		reader >> rpoints;
+
+		ASSERT_EQ(points, rpoints);
+	} catch (const std::exception &ex) {
+		std::cerr << "warning: " << ex.what() << std::endl;
+	}
+}
+
+TEST(File, serializeArrayBigEndian)
+{
+	std::vector<Point> points{{10, 20}, {30, 40}};
+	std::vector<Point> rpoints(2);
+
+	remove("output.bin");
+
+	try {
+		{
+			PackFileWriter writer{"output.bin", Pack::Big};
+
+			writer << points;
+		}
+
+		PackFileReader reader{"output.bin", Pack::Big};
+
+		reader >> rpoints;
+
+		ASSERT_EQ(points, rpoints);
+	} catch (const std::exception &ex) {
+		std::cerr << "warning: " << ex.what() << std::endl;
+	}
+}
+
 TEST(String, simpleLittleEndian)
 {
 	uint8_t u8(1), r8;
@@ -85,11 +274,16 @@
 	uint64_t u64(4), r64;
 
 	try {
-		std::ostringstream out;
-		Pack::write(out, Pack::Little, u8, u16, u32, u64);
+		std::string input;
 
-		std::istringstream in(out.str());
-		Pack::read(in, Pack::Little, r8, r16, r32, r64);
+		{
+			PackStringWriter writer{Pack::Little};
+			writer << u8 << u16 << u32 << u64;
+			input = writer.buffer();
+		}
+
+		PackStringReader reader{std::move(input), Pack::Little};
+		reader >> r8 >> r16 >> r32 >> r64;
 
 		ASSERT_EQ(u8, r8);
 		ASSERT_EQ(u16, r16);
@@ -108,11 +302,86 @@
 	uint64_t u64(4), r64;
 
 	try {
-		std::ostringstream out;
-		Pack::write(out, Pack::Big, u8, u16, u32, u64);
+		std::string input;
+
+		{
+			PackStringWriter writer{Pack::Big};
+			writer << u8 << u16 << u32 << u64;
+			input = writer.buffer();
+		}
+
+		PackStringReader reader{std::move(input), Pack::Big};
+		reader >> r8 >> r16 >> r32 >> r64;
+
+		ASSERT_EQ(u8, r8);
+		ASSERT_EQ(u16, r16);
+		ASSERT_EQ(u32, r32);
+		ASSERT_EQ(u64, r64);
+	} catch (const std::exception &error) {
+		FAIL() << error.what();
+	}
+}
+
+TEST(String, arrayLittleEndian)
+{
+	std::vector<uint8_t> u8 { 1, 2, 3, 4, 5, 6, 7, 8 };
+	std::vector<uint16_t> u16 { 10, 20, 30, 40, 50, 60, 70, 80 };
+	std::vector<uint32_t> u32 { 100, 200, 300, 400, 500, 600, 700, 800 };
+	std::vector<uint64_t> u64 { 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000 };
+
+	std::vector<uint8_t> r8(8);
+	std::vector<uint16_t> r16(8);
+	std::vector<uint32_t> r32(8);
+	std::vector<uint64_t> r64(8);
+
+	try {
+		std::string input;
+
+		{
+			PackStringWriter writer{Pack::Little};
 
-		std::istringstream in(out.str());
-		Pack::read(in, Pack::Big, r8, r16, r32, r64);
+			writer << u8 << u16 << u32 << u64;
+			input = writer.buffer();
+		}
+
+		PackStringReader reader{std::move(input), Pack::Little};
+
+		reader >> r8 >> r16 >> r32 >> r64;
+
+		ASSERT_EQ(u8, r8);
+		ASSERT_EQ(u16, r16);
+		ASSERT_EQ(u32, r32);
+		ASSERT_EQ(u64, r64);
+	} catch (const std::exception &error) {
+		FAIL() << error.what();
+	}
+}
+
+TEST(String, arrayBigEndian)
+{
+	std::vector<uint8_t> u8 { 1, 2, 3, 4, 5, 6, 7, 8 };
+	std::vector<uint16_t> u16 { 10, 20, 30, 40, 50, 60, 70, 80 };
+	std::vector<uint32_t> u32 { 100, 200, 300, 400, 500, 600, 700, 800 };
+	std::vector<uint64_t> u64 { 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000 };
+
+	std::vector<uint8_t> r8(8);
+	std::vector<uint16_t> r16(8);
+	std::vector<uint32_t> r32(8);
+	std::vector<uint64_t> r64(8);
+
+	try {
+		std::string input;
+
+		{
+			PackStringWriter writer{Pack::Big};
+
+			writer << u8 << u16 << u32 << u64;
+			input = writer.buffer();
+		}
+
+		PackStringReader reader{std::move(input), Pack::Big};
+
+		reader >> r8 >> r16 >> r32 >> r64;
 
 		ASSERT_EQ(u8, r8);
 		ASSERT_EQ(u16, r16);
@@ -123,73 +392,103 @@
 	}
 }
 
-TEST(Array, simpleLittleEndian)
+TEST(String, serializeSimpleLittleEndian)
 {
-	std::vector<uint8_t> u8 { 1, 2, 3, 4, 5, 6, 7, 8 };
-	std::vector<uint16_t> u16 { 10, 20, 30, 40, 50, 60, 70, 80 };
-	std::vector<uint32_t> u32 { 100, 200, 300, 400, 500, 600, 700, 800 };
-	std::vector<uint64_t> u64 { 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000 };
-
-	std::vector<uint8_t> r8;
-	std::vector<uint16_t> r16;
-	std::vector<uint32_t> r32;
-	std::vector<uint64_t> r64;
+	Point point{200, 400};
+	Point result;
 
 	try {
-		std::ostringstream out;
-		Pack::writeArray(out, Pack::Little, u8.cbegin(), u8.size());
-		Pack::writeArray(out, Pack::Little, u16.cbegin(), u16.size());
-		Pack::writeArray(out, Pack::Little, u32.cbegin(), u32.size());
-		Pack::writeArray(out, Pack::Little, u64.cbegin(), u64.size());
+		std::string input;
+
+		{
+			PackStringWriter writer{Pack::Little};
 
-		std::istringstream in(out.str());
-		Pack::readArray(in, Pack::Little, std::back_inserter(r8), 8);
-		Pack::readArray(in, Pack::Little, std::back_inserter(r16), 8);
-		Pack::readArray(in, Pack::Little, std::back_inserter(r32), 8);
-		Pack::readArray(in, Pack::Little, std::back_inserter(r64), 8);
+			writer << point;
+			input = writer.buffer();
+		}
 
+		PackStringReader reader{std::move(input), Pack::Little};
 
-		ASSERT_EQ(u8, r8);
-		ASSERT_EQ(u16, r16);
-		ASSERT_EQ(u32, r32);
-		ASSERT_EQ(u64, r64);
-	} catch (const std::exception &error) {
-		FAIL() << error.what();
+		reader >> result;
+
+		ASSERT_EQ(point, result);
+	} catch (const std::exception &ex) {
+		std::cerr << "warning: " << ex.what() << std::endl;
 	}
 }
 
-TEST(Array, simpleBigEndian)
+TEST(String, serializeSimpleBigEndian)
 {
-	std::vector<uint8_t> u8 { 1, 2, 3, 4, 5, 6, 7, 8 };
-	std::vector<uint16_t> u16 { 10, 20, 30, 40, 50, 60, 70, 80 };
-	std::vector<uint32_t> u32 { 100, 200, 300, 400, 500, 600, 700, 800 };
-	std::vector<uint64_t> u64 { 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000 };
+	Point point{200, 400};
+	Point result;
+
+	try {
+		std::string input;
+
+		{
+			PackStringWriter writer{Pack::Big};
+
+			writer << point;
+			input = writer.buffer();
+		}
 
-	std::vector<uint8_t> r8;
-	std::vector<uint16_t> r16;
-	std::vector<uint32_t> r32;
-	std::vector<uint64_t> r64;
+		PackStringReader reader{std::move(input), Pack::Big};
+
+		reader >> result;
+
+		ASSERT_EQ(point, result);
+	} catch (const std::exception &ex) {
+		std::cerr << "warning: " << ex.what() << std::endl;
+	}
+}
+
+TEST(String, serializeArrayLittleEndian)
+{
+	std::vector<Point> points{{10, 20}, {30, 40}};
+	std::vector<Point> rpoints(2);
 
 	try {
-		std::ostringstream out;
-		Pack::writeArray(out, Pack::Big, u8.cbegin(), u8.size());
-		Pack::writeArray(out, Pack::Big, u16.cbegin(), u16.size());
-		Pack::writeArray(out, Pack::Big, u32.cbegin(), u32.size());
-		Pack::writeArray(out, Pack::Big, u64.cbegin(), u64.size());
+		std::string input;
+
+		{
+			PackStringWriter writer{Pack::Little};
+
+			writer << points;
+			input = writer.buffer();
+		}
+
+		PackStringReader reader{std::move(input), Pack::Little};
+
+		reader >> rpoints;
+
+		ASSERT_EQ(points, rpoints);
+	} catch (const std::exception &ex) {
+		std::cerr << "warning: " << ex.what() << std::endl;
+	}
+}
 
-		std::istringstream in(out.str());
-		Pack::readArray(in, Pack::Big, std::back_inserter(r8), 8);
-		Pack::readArray(in, Pack::Big, std::back_inserter(r16), 8);
-		Pack::readArray(in, Pack::Big, std::back_inserter(r32), 8);
-		Pack::readArray(in, Pack::Big, std::back_inserter(r64), 8);
+TEST(String, serializeArrayBigEndian)
+{
+	std::vector<Point> points{{10, 20}, {30, 40}};
+	std::vector<Point> rpoints(2);
 
+	try {
+		std::string input;
+
+		{
+			PackStringWriter writer{Pack::Big};
 
-		ASSERT_EQ(u8, r8);
-		ASSERT_EQ(u16, r16);
-		ASSERT_EQ(u32, r32);
-		ASSERT_EQ(u64, r64);
-	} catch (const std::exception &error) {
-		FAIL() << error.what();
+			writer << points;
+			input = writer.buffer();
+		}
+
+		PackStringReader reader{std::move(input), Pack::Big};
+
+		reader >> rpoints;
+
+		ASSERT_EQ(points, rpoints);
+	} catch (const std::exception &ex) {
+		std::cerr << "warning: " << ex.what() << std::endl;
 	}
 }