Mercurial > hg > orthanc
diff UnitTestsSources/FromDcmtkTests.cpp @ 3276:9b0e67161600
More tolerance wrt. invalid DICOM files that must be returned by Orthanc C-FIND SCP
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 21 Feb 2019 10:21:12 +0100 |
parents | 77e8378f0323 |
children | 8711cd9b47c5 |
line wrap: on
line diff
--- a/UnitTestsSources/FromDcmtkTests.cpp Wed Feb 20 17:21:39 2019 +0100 +++ b/UnitTestsSources/FromDcmtkTests.cpp Thu Feb 21 10:21:12 2019 +0100 @@ -1126,7 +1126,7 @@ { DicomMap m; - ParsedDicomFile dicom(m, Encoding_Latin4); + ParsedDicomFile dicom(m, Encoding_Latin4, false); ASSERT_EQ(1u, dicom.GetDcmtkObject().getDataset()->card()); CheckEncoding(dicom, Encoding_Latin4); } @@ -1142,7 +1142,7 @@ { DicomMap m; m.SetValue(DICOM_TAG_SPECIFIC_CHARACTER_SET, "ISO_IR 148", false); - ParsedDicomFile dicom(m, Encoding_Latin1); + ParsedDicomFile dicom(m, Encoding_Latin1, false); ASSERT_EQ(1u, dicom.GetDcmtkObject().getDataset()->card()); CheckEncoding(dicom, Encoding_Latin5); } @@ -1192,7 +1192,7 @@ DicomMap m; m.SetValue(DICOM_TAG_PATIENT_NAME, testEncodingsExpected[i], false); - ParsedDicomFile dicom(m, testEncodings[i]); + ParsedDicomFile dicom(m, testEncodings[i], false); const char* encoded = NULL; ASSERT_TRUE(dicom.GetDcmtkObject().getDataset()->findAndGetString(DCM_PatientName, encoded).good()); @@ -1212,7 +1212,7 @@ m.SetValue(DICOM_TAG_SPECIFIC_CHARACTER_SET, GetDicomSpecificCharacterSet(testEncodings[i]), false); m.SetValue(DICOM_TAG_PATIENT_NAME, testEncodingsExpected[i], false); - ParsedDicomFile dicom(m, testEncodings[i]); + ParsedDicomFile dicom(m, testEncodings[i], false); Json::Value v2; dicom.DatasetToJson(v2, DicomToJsonFormat_Human, DicomToJsonFlags_Default, 0); @@ -1237,7 +1237,7 @@ std::string tag; - ParsedDicomFile dicom(m, Encoding_Utf8); + ParsedDicomFile dicom(m, Encoding_Utf8, false); bool hasCodeExtensions; ASSERT_EQ(Encoding_Utf8, dicom.DetectEncoding(hasCodeExtensions)); ASSERT_FALSE(hasCodeExtensions); @@ -1288,7 +1288,7 @@ DicomMap m; m.SetValue(DICOM_TAG_PATIENT_NAME, "HELLO", false); - ParsedDicomFile d(m, Encoding_Latin3 /* default encoding */); + ParsedDicomFile d(m, Encoding_Latin3 /* default encoding */, false); bool hasCodeExtensions; ASSERT_EQ(Encoding_Latin3, d.DetectEncoding(hasCodeExtensions)); @@ -1301,7 +1301,7 @@ m.SetValue(DICOM_TAG_SPECIFIC_CHARACTER_SET, "ISO_IR 13", false); m.SetValue(DICOM_TAG_PATIENT_NAME, "HELLO", false); - ParsedDicomFile d(m, Encoding_Latin3 /* default encoding */); + ParsedDicomFile d(m, Encoding_Latin3 /* default encoding */, false); bool hasCodeExtensions; ASSERT_EQ(Encoding_Japanese, d.DetectEncoding(hasCodeExtensions)); @@ -1314,7 +1314,7 @@ m.SetValue(DICOM_TAG_SPECIFIC_CHARACTER_SET, "nope", false); m.SetValue(DICOM_TAG_PATIENT_NAME, "HELLO", false); - ASSERT_THROW(ParsedDicomFile d(m, Encoding_Latin3), OrthancException); + ASSERT_THROW(ParsedDicomFile d(m, Encoding_Latin3, false), OrthancException); } { @@ -1323,7 +1323,7 @@ m.SetValue(DICOM_TAG_SPECIFIC_CHARACTER_SET, "ISO_IR 13", true); m.SetValue(DICOM_TAG_PATIENT_NAME, "HELLO", false); - ASSERT_THROW(ParsedDicomFile d(m, Encoding_Latin3), OrthancException); + ASSERT_THROW(ParsedDicomFile d(m, Encoding_Latin3, false), OrthancException); } { @@ -1333,7 +1333,7 @@ m.SetValue(DICOM_TAG_SPECIFIC_CHARACTER_SET, "", false); m.SetValue(DICOM_TAG_PATIENT_NAME, "HELLO", false); - ParsedDicomFile d(m, Encoding_Latin3 /* default encoding */); + ParsedDicomFile d(m, Encoding_Latin3 /* default encoding */, false); bool hasCodeExtensions; ASSERT_EQ(Encoding_Latin3, d.DetectEncoding(hasCodeExtensions));