From ef10a4f34a3f10bc1fc7ee0b7b1be6f37d286741 Mon Sep 17 00:00:00 2001 From: ljfa-ag Date: Tue, 15 Sep 2015 20:41:11 +0200 Subject: Add test for inflating zlib data --- test/testfiles/bigtest.zlib | Bin 0 -> 528 bytes test/zlibstream_test.h | 16 ++++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 test/testfiles/bigtest.zlib (limited to 'test') diff --git a/test/testfiles/bigtest.zlib b/test/testfiles/bigtest.zlib new file mode 100644 index 0000000000..36aeee57fb Binary files /dev/null and b/test/testfiles/bigtest.zlib differ diff --git a/test/zlibstream_test.h b/test/zlibstream_test.h index f37dcdbd91..d2e6b6ee82 100644 --- a/test/zlibstream_test.h +++ b/test/zlibstream_test.h @@ -89,6 +89,22 @@ public: } } + void test_inflate_zlib() + { + std::ifstream zlib_in("bigtest.zlib", std::ios::binary); + TS_ASSERT(zlib_in); + + std::stringbuf data; + izlibstream izls(zlib_in, 256); + izls.exceptions(std::ios::failbit); + TS_ASSERT(izls.good()); + + TS_ASSERT_THROWS_NOTHING(izls >> &data); + TS_ASSERT(izls); + TS_ASSERT(izls.eof()); + TS_ASSERT_EQUALS(data.str(), bigtest.str()); + } + void test_inflate_corrupt() { std::ifstream gzip_in("bigtest_corrupt.nbt", std::ios::binary); -- cgit 0.0.5-2-1-g0f52 From edaaac5a6c7d20eb5baa6de27aa79cb50878a10b Mon Sep 17 00:00:00 2001 From: ljfa-ag Date: Tue, 15 Sep 2015 23:40:49 +0200 Subject: Moving and copying is disabled for ozlibstream too --- include/io/ozlibstream.h | 9 --------- test/zlibstream_test.h | 1 + 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'test') diff --git a/include/io/ozlibstream.h b/include/io/ozlibstream.h index 954bcc182d..0e19aaaa2b 100644 --- a/include/io/ozlibstream.h +++ b/include/io/ozlibstream.h @@ -20,7 +20,6 @@ #ifndef OZLIBSTREAM_H_INCLUDED #define OZLIBSTREAM_H_INCLUDED -#include "io/zlib_error.h" #include #include #include @@ -38,14 +37,6 @@ public: explicit deflate_streambuf(std::ostream& output, int level = -1, int window_bits = 15, int mem_level = 8, int strategy = Z_DEFAULT_STRATEGY); ~deflate_streambuf() noexcept; - //Moving - deflate_streambuf(deflate_streambuf&&) noexcept = default; - deflate_streambuf& operator=(deflate_streambuf&&) noexcept = default; - - //No copying - deflate_streambuf(const deflate_streambuf&) = delete; - deflate_streambuf& operator=(const deflate_streambuf&) = delete; - std::ostream& get_ostr() const { return os; } private: diff --git a/test/zlibstream_test.h b/test/zlibstream_test.h index d2e6b6ee82..8e9ca6b0f2 100644 --- a/test/zlibstream_test.h +++ b/test/zlibstream_test.h @@ -20,6 +20,7 @@ #include #include "io/izlibstream.h" #include "io/ozlibstream.h" +#include "io/zlib_error.h" #include #include -- cgit 0.0.5-2-1-g0f52