Mercurial > hg > orthanc

comparison UnitTestsSources/FromDcmtkTests.cpp @ 2117:87b395a77c41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix unit test
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 31 Oct 2016 16:17:15 +0100
parents a657f7772e69
children 4b02ec79728a
comparison
equal deleted inserted replaced
2116:2fabd1073728 2117:87b395a77c41
715 } 715 }
716 716
717 717
718 TEST(ParsedDicomFile, FromJson) 718 TEST(ParsedDicomFile, FromJson)
719 { 719 {
720 FromDcmtkBridge::RegisterDictionaryTag(DicomTag(0x7057, 0x1000), ValueRepresentation_OtherByte, "MyPrivateTag", 1, 1, ""); 720 FromDcmtkBridge::RegisterDictionaryTag(DicomTag(0x7057, 0x1000), ValueRepresentation_OtherByte, "MyPrivateTag2", 1, 1, "ORTHANC");
721 FromDcmtkBridge::RegisterDictionaryTag(DicomTag(0x7059, 0x1000), ValueRepresentation_OtherByte, "MyPrivateTag", 1, 1, ""); 721 FromDcmtkBridge::RegisterDictionaryTag(DicomTag(0x7059, 0x1000), ValueRepresentation_OtherByte, "MyPrivateTag3", 1, 1, "");
722 FromDcmtkBridge::RegisterDictionaryTag(DicomTag(0x7050, 0x1000), ValueRepresentation_PersonName, "Declared public tag", 1, 1, ""); 722 FromDcmtkBridge::RegisterDictionaryTag(DicomTag(0x7050, 0x1000), ValueRepresentation_PersonName, "Declared public tag2", 1, 1, "");
723 723
724 Json::Value v; 724 Json::Value v;
725 const std::string sopClassUid = "1.2.840.10008.5.1.4.1.1.1"; // CR Image Storage: 725 const std::string sopClassUid = "1.2.840.10008.5.1.4.1.1.1"; // CR Image Storage:
726
727 // Test the private creator
728 ASSERT_EQ(DcmTag_ERROR_TagName, FromDcmtkBridge::GetTagName(DicomTag(0x7057, 0x1000), "NOPE"));
729 ASSERT_EQ("MyPrivateTag2", FromDcmtkBridge::GetTagName(DicomTag(0x7057, 0x1000), "ORTHANC"));
726 730
727 { 731 {
728 v["SOPClassUID"] = sopClassUid; 732 v["SOPClassUID"] = sopClassUid;
729 v["SpecificCharacterSet"] = "ISO_IR 148"; // This is latin-5 733 v["SpecificCharacterSet"] = "ISO_IR 148"; // This is latin-5
730 v["PatientName"] = "Sébastien"; 734 v["PatientName"] = "Sébastien";