diff OrthancFramework/UnitTestsSources/FromDcmtkTests.cpp @ 4516:671ee7c1fd46

added DicomToJsonFlags_SkipGroupLengths
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 16 Feb 2021 15:01:13 +0100
parents 8734caa12448
children a3c6678aa7b1
line wrap: on
line diff
--- a/OrthancFramework/UnitTestsSources/FromDcmtkTests.cpp	Tue Feb 16 14:42:04 2021 +0100
+++ b/OrthancFramework/UnitTestsSources/FromDcmtkTests.cpp	Tue Feb 16 15:01:13 2021 +0100
@@ -635,6 +635,7 @@
   {
     Uint8 v[2] = { 0, 0 };
     ASSERT_TRUE(f.GetDcmtkObject().getDataset()->putAndInsertString(DCM_PatientName, "HELLO^").good());
+    ASSERT_TRUE(f.GetDcmtkObject().getDataset()->putAndInsertUint32(DcmTag(0x4000, 0x0000), 42).good());
     ASSERT_TRUE(f.GetDcmtkObject().getDataset()->putAndInsertUint8Array(DCM_PixelData, v, 2).good());
     ASSERT_TRUE(f.GetDcmtkObject().getDataset()->putAndInsertString(DcmTag(0x07fe1, 0x0010), "WORLD^").good());
   }
@@ -646,14 +647,15 @@
     Json::Value v;
     f.DatasetToJson(v, DicomToJsonFormat_Short, static_cast<DicomToJsonFlags>(DicomToJsonFlags_IncludePrivateTags | DicomToJsonFlags_IncludePixelData | DicomToJsonFlags_StopAfterPixelData), 0);
     ASSERT_EQ(Json::objectValue, v.type());
-    ASSERT_EQ(2u, v.size());
+    ASSERT_EQ(3u, v.size());
     ASSERT_EQ("HELLO^", v["0010,0010"].asString());
+    ASSERT_EQ("42", v["4000,0000"].asString());
     ASSERT_EQ(s, v["7fe0,0010"].asString());
   }
 
   {
     Json::Value v;
-    f.DatasetToJson(v, DicomToJsonFormat_Short, DicomToJsonFlags_IncludePrivateTags, 0);
+    f.DatasetToJson(v, DicomToJsonFormat_Short, static_cast<DicomToJsonFlags>(DicomToJsonFlags_IncludePrivateTags | DicomToJsonFlags_SkipGroupLengths), 0);
     ASSERT_EQ(Json::objectValue, v.type());
     ASSERT_EQ(2u, v.size());
     ASSERT_EQ("HELLO^", v["0010,0010"].asString());