comparison UnitTestsSources/FromDcmtkTests.cpp @ 2381:b8969010b534

uncoupling DCMTK primitives from Orthanc::Configuration
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 29 Aug 2017 19:59:01 +0200
parents 423d3b692bb9
children 7284093111b0
comparison
equal deleted inserted replaced
2380:96b3ec054b69 2381:b8969010b534
34 #include "PrecompiledHeadersUnitTests.h" 34 #include "PrecompiledHeadersUnitTests.h"
35 #include "gtest/gtest.h" 35 #include "gtest/gtest.h"
36 36
37 #include "../OrthancServer/FromDcmtkBridge.h" 37 #include "../OrthancServer/FromDcmtkBridge.h"
38 #include "../OrthancServer/ToDcmtkBridge.h" 38 #include "../OrthancServer/ToDcmtkBridge.h"
39 #include "../OrthancServer/OrthancInitialization.h"
40 #include "../OrthancServer/DicomModification.h" 39 #include "../OrthancServer/DicomModification.h"
41 #include "../OrthancServer/ServerToolbox.h" 40 #include "../OrthancServer/ServerToolbox.h"
42 #include "../Core/OrthancException.h" 41 #include "../Core/OrthancException.h"
43 #include "../Core/Images/ImageBuffer.h" 42 #include "../Core/Images/ImageBuffer.h"
44 #include "../Core/Images/PngReader.h" 43 #include "../Core/Images/PngReader.h"
1060 } 1059 }
1061 1060
1062 1061
1063 TEST(ParsedDicomFile, DicomMapEncodings1) 1062 TEST(ParsedDicomFile, DicomMapEncodings1)
1064 { 1063 {
1065 Configuration::SetDefaultEncoding(Encoding_Ascii); 1064 SetDefaultDicomEncoding(Encoding_Ascii);
1066 ASSERT_EQ(Encoding_Ascii, Configuration::GetDefaultEncoding()); 1065 ASSERT_EQ(Encoding_Ascii, GetDefaultDicomEncoding());
1067 1066
1068 { 1067 {
1069 DicomMap m; 1068 DicomMap m;
1070 ParsedDicomFile dicom(m); 1069 ParsedDicomFile dicom(m);
1071 ASSERT_EQ(1, dicom.GetDcmtkObject().getDataset()->card()); 1070 ASSERT_EQ(1, dicom.GetDcmtkObject().getDataset()->card());