# HG changeset patch # User Sebastien Jodogne # Date 1591876664 -7200 # Node ID 2a8bf0991be025f53ceed03beb8d7c62439928a3 # Parent 8b7cd69806f2e3222aef217ed4d87f21ec8836e0 moved FileStorageTests.cpp from OrthancServer to OrthancFramework diff -r 8b7cd69806f2 -r 2a8bf0991be0 CMakeLists.txt --- a/CMakeLists.txt Thu Jun 11 13:55:25 2020 +0200 +++ b/CMakeLists.txt Thu Jun 11 13:57:44 2020 +0200 @@ -115,6 +115,7 @@ set(ORTHANC_FRAMEWORK_UNIT_TESTS OrthancFramework/UnitTestsSources/DicomMapTests.cpp + OrthancFramework/UnitTestsSources/FileStorageTests.cpp OrthancFramework/UnitTestsSources/FrameworkTests.cpp OrthancFramework/UnitTestsSources/FromDcmtkTests.cpp OrthancFramework/UnitTestsSources/ImageProcessingTests.cpp @@ -131,7 +132,6 @@ set(ORTHANC_SERVER_UNIT_TESTS OrthancServer/UnitTestsSources/DatabaseLookupTests.cpp - OrthancServer/UnitTestsSources/FileStorageTests.cpp OrthancServer/UnitTestsSources/LuaTests.cpp OrthancServer/UnitTestsSources/MemoryCacheTests.cpp OrthancServer/UnitTestsSources/MultiThreadingTests.cpp diff -r 8b7cd69806f2 -r 2a8bf0991be0 OrthancFramework/UnitTestsSources/FileStorageTests.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/OrthancFramework/UnitTestsSources/FileStorageTests.cpp Thu Jun 11 13:57:44 2020 +0200 @@ -0,0 +1,192 @@ +/** + * Orthanc - A Lightweight, RESTful DICOM Store + * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics + * Department, University Hospital of Liege, Belgium + * Copyright (C) 2017-2020 Osimis S.A., Belgium + * + * This program is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * In addition, as a special exception, the copyright holders of this + * program give permission to link the code of its release with the + * OpenSSL project's "OpenSSL" library (or with modified versions of it + * that use the same license as the "OpenSSL" library), and distribute + * the linked executables. You must obey the GNU General Public License + * in all respects for all of the code used other than "OpenSSL". If you + * modify file(s) with this exception, you may extend this exception to + * your version of the file(s), but you are not obligated to do so. If + * you do not wish to do so, delete this exception statement from your + * version. If you delete this exception statement from all source files + * in the program, then also delete it here. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + **/ + + +#if ORTHANC_UNIT_TESTS_LINK_FRAMEWORK == 1 +# include +#endif + +#include "gtest/gtest.h" + +#include + +#include "../Sources/FileStorage/FilesystemStorage.h" +#include "../Sources/FileStorage/StorageAccessor.h" +#include "../Sources/HttpServer/BufferHttpSender.h" +#include "../Sources/HttpServer/FilesystemHttpSender.h" +#include "../Sources/Logging.h" +#include "../Sources/OrthancException.h" +#include "../Sources/Toolbox.h" + +using namespace Orthanc; + + +static void StringToVector(std::vector& v, + const std::string& s) +{ + v.resize(s.size()); + for (size_t i = 0; i < s.size(); i++) + v[i] = s[i]; +} + + +TEST(FilesystemStorage, Basic) +{ + FilesystemStorage s("UnitTestsStorage"); + + std::string data = Toolbox::GenerateUuid(); + std::string uid = Toolbox::GenerateUuid(); + s.Create(uid.c_str(), &data[0], data.size(), FileContentType_Unknown); + std::string d; + s.Read(d, uid, FileContentType_Unknown); + ASSERT_EQ(d.size(), data.size()); + ASSERT_FALSE(memcmp(&d[0], &data[0], data.size())); + ASSERT_EQ(s.GetSize(uid), data.size()); +} + +TEST(FilesystemStorage, Basic2) +{ + FilesystemStorage s("UnitTestsStorage"); + + std::vector data; + StringToVector(data, Toolbox::GenerateUuid()); + std::string uid = Toolbox::GenerateUuid(); + s.Create(uid.c_str(), &data[0], data.size(), FileContentType_Unknown); + std::string d; + s.Read(d, uid, FileContentType_Unknown); + ASSERT_EQ(d.size(), data.size()); + ASSERT_FALSE(memcmp(&d[0], &data[0], data.size())); + ASSERT_EQ(s.GetSize(uid), data.size()); +} + +TEST(FilesystemStorage, EndToEnd) +{ + FilesystemStorage s("UnitTestsStorage"); + s.Clear(); + + std::list u; + for (unsigned int i = 0; i < 10; i++) + { + std::string t = Toolbox::GenerateUuid(); + std::string uid = Toolbox::GenerateUuid(); + s.Create(uid.c_str(), &t[0], t.size(), FileContentType_Unknown); + u.push_back(uid); + } + + std::set ss; + s.ListAllFiles(ss); + ASSERT_EQ(10u, ss.size()); + + unsigned int c = 0; + for (std::list::iterator + i = u.begin(); i != u.end(); i++, c++) + { + ASSERT_TRUE(ss.find(*i) != ss.end()); + if (c < 5) + s.Remove(*i, FileContentType_Unknown); + } + + s.ListAllFiles(ss); + ASSERT_EQ(5u, ss.size()); + + s.Clear(); + s.ListAllFiles(ss); + ASSERT_EQ(0u, ss.size()); +} + + +TEST(StorageAccessor, NoCompression) +{ + FilesystemStorage s("UnitTestsStorage"); + StorageAccessor accessor(s); + + std::string data = "Hello world"; + FileInfo info = accessor.Write(data, FileContentType_Dicom, CompressionType_None, true); + + std::string r; + accessor.Read(r, info); + + ASSERT_EQ(data, r); + ASSERT_EQ(CompressionType_None, info.GetCompressionType()); + ASSERT_EQ(11u, info.GetUncompressedSize()); + ASSERT_EQ(11u, info.GetCompressedSize()); + ASSERT_EQ(FileContentType_Dicom, info.GetContentType()); + ASSERT_EQ("3e25960a79dbc69b674cd4ec67a72c62", info.GetUncompressedMD5()); + ASSERT_EQ(info.GetUncompressedMD5(), info.GetCompressedMD5()); +} + + +TEST(StorageAccessor, Compression) +{ + FilesystemStorage s("UnitTestsStorage"); + StorageAccessor accessor(s); + + std::string data = "Hello world"; + FileInfo info = accessor.Write(data, FileContentType_DicomAsJson, CompressionType_ZlibWithSize, true); + + std::string r; + accessor.Read(r, info); + + ASSERT_EQ(data, r); + ASSERT_EQ(CompressionType_ZlibWithSize, info.GetCompressionType()); + ASSERT_EQ(11u, info.GetUncompressedSize()); + ASSERT_EQ(FileContentType_DicomAsJson, info.GetContentType()); + ASSERT_EQ("3e25960a79dbc69b674cd4ec67a72c62", info.GetUncompressedMD5()); + ASSERT_NE(info.GetUncompressedMD5(), info.GetCompressedMD5()); +} + + +TEST(StorageAccessor, Mix) +{ + FilesystemStorage s("UnitTestsStorage"); + StorageAccessor accessor(s); + + std::string r; + std::string compressedData = "Hello"; + std::string uncompressedData = "HelloWorld"; + + FileInfo compressedInfo = accessor.Write(compressedData, FileContentType_Dicom, CompressionType_ZlibWithSize, false); + FileInfo uncompressedInfo = accessor.Write(uncompressedData, FileContentType_Dicom, CompressionType_None, false); + + accessor.Read(r, compressedInfo); + ASSERT_EQ(compressedData, r); + + accessor.Read(r, uncompressedInfo); + ASSERT_EQ(uncompressedData, r); + ASSERT_NE(compressedData, r); + + /* + // This test is too slow on Windows + accessor.SetCompressionForNextOperations(CompressionType_ZlibWithSize); + ASSERT_THROW(accessor.Read(r, uncompressedInfo.GetUuid(), FileContentType_Unknown), OrthancException); + */ +} diff -r 8b7cd69806f2 -r 2a8bf0991be0 OrthancServer/UnitTestsSources/FileStorageTests.cpp --- a/OrthancServer/UnitTestsSources/FileStorageTests.cpp Thu Jun 11 13:55:25 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,190 +0,0 @@ -/** - * Orthanc - A Lightweight, RESTful DICOM Store - * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics - * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2020 Osimis S.A., Belgium - * - * This program is free software: you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * In addition, as a special exception, the copyright holders of this - * program give permission to link the code of its release with the - * OpenSSL project's "OpenSSL" library (or with modified versions of it - * that use the same license as the "OpenSSL" library), and distribute - * the linked executables. You must obey the GNU General Public License - * in all respects for all of the code used other than "OpenSSL". If you - * modify file(s) with this exception, you may extend this exception to - * your version of the file(s), but you are not obligated to do so. If - * you do not wish to do so, delete this exception statement from your - * version. If you delete this exception statement from all source files - * in the program, then also delete it here. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - **/ - - -#include "PrecompiledHeadersUnitTests.h" -#include "gtest/gtest.h" - -#include - -#include "../../OrthancFramework/Sources/FileStorage/FilesystemStorage.h" -#include "../../OrthancFramework/Sources/FileStorage/StorageAccessor.h" -#include "../../OrthancFramework/Sources/HttpServer/BufferHttpSender.h" -#include "../../OrthancFramework/Sources/HttpServer/FilesystemHttpSender.h" -#include "../../OrthancFramework/Sources/Logging.h" -#include "../../OrthancFramework/Sources/OrthancException.h" -#include "../../OrthancFramework/Sources/Toolbox.h" -#include "../Sources/ServerIndex.h" - -using namespace Orthanc; - - -static void StringToVector(std::vector& v, - const std::string& s) -{ - v.resize(s.size()); - for (size_t i = 0; i < s.size(); i++) - v[i] = s[i]; -} - - -TEST(FilesystemStorage, Basic) -{ - FilesystemStorage s("UnitTestsStorage"); - - std::string data = Toolbox::GenerateUuid(); - std::string uid = Toolbox::GenerateUuid(); - s.Create(uid.c_str(), &data[0], data.size(), FileContentType_Unknown); - std::string d; - s.Read(d, uid, FileContentType_Unknown); - ASSERT_EQ(d.size(), data.size()); - ASSERT_FALSE(memcmp(&d[0], &data[0], data.size())); - ASSERT_EQ(s.GetSize(uid), data.size()); -} - -TEST(FilesystemStorage, Basic2) -{ - FilesystemStorage s("UnitTestsStorage"); - - std::vector data; - StringToVector(data, Toolbox::GenerateUuid()); - std::string uid = Toolbox::GenerateUuid(); - s.Create(uid.c_str(), &data[0], data.size(), FileContentType_Unknown); - std::string d; - s.Read(d, uid, FileContentType_Unknown); - ASSERT_EQ(d.size(), data.size()); - ASSERT_FALSE(memcmp(&d[0], &data[0], data.size())); - ASSERT_EQ(s.GetSize(uid), data.size()); -} - -TEST(FilesystemStorage, EndToEnd) -{ - FilesystemStorage s("UnitTestsStorage"); - s.Clear(); - - std::list u; - for (unsigned int i = 0; i < 10; i++) - { - std::string t = Toolbox::GenerateUuid(); - std::string uid = Toolbox::GenerateUuid(); - s.Create(uid.c_str(), &t[0], t.size(), FileContentType_Unknown); - u.push_back(uid); - } - - std::set ss; - s.ListAllFiles(ss); - ASSERT_EQ(10u, ss.size()); - - unsigned int c = 0; - for (std::list::iterator - i = u.begin(); i != u.end(); i++, c++) - { - ASSERT_TRUE(ss.find(*i) != ss.end()); - if (c < 5) - s.Remove(*i, FileContentType_Unknown); - } - - s.ListAllFiles(ss); - ASSERT_EQ(5u, ss.size()); - - s.Clear(); - s.ListAllFiles(ss); - ASSERT_EQ(0u, ss.size()); -} - - -TEST(StorageAccessor, NoCompression) -{ - FilesystemStorage s("UnitTestsStorage"); - StorageAccessor accessor(s); - - std::string data = "Hello world"; - FileInfo info = accessor.Write(data, FileContentType_Dicom, CompressionType_None, true); - - std::string r; - accessor.Read(r, info); - - ASSERT_EQ(data, r); - ASSERT_EQ(CompressionType_None, info.GetCompressionType()); - ASSERT_EQ(11u, info.GetUncompressedSize()); - ASSERT_EQ(11u, info.GetCompressedSize()); - ASSERT_EQ(FileContentType_Dicom, info.GetContentType()); - ASSERT_EQ("3e25960a79dbc69b674cd4ec67a72c62", info.GetUncompressedMD5()); - ASSERT_EQ(info.GetUncompressedMD5(), info.GetCompressedMD5()); -} - - -TEST(StorageAccessor, Compression) -{ - FilesystemStorage s("UnitTestsStorage"); - StorageAccessor accessor(s); - - std::string data = "Hello world"; - FileInfo info = accessor.Write(data, FileContentType_DicomAsJson, CompressionType_ZlibWithSize, true); - - std::string r; - accessor.Read(r, info); - - ASSERT_EQ(data, r); - ASSERT_EQ(CompressionType_ZlibWithSize, info.GetCompressionType()); - ASSERT_EQ(11u, info.GetUncompressedSize()); - ASSERT_EQ(FileContentType_DicomAsJson, info.GetContentType()); - ASSERT_EQ("3e25960a79dbc69b674cd4ec67a72c62", info.GetUncompressedMD5()); - ASSERT_NE(info.GetUncompressedMD5(), info.GetCompressedMD5()); -} - - -TEST(StorageAccessor, Mix) -{ - FilesystemStorage s("UnitTestsStorage"); - StorageAccessor accessor(s); - - std::string r; - std::string compressedData = "Hello"; - std::string uncompressedData = "HelloWorld"; - - FileInfo compressedInfo = accessor.Write(compressedData, FileContentType_Dicom, CompressionType_ZlibWithSize, false); - FileInfo uncompressedInfo = accessor.Write(uncompressedData, FileContentType_Dicom, CompressionType_None, false); - - accessor.Read(r, compressedInfo); - ASSERT_EQ(compressedData, r); - - accessor.Read(r, uncompressedInfo); - ASSERT_EQ(uncompressedData, r); - ASSERT_NE(compressedData, r); - - /* - // This test is too slow on Windows - accessor.SetCompressionForNextOperations(CompressionType_ZlibWithSize); - ASSERT_THROW(accessor.Read(r, uncompressedInfo.GetUuid(), FileContentType_Unknown), OrthancException); - */ -}