changeset 268:b5d795389387

Pack: * Remove read / write from path, it makes no sense because you need to read all in one shot. * Implement arrays via readArray / writeArray using iterators. Task: #302
author David Demelier <markand@malikania.fr>
date Wed, 15 Oct 2014 21:29:20 +0200
parents bc9b5e7421a7
children 44dcc198bf0c
files C++/Pack.h C++/Tests/Pack/main.cpp
diffstat 2 files changed, 176 insertions(+), 41 deletions(-) [+]
line wrap: on
line diff
--- a/C++/Pack.h	Tue Oct 14 13:14:36 2014 +0200
+++ b/C++/Pack.h	Wed Oct 15 21:29:20 2014 +0200
@@ -99,32 +99,12 @@
 	template <typename T, typename... Args>
 	static void write(std::ostream &out, Endian endian, const T &value, const Args&... args)
 	{
-		T ret = convert(value, endian);
+		auto ret = convert(value, endian);
 		out.write(reinterpret_cast<const char *>(&ret), TypeInfo<T>::size);
 		write(out, endian, args...);
 	}
 
 	/**
-	 * Write binary data to the file.
-	 *
-	 * @param path the path to the file
-	 * @param endian the endian mode
-	 * @param args the arguments
-	 * @throw std::runtime_exception on error
-	 */
-	template <typename... Args>
-	static void write(const std::string &path, Endian endian, const Args&... args)
-	{
-		std::ofstream out;
-
-		out.open(path, std::ios_base::binary);
-		if (!out.is_open())
-			throw std::runtime_error("Can't open file for writing");
-
-		write(out, endian, args...);
-	}
-
-	/**
 	 * Read nothing, stop recursion.
 	 */
 	static void read(std::istream &, Endian)
@@ -148,23 +128,45 @@
 	}
 
 	/**
-	 * Read binary data from the file.
+	 * Read array and store it to the output iterator. Because the container
+	 * is not allocated, we use an integer based size to determine the
+	 * number of bytes to read.
 	 *
-	 * @param path the path to the file
+	 * @param in the input stream
 	 * @param endian the endian mode
-	 * @param args the arguments
-	 * @throw std::runtime_exception on error
+	 * @param out the output it
+	 * @param count the number of bytes to read
+	 * @throw std::runtime_error on error
 	 */
-	template <typename... Args>
-	static void read(const std::string &path, Endian endian, Args&... args)
+	template <typename OutputIt>
+	static void readArray(std::istream &in, Endian endian, OutputIt out, unsigned count)
 	{
-		std::ifstream in;
+		typename OutputIt::container_type::value_type byte;
+
+		for (unsigned i = 0; i < count; ++i) {
+			read(in, endian, byte);
+			*out++ = byte;
+		}
+	}
 
-		in.open(path, std::ios_base::binary);
-		if (!in.is_open())
-			throw std::runtime_error("Can't open file for reading");
+	/**
+	 * Read a container from an input iterator and write it to output stream.
+	 *
+	 * @param out the output stream
+	 * @param endian the endian mode
+	 * @param in the input iterator
+	 * @param count the number of bytes to write
+	 * @throw std::runtime_error on error
+	 */
+	template <typename InputIt>
+	static void writeArray(std::ostream &out, Endian endian, InputIt in, unsigned count)
+	{
+		typename std::iterator_traits<InputIt>::value_type byte;
 
-		read(in, endian, args...);
+		for (unsigned i = 0; i < count; ++i) {
+			byte = *in++;
+			write(out, endian, byte);
+		}
 	}
 };
 
--- a/C++/Tests/Pack/main.cpp	Tue Oct 14 13:14:36 2014 +0200
+++ b/C++/Tests/Pack/main.cpp	Wed Oct 15 21:29:20 2014 +0200
@@ -16,11 +16,68 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <sstream>
+#include <vector>
+
 #include <gtest/gtest.h>
 
 #include <Pack.h>
 
-TEST(Simple, simpleLittleEndian)
+TEST(File, simpleLittleEndian)
+{
+	uint8_t u8(1), r8;
+	uint16_t u16(2), r16;
+	uint32_t u32(3), r32;
+	uint64_t u64(4), r64;
+
+	try {
+		std::ofstream out;
+		out.open("simple-little.bin", std::ostream::out);
+		Pack::write(out, Pack::Little, u8, u16, u32, u64);
+		out.close();
+
+		std::ifstream in;
+		in.open("simple-little.bin", std::ostream::in);
+		Pack::read(in, Pack::Little, r8, r16, r32, r64);
+		in.close();
+
+		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, simpleBigEndian)
+{
+	uint8_t u8(1), r8;
+	uint16_t u16(2), r16;
+	uint32_t u32(3), r32;
+	uint64_t u64(4), r64;
+
+	try {
+		std::ofstream out;
+		out.open("simple-big.bin", std::ostream::out);
+		Pack::write(out, Pack::Big, u8, u16, u32, u64);
+		out.close();
+
+		std::ifstream in;
+		in.open("simple-big.bin", std::ostream::in);
+		Pack::read(in, Pack::Big, r8, r16, r32, r64);
+		in.close();
+
+		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, simpleLittleEndian)
 {
 	uint8_t u8(1), r8;
 	uint16_t u16(2), r16;
@@ -28,19 +85,22 @@
 	uint64_t u64(4), r64;
 
 	try {
-		Pack::write("simple-little.bin", Pack::Little, u8, u16, u32, u64);
-		Pack::read("simple-little.bin", Pack::Little, r8, r16, r32, r64);
+		std::ostringstream out;
+		Pack::write(out, Pack::Little, u8, u16, u32, u64);
+
+		std::istringstream in(out.str());
+		Pack::read(in, Pack::Little, r8, r16, r32, r64);
 
 		ASSERT_EQ(u8, r8);
 		ASSERT_EQ(u16, r16);
 		ASSERT_EQ(u32, r32);
 		ASSERT_EQ(u64, r64);
-	} catch (const std::runtime_error &error) {
+	} catch (const std::exception &error) {
 		FAIL() << error.what();
 	}
 }
 
-TEST(Simple, simpleBigEndian)
+TEST(String, simpleBigEndian)
 {
 	uint8_t u8(1), r8;
 	uint16_t u16(2), r16;
@@ -48,14 +108,87 @@
 	uint64_t u64(4), r64;
 
 	try {
-		Pack::write("simple-big.bin", Pack::Big, u8, u16, u32, u64);
-		Pack::read("simple-big.bin", Pack::Big, r8, r16, r32, r64);
+		std::ostringstream out;
+		Pack::write(out, Pack::Big, u8, u16, u32, u64);
+
+		std::istringstream in(out.str());
+		Pack::read(in, Pack::Big, r8, r16, r32, r64);
 
 		ASSERT_EQ(u8, r8);
 		ASSERT_EQ(u16, r16);
 		ASSERT_EQ(u32, r32);
 		ASSERT_EQ(u64, r64);
-	} catch (const std::runtime_error &error) {
+	} catch (const std::exception &error) {
+		FAIL() << error.what();
+	}
+}
+
+TEST(Array, simpleLittleEndian)
+{
+	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;
+
+	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::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);
+
+
+		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(Array, simpleBigEndian)
+{
+	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;
+
+	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::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);
+
+
+		ASSERT_EQ(u8, r8);
+		ASSERT_EQ(u16, r16);
+		ASSERT_EQ(u32, r32);
+		ASSERT_EQ(u64, r64);
+	} catch (const std::exception &error) {
 		FAIL() << error.what();
 	}
 }
@@ -65,4 +198,4 @@
 	testing::InitGoogleTest(&argc, argv);
 
 	return RUN_ALL_TESTS();
-}
\ No newline at end of file
+}