Mercurial > hg > orthanc

comparison OrthancFramework/UnitTestsSources/FromDcmtkTests.cpp @ 4514:5b929e6b3c36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removal of "dicom-as-json" attachments
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 16 Feb 2021 12:18:41 +0100
parents b4c58795f3a8
children 8734caa12448
comparison
equal deleted inserted replaced
4513:1f455b86b054 4514:5b929e6b3c36
623 ASSERT_EQ(Json::stringValue, v["7fe0,0010"].type()); 623 ASSERT_EQ(Json::stringValue, v["7fe0,0010"].type());
624 std::string mime, content; 624 std::string mime, content;
625 ASSERT_TRUE(Toolbox::DecodeDataUriScheme(mime, content, v["7fe0,0010"].asString())); 625 ASSERT_TRUE(Toolbox::DecodeDataUriScheme(mime, content, v["7fe0,0010"].asString()));
626 ASSERT_EQ("application/octet-stream", mime); 626 ASSERT_EQ("application/octet-stream", mime);
627 ASSERT_EQ("BA", content.substr(0, 2)); 627 ASSERT_EQ("BA", content.substr(0, 2));
628 }
629
630
631 TEST(ParsedDicomFile, ToJsonFlags3)
632 {
633 ParsedDicomFile f(false);
634
635 {
636 Uint8 v[2] = { 0, 0 };
637 ASSERT_TRUE(f.GetDcmtkObject().getDataset()->putAndInsertString(DCM_PatientName, "HELLO^").good());
638 ASSERT_TRUE(f.GetDcmtkObject().getDataset()->putAndInsertUint8Array(DCM_PixelData, v, 2).good());
639 ASSERT_TRUE(f.GetDcmtkObject().getDataset()->putAndInsertString(DcmTag(0x07fe1, 0x0010), "WORLD^").good());
640 }
641
642 std::string s;
643 Toolbox::EncodeDataUriScheme(s, "application/octet-stream", std::string(2, '\0'));
644
645 {
646 Json::Value v;
647 f.DatasetToJson(v, DicomToJsonFormat_Short, static_cast<DicomToJsonFlags>(DicomToJsonFlags_IncludePrivateTags | DicomToJsonFlags_IncludePixelData | DicomToJsonFlags_StopAfterPixelData), 0);
648 ASSERT_EQ(Json::objectValue, v.type());
649 ASSERT_EQ(2u, v.size());
650 ASSERT_EQ("HELLO^", v["0010,0010"].asString());
651 ASSERT_EQ(s, v["7fe0,0010"].asString());
652 }
653
654 {
655 Json::Value v;
656 f.DatasetToJson(v, DicomToJsonFormat_Short, DicomToJsonFlags_IncludePrivateTags, 0);
657 ASSERT_EQ(Json::objectValue, v.type());
658 ASSERT_EQ(2u, v.size());
659 ASSERT_EQ("HELLO^", v["0010,0010"].asString());
660 ASSERT_EQ("WORLD^", v["7fe1,0010"].asString());
661 }
628 } 662 }
629 663
630 664
631 TEST(DicomFindAnswers, Basic) 665 TEST(DicomFindAnswers, Basic)
632 { 666 {