# HG changeset patch # User Sebastien Jodogne # Date 1444294649 -7200 # Node ID 4eaf164dd5743544d614618d1a8fed0e85f99077 # Parent e447f3cb8b3068ec03ad148cf7c54010aaee9377 test SimplifyTags diff -r e447f3cb8b30 -r 4eaf164dd574 UnitTestsSources/FromDcmtkTests.cpp --- a/UnitTestsSources/FromDcmtkTests.cpp Thu Oct 08 10:53:14 2015 +0200 +++ b/UnitTestsSources/FromDcmtkTests.cpp Thu Oct 08 10:57:29 2015 +0200 @@ -36,6 +36,7 @@ #include "../OrthancServer/FromDcmtkBridge.h" #include "../OrthancServer/OrthancInitialization.h" #include "../OrthancServer/DicomModification.h" +#include "../OrthancServer/ServerToolbox.h" #include "../Core/OrthancException.h" #include "../Core/Images/ImageBuffer.h" #include "../Core/Images/PngReader.h" @@ -379,9 +380,15 @@ ASSERT_EQ(b["0008,1110"][1 - i]["0010,0010"].asString(), "Hello2"); ASSERT_EQ(b["0008,1110"][1 - i]["0010,0020"].asString(), "World2"); } - } + { + Json::Value b; + FromDcmtkBridge::ToJson(b, *element, DicomToJsonFormat_Full, 0, Encoding_Ascii); + Json::Value c; + SimplifyTags(c, b); - // TODO: Test Simplify + ASSERT_EQ(0, c["ReferencedStudySequence"].compare(a)); + } + } }