# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1591879111 -7200
# Node ID 0953b3dc32614498de06c95d06e897998562aa46
# Parent  496e07123e37bb09e47c7f6d88006d9eee4756f4
pretty-printing

diff -r 496e07123e37 -r 0953b3dc3261 OrthancFramework/UnitTestsSources/DicomMapTests.cpp
--- a/OrthancFramework/UnitTestsSources/DicomMapTests.cpp	Thu Jun 11 14:31:30 2020 +0200
+++ b/OrthancFramework/UnitTestsSources/DicomMapTests.cpp	Thu Jun 11 14:38:31 2020 +0200
@@ -35,7 +35,7 @@
 #  include <OrthancFramework.h>
 #endif
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "../Sources/Compatibility.h"
 #include "../Sources/OrthancException.h"
diff -r 496e07123e37 -r 0953b3dc3261 OrthancFramework/UnitTestsSources/FileStorageTests.cpp
--- a/OrthancFramework/UnitTestsSources/FileStorageTests.cpp	Thu Jun 11 14:31:30 2020 +0200
+++ b/OrthancFramework/UnitTestsSources/FileStorageTests.cpp	Thu Jun 11 14:38:31 2020 +0200
@@ -35,9 +35,7 @@
 #  include <OrthancFramework.h>
 #endif
 
-#include "gtest/gtest.h"
-
-#include <ctype.h>
+#include <gtest/gtest.h>
 
 #include "../Sources/FileStorage/FilesystemStorage.h"
 #include "../Sources/FileStorage/StorageAccessor.h"
@@ -47,6 +45,9 @@
 #include "../Sources/OrthancException.h"
 #include "../Sources/Toolbox.h"
 
+#include <ctype.h>
+
+
 using namespace Orthanc;
 
 
diff -r 496e07123e37 -r 0953b3dc3261 OrthancFramework/UnitTestsSources/FrameworkTests.cpp
--- a/OrthancFramework/UnitTestsSources/FrameworkTests.cpp	Thu Jun 11 14:31:30 2020 +0200
+++ b/OrthancFramework/UnitTestsSources/FrameworkTests.cpp	Thu Jun 11 14:38:31 2020 +0200
@@ -37,9 +37,7 @@
 
 #include "../Sources/EnumerationDictionary.h"
 
-#include "gtest/gtest.h"
-
-#include <ctype.h>
+#include <gtest/gtest.h>
 
 #include "../Sources/DicomFormat/DicomTag.h"
 #include "../Sources/FileBuffer.h"
@@ -51,6 +49,8 @@
 #include "../Sources/TemporaryFile.h"
 #include "../Sources/Toolbox.h"
 
+#include <ctype.h>
+
 
 using namespace Orthanc;
 
diff -r 496e07123e37 -r 0953b3dc3261 OrthancFramework/UnitTestsSources/FromDcmtkTests.cpp
--- a/OrthancFramework/UnitTestsSources/FromDcmtkTests.cpp	Thu Jun 11 14:31:30 2020 +0200
+++ b/OrthancFramework/UnitTestsSources/FromDcmtkTests.cpp	Thu Jun 11 14:38:31 2020 +0200
@@ -35,7 +35,7 @@
 #  include <OrthancFramework.h>
 #endif
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "../Sources/Compatibility.h"
 #include "../Sources/DicomNetworking/DicomFindAnswers.h"
diff -r 496e07123e37 -r 0953b3dc3261 OrthancFramework/UnitTestsSources/ImageProcessingTests.cpp
--- a/OrthancFramework/UnitTestsSources/ImageProcessingTests.cpp	Thu Jun 11 14:31:30 2020 +0200
+++ b/OrthancFramework/UnitTestsSources/ImageProcessingTests.cpp	Thu Jun 11 14:38:31 2020 +0200
@@ -35,7 +35,7 @@
 #  include <OrthancFramework.h>
 #endif
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "../Sources/Compatibility.h"
 #include "../Sources/DicomFormat/DicomImageInformation.h"
diff -r 496e07123e37 -r 0953b3dc3261 OrthancFramework/UnitTestsSources/ImageTests.cpp
--- a/OrthancFramework/UnitTestsSources/ImageTests.cpp	Thu Jun 11 14:31:30 2020 +0200
+++ b/OrthancFramework/UnitTestsSources/ImageTests.cpp	Thu Jun 11 14:38:31 2020 +0200
@@ -35,7 +35,7 @@
 #  include <OrthancFramework.h>
 #endif
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "../Sources/Images/Font.h"
 #include "../Sources/Images/Image.h"
diff -r 496e07123e37 -r 0953b3dc3261 OrthancFramework/UnitTestsSources/JobsTests.cpp
--- a/OrthancFramework/UnitTestsSources/JobsTests.cpp	Thu Jun 11 14:31:30 2020 +0200
+++ b/OrthancFramework/UnitTestsSources/JobsTests.cpp	Thu Jun 11 14:38:31 2020 +0200
@@ -35,7 +35,7 @@
 #  include <OrthancFramework.h>
 #endif
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "../../OrthancFramework/Sources/Compatibility.h"
 #include "../../OrthancFramework/Sources/DicomNetworking/RemoteModalityParameters.h"
diff -r 496e07123e37 -r 0953b3dc3261 OrthancFramework/UnitTestsSources/JpegLosslessTests.cpp
--- a/OrthancFramework/UnitTestsSources/JpegLosslessTests.cpp	Thu Jun 11 14:31:30 2020 +0200
+++ b/OrthancFramework/UnitTestsSources/JpegLosslessTests.cpp	Thu Jun 11 14:38:31 2020 +0200
@@ -35,18 +35,17 @@
 #  include <OrthancFramework.h>
 #endif
 
-#include "gtest/gtest.h"
-
-#include "../Sources/DicomParsing/Internals/DicomImageDecoder.h"
+#include <gtest/gtest.h>
 
 #if ORTHANC_ENABLE_JPEG_LOSSLESS == 1
 
-#include <dcmtk/dcmdata/dcfilefo.h>
-
+#include "../Sources/DicomParsing/Internals/DicomImageDecoder.h"
 #include "../Sources/DicomParsing/ParsedDicomFile.h"
-#include "../Sources/OrthancException.h"
 #include "../Sources/Images/ImageBuffer.h"
 #include "../Sources/Images/PngWriter.h"
+#include "../Sources/OrthancException.h"
+
+#include <dcmtk/dcmdata/dcfilefo.h>
 
 using namespace Orthanc;
 
diff -r 496e07123e37 -r 0953b3dc3261 OrthancFramework/UnitTestsSources/LoggingTests.cpp
--- a/OrthancFramework/UnitTestsSources/LoggingTests.cpp	Thu Jun 11 14:31:30 2020 +0200
+++ b/OrthancFramework/UnitTestsSources/LoggingTests.cpp	Thu Jun 11 14:38:31 2020 +0200
@@ -35,12 +35,13 @@
 #  include <OrthancFramework.h>
 #endif
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
+
+#include "../Sources/Logging.h"
+
 #include <boost/regex.hpp>
 #include <sstream>
 
-#include "../Sources/Logging.h"
-
 using namespace Orthanc::Logging;
 
 static std::stringstream testErrorStream;
diff -r 496e07123e37 -r 0953b3dc3261 OrthancFramework/UnitTestsSources/LuaTests.cpp
--- a/OrthancFramework/UnitTestsSources/LuaTests.cpp	Thu Jun 11 14:31:30 2020 +0200
+++ b/OrthancFramework/UnitTestsSources/LuaTests.cpp	Thu Jun 11 14:38:31 2020 +0200
@@ -35,7 +35,7 @@
 #  include <OrthancFramework.h>
 #endif
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "../Sources/OrthancException.h"
 #include "../Sources/Toolbox.h"
diff -r 496e07123e37 -r 0953b3dc3261 OrthancFramework/UnitTestsSources/MemoryCacheTests.cpp
--- a/OrthancFramework/UnitTestsSources/MemoryCacheTests.cpp	Thu Jun 11 14:31:30 2020 +0200
+++ b/OrthancFramework/UnitTestsSources/MemoryCacheTests.cpp	Thu Jun 11 14:38:31 2020 +0200
@@ -35,12 +35,7 @@
 #  include <OrthancFramework.h>
 #endif
 
-#include "gtest/gtest.h"
-
-#include <memory>
-#include <algorithm>
-#include <boost/thread.hpp>
-#include <boost/lexical_cast.hpp>
+#include <gtest/gtest.h>
 
 #include "../Sources/Cache/MemoryCache.h"
 #include "../Sources/Cache/MemoryStringCache.h"
@@ -48,6 +43,11 @@
 #include "../Sources/IDynamicObject.h"
 #include "../Sources/Logging.h"
 
+#include <memory>
+#include <algorithm>
+#include <boost/thread.hpp>
+#include <boost/lexical_cast.hpp>
+
 
 TEST(LRU, Basic)
 {
diff -r 496e07123e37 -r 0953b3dc3261 OrthancFramework/UnitTestsSources/RestApiTests.cpp
--- a/OrthancFramework/UnitTestsSources/RestApiTests.cpp	Thu Jun 11 14:31:30 2020 +0200
+++ b/OrthancFramework/UnitTestsSources/RestApiTests.cpp	Thu Jun 11 14:38:31 2020 +0200
@@ -35,11 +35,7 @@
 #  include <OrthancFramework.h>
 #endif
 
-#include "gtest/gtest.h"
-
-#include <ctype.h>
-#include <boost/lexical_cast.hpp>
-#include <algorithm>
+#include <gtest/gtest.h>
 
 #include "../Sources/ChunkedBuffer.h"
 #include "../Sources/HttpClient.h"
@@ -52,6 +48,10 @@
 #include "../Sources/HttpServer/HttpContentNegociation.h"
 #include "../Sources/HttpServer/MultipartStreamReader.h"
 
+#include <ctype.h>
+#include <boost/lexical_cast.hpp>
+#include <algorithm>
+
 
 using namespace Orthanc;
 
diff -r 496e07123e37 -r 0953b3dc3261 OrthancFramework/UnitTestsSources/SQLiteChromiumTests.cpp
--- a/OrthancFramework/UnitTestsSources/SQLiteChromiumTests.cpp	Thu Jun 11 14:31:30 2020 +0200
+++ b/OrthancFramework/UnitTestsSources/SQLiteChromiumTests.cpp	Thu Jun 11 14:38:31 2020 +0200
@@ -35,7 +35,7 @@
 #  include <OrthancFramework.h>
 #endif
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "../Sources/Toolbox.h"
 #include "../Sources/SQLite/Connection.h"
diff -r 496e07123e37 -r 0953b3dc3261 OrthancFramework/UnitTestsSources/SQLiteTests.cpp
--- a/OrthancFramework/UnitTestsSources/SQLiteTests.cpp	Thu Jun 11 14:31:30 2020 +0200
+++ b/OrthancFramework/UnitTestsSources/SQLiteTests.cpp	Thu Jun 11 14:38:31 2020 +0200
@@ -35,7 +35,7 @@
 #  include <OrthancFramework.h>
 #endif
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "../Sources/SystemToolbox.h"
 #include "../Sources/SQLite/Connection.h"
diff -r 496e07123e37 -r 0953b3dc3261 OrthancFramework/UnitTestsSources/StreamTests.cpp
--- a/OrthancFramework/UnitTestsSources/StreamTests.cpp	Thu Jun 11 14:31:30 2020 +0200
+++ b/OrthancFramework/UnitTestsSources/StreamTests.cpp	Thu Jun 11 14:38:31 2020 +0200
@@ -35,7 +35,7 @@
 #  include <OrthancFramework.h>
 #endif
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "../Sources/SystemToolbox.h"
 #include "../Sources/Toolbox.h"
diff -r 496e07123e37 -r 0953b3dc3261 OrthancFramework/UnitTestsSources/ToolboxTests.cpp
--- a/OrthancFramework/UnitTestsSources/ToolboxTests.cpp	Thu Jun 11 14:31:30 2020 +0200
+++ b/OrthancFramework/UnitTestsSources/ToolboxTests.cpp	Thu Jun 11 14:38:31 2020 +0200
@@ -35,7 +35,8 @@
 #  include <OrthancFramework.h>
 #endif
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
+
 #include "../Sources/Compatibility.h"
 #include "../Sources/IDynamicObject.h"
 #include "../Sources/OrthancException.h"
diff -r 496e07123e37 -r 0953b3dc3261 OrthancFramework/UnitTestsSources/ZipTests.cpp
--- a/OrthancFramework/UnitTestsSources/ZipTests.cpp	Thu Jun 11 14:31:30 2020 +0200
+++ b/OrthancFramework/UnitTestsSources/ZipTests.cpp	Thu Jun 11 14:38:31 2020 +0200
@@ -35,7 +35,7 @@
 #  include <OrthancFramework.h>
 #endif
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "../Sources/OrthancException.h"
 #include "../Sources/Compression/ZipWriter.h"
diff -r 496e07123e37 -r 0953b3dc3261 OrthancServer/UnitTestsSources/DatabaseLookupTests.cpp
--- a/OrthancServer/UnitTestsSources/DatabaseLookupTests.cpp	Thu Jun 11 14:31:30 2020 +0200
+++ b/OrthancServer/UnitTestsSources/DatabaseLookupTests.cpp	Thu Jun 11 14:38:31 2020 +0200
@@ -32,10 +32,11 @@
 
 
 #include "PrecompiledHeadersUnitTests.h"
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
+
+#include "../../OrthancFramework/Sources/OrthancException.h"
 
 #include "../Sources/Search/DatabaseLookup.h"
-#include "../../OrthancFramework/Sources/OrthancException.h"
 
 using namespace Orthanc;
 
diff -r 496e07123e37 -r 0953b3dc3261 OrthancServer/UnitTestsSources/LuaServerTests.cpp
--- a/OrthancServer/UnitTestsSources/LuaServerTests.cpp	Thu Jun 11 14:31:30 2020 +0200
+++ b/OrthancServer/UnitTestsSources/LuaServerTests.cpp	Thu Jun 11 14:38:31 2020 +0200
@@ -32,7 +32,7 @@
 
 
 #include "PrecompiledHeadersUnitTests.h"
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "../../OrthancFramework/Sources/OrthancException.h"
 #include "../../OrthancFramework/Sources/Toolbox.h"
diff -r 496e07123e37 -r 0953b3dc3261 OrthancServer/UnitTestsSources/PluginsTests.cpp
--- a/OrthancServer/UnitTestsSources/PluginsTests.cpp	Thu Jun 11 14:31:30 2020 +0200
+++ b/OrthancServer/UnitTestsSources/PluginsTests.cpp	Thu Jun 11 14:38:31 2020 +0200
@@ -32,7 +32,7 @@
 
 
 #include "PrecompiledHeadersUnitTests.h"
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "../../OrthancFramework/Sources/OrthancException.h"
 #include "../Plugins/Engine/PluginsManager.h"
diff -r 496e07123e37 -r 0953b3dc3261 OrthancServer/UnitTestsSources/ServerIndexTests.cpp
--- a/OrthancServer/UnitTestsSources/ServerIndexTests.cpp	Thu Jun 11 14:31:30 2020 +0200
+++ b/OrthancServer/UnitTestsSources/ServerIndexTests.cpp	Thu Jun 11 14:38:31 2020 +0200
@@ -32,12 +32,13 @@
 
 
 #include "PrecompiledHeadersUnitTests.h"
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "../../OrthancFramework/Sources/Compatibility.h"
 #include "../../OrthancFramework/Sources/FileStorage/FilesystemStorage.h"
 #include "../../OrthancFramework/Sources/FileStorage/MemoryStorageArea.h"
 #include "../../OrthancFramework/Sources/Logging.h"
+
 #include "../Sources/Database/SQLiteDatabaseWrapper.h"
 #include "../Sources/Search/DatabaseLookup.h"
 #include "../Sources/ServerContext.h"
diff -r 496e07123e37 -r 0953b3dc3261 OrthancServer/UnitTestsSources/ServerJobsTests.cpp
--- a/OrthancServer/UnitTestsSources/ServerJobsTests.cpp	Thu Jun 11 14:31:30 2020 +0200
+++ b/OrthancServer/UnitTestsSources/ServerJobsTests.cpp	Thu Jun 11 14:38:31 2020 +0200
@@ -32,10 +32,11 @@
 
 
 #include "PrecompiledHeadersUnitTests.h"
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "../../OrthancFramework/Sources/Compatibility.h"
 #include "../../OrthancFramework/Sources/FileStorage/MemoryStorageArea.h"
+#include "../../OrthancFramework/Sources/JobsEngine/Operations/LogJobOperation.h"
 #include "../../OrthancFramework/Sources/SerializationToolbox.h"
 
 #include "../Sources/Database/SQLiteDatabaseWrapper.h"
@@ -43,9 +44,8 @@
 #include "../Sources/ServerJobs/LuaJobManager.h"
 #include "../Sources/ServerJobs/OrthancJobUnserializer.h"
 
-#include "../../OrthancFramework/Sources/JobsEngine/Operations/LogJobOperation.h"
+#include "../Sources/ServerJobs/Operations/DeleteResourceOperation.h"
 #include "../Sources/ServerJobs/Operations/DicomInstanceOperationValue.h"
-#include "../Sources/ServerJobs/Operations/DeleteResourceOperation.h"
 #include "../Sources/ServerJobs/Operations/ModifyInstanceOperation.h"
 #include "../Sources/ServerJobs/Operations/StorePeerOperation.h"
 #include "../Sources/ServerJobs/Operations/StoreScuOperation.h"
diff -r 496e07123e37 -r 0953b3dc3261 OrthancServer/UnitTestsSources/UnitTestsMain.cpp
--- a/OrthancServer/UnitTestsSources/UnitTestsMain.cpp	Thu Jun 11 14:31:30 2020 +0200
+++ b/OrthancServer/UnitTestsSources/UnitTestsMain.cpp	Thu Jun 11 14:38:31 2020 +0200
@@ -32,10 +32,7 @@
 
 
 #include "PrecompiledHeadersUnitTests.h"
-
-#include "gtest/gtest.h"
-
-#include <OrthancServerResources.h>
+#include <gtest/gtest.h>
 
 #include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h"
 #include "../../OrthancFramework/Sources/DicomParsing/ParsedDicomFile.h"
@@ -55,6 +52,8 @@
 #include "../Sources/ServerToolbox.h"
 #include "../Sources/StorageCommitmentReports.h"
 
+#include <OrthancServerResources.h>
+
 #include <dcmtk/dcmdata/dcdeftag.h>
 
 
diff -r 496e07123e37 -r 0953b3dc3261 OrthancServer/UnitTestsSources/VersionsTests.cpp
--- a/OrthancServer/UnitTestsSources/VersionsTests.cpp	Thu Jun 11 14:31:30 2020 +0200
+++ b/OrthancServer/UnitTestsSources/VersionsTests.cpp	Thu Jun 11 14:38:31 2020 +0200
@@ -32,7 +32,7 @@
 
 
 #include "PrecompiledHeadersUnitTests.h"
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include <stdint.h>
 #include <math.h>