Mercurial > hg > orthanc
comparison UnitTestsSources/FromDcmtkTests.cpp @ 2120:4b02ec79728a
refactoring
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 07 Nov 2016 11:19:19 +0100 |
parents | 87b395a77c41 |
children | 03b065778fc3 |
comparison
equal
deleted
inserted
replaced
2119:e0517f25919e | 2120:4b02ec79728a |
---|---|
443 { | 443 { |
444 Json::Value b; | 444 Json::Value b; |
445 FromDcmtkBridge::ToJson(b, *element, DicomToJsonFormat_Full, DicomToJsonFlags_Default, 0, Encoding_Ascii); | 445 FromDcmtkBridge::ToJson(b, *element, DicomToJsonFormat_Full, DicomToJsonFlags_Default, 0, Encoding_Ascii); |
446 | 446 |
447 Json::Value c; | 447 Json::Value c; |
448 Toolbox::SimplifyTags(c, b, DicomToJsonFormat_Human); | 448 ServerToolbox::SimplifyTags(c, b, DicomToJsonFormat_Human); |
449 | 449 |
450 a[1]["PatientName"] = "Hello2"; // To remove the Data URI Scheme encoding | 450 a[1]["PatientName"] = "Hello2"; // To remove the Data URI Scheme encoding |
451 ASSERT_EQ(0, c["ReferencedStudySequence"].compare(a)); | 451 ASSERT_EQ(0, c["ReferencedStudySequence"].compare(a)); |
452 } | 452 } |
453 } | 453 } |
523 { | 523 { |
524 Json::Value b; | 524 Json::Value b; |
525 f.ToJson(b, DicomToJsonFormat_Full, DicomToJsonFlags_Default, 0); | 525 f.ToJson(b, DicomToJsonFormat_Full, DicomToJsonFlags_Default, 0); |
526 | 526 |
527 Json::Value c; | 527 Json::Value c; |
528 Toolbox::SimplifyTags(c, b, DicomToJsonFormat_Human); | 528 ServerToolbox::SimplifyTags(c, b, DicomToJsonFormat_Human); |
529 | 529 |
530 ASSERT_EQ(0, c["ReferencedPatientSequence"].compare(a)); | 530 ASSERT_EQ(0, c["ReferencedPatientSequence"].compare(a)); |
531 ASSERT_NE(0, c["ReferencedStudySequence"].compare(a)); // Because Data URI Scheme decoding was enabled | 531 ASSERT_NE(0, c["ReferencedStudySequence"].compare(a)); // Because Data URI Scheme decoding was enabled |
532 } | 532 } |
533 | 533 |