--- a/UnitTestsSources/UnitTestsMain.cpp	Tue Aug 11 16:09:24 2015 +0200
+++ b/UnitTestsSources/UnitTestsMain.cpp	Tue Aug 11 17:50:38 2015 +0200
@@ -37,8 +37,6 @@
 
 #include <ctype.h>
 
-#include "../Core/Compression/ZlibCompressor.h"
-#include "../Core/Compression/GzipCompressor.h"
 #include "../Core/DicomFormat/DicomTag.h"
 #include "../Core/HttpServer/HttpToolbox.h"
 #include "../Core/Logging.h"
@@ -100,136 +98,6 @@
 }
 
 
-TEST(Gzip, Basic)
-{
-  std::string s = "Hello world";
- 
-  std::string compressed;
-  GzipCompressor c;
-  ASSERT_FALSE(c.HasPrefixWithUncompressedSize());
-  IBufferCompressor::Compress(compressed, c, s);
-
-  std::string uncompressed;
-  IBufferCompressor::Uncompress(uncompressed, c, compressed);
-  ASSERT_EQ(s.size(), uncompressed.size());
-  ASSERT_EQ(0, memcmp(&s[0], &uncompressed[0], s.size()));
-}
-
-
-TEST(Gzip, Empty)
-{
-  std::string s;
- 
-  std::string compressed;
-  GzipCompressor c;
-  ASSERT_FALSE(c.HasPrefixWithUncompressedSize());
-  c.SetPrefixWithUncompressedSize(false);
-  IBufferCompressor::Compress(compressed, c, s);
-
-  std::string uncompressed;
-  IBufferCompressor::Uncompress(uncompressed, c, compressed);
-  ASSERT_EQ(0, uncompressed.size());
-}
-
-
-TEST(Gzip, BasicWithPrefix)
-{
-  std::string s = "Hello world";
- 
-  std::string compressed;
-  GzipCompressor c;
-  c.SetPrefixWithUncompressedSize(true);
-  ASSERT_TRUE(c.HasPrefixWithUncompressedSize());
-  IBufferCompressor::Compress(compressed, c, s);
-
-  std::string uncompressed;
-  IBufferCompressor::Uncompress(uncompressed, c, compressed);
-  ASSERT_EQ(s.size(), uncompressed.size());
-  ASSERT_EQ(0, memcmp(&s[0], &uncompressed[0], s.size()));
-}
-
-
-TEST(Gzip, EmptyWithPrefix)
-{
-  std::string s;
- 
-  std::string compressed;
-  GzipCompressor c;
-  c.SetPrefixWithUncompressedSize(true);
-  ASSERT_TRUE(c.HasPrefixWithUncompressedSize());
-  IBufferCompressor::Compress(compressed, c, s);
-
-  std::string uncompressed;
-  IBufferCompressor::Uncompress(uncompressed, c, compressed);
-  ASSERT_EQ(0, uncompressed.size());
-}
-
-
-TEST(Zlib, Basic)
-{
-  std::string s = Toolbox::GenerateUuid();
-  s = s + s + s + s;
- 
-  std::string compressed, compressed2;
-  ZlibCompressor c;
-  ASSERT_TRUE(c.HasPrefixWithUncompressedSize());
-  IBufferCompressor::Compress(compressed, c, s);
-
-  std::string uncompressed;
-  IBufferCompressor::Uncompress(uncompressed, c, compressed);
-  ASSERT_EQ(s.size(), uncompressed.size());
-  ASSERT_EQ(0, memcmp(&s[0], &uncompressed[0], s.size()));
-}
-
-
-TEST(Zlib, Level)
-{
-  std::string s = Toolbox::GenerateUuid();
-  s = s + s + s + s;
- 
-  std::string compressed, compressed2;
-  ZlibCompressor c;
-  c.SetCompressionLevel(9);
-  IBufferCompressor::Compress(compressed, c, s);
-
-  c.SetCompressionLevel(0);
-  IBufferCompressor::Compress(compressed2, c, s);
-
-  ASSERT_TRUE(compressed.size() < compressed2.size());
-}
-
-
-TEST(Zlib, DISABLED_Corrupted)  // Disabled because it may result in a crash
-{
-  std::string s = Toolbox::GenerateUuid();
-  s = s + s + s + s;
- 
-  std::string compressed;
-  ZlibCompressor c;
-  IBufferCompressor::Compress(compressed, c, s);
-
-  compressed[compressed.size() - 1] = 'a';
-  std::string u;
-
-  ASSERT_THROW(IBufferCompressor::Uncompress(u, c, compressed), OrthancException);
-}
-
-
-TEST(Zlib, Empty)
-{
-  std::string s = "";
- 
-  std::string compressed, compressed2;
-  ZlibCompressor c;
-  IBufferCompressor::Compress(compressed, c, s);
-  ASSERT_EQ(compressed, compressed2);
-
-  std::string uncompressed;
-  IBufferCompressor::Uncompress(uncompressed, c, compressed);
-  ASSERT_EQ(0u, uncompressed.size());
-}
-
-
 TEST(ParseGetArguments, Basic)
 {
   IHttpHandler::GetArguments b;