Mercurial > hg > orthanc

comparison UnitTestsSources/FromDcmtkTests.cpp @ 1970:a1c1c606ce98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix warnings
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 11 Apr 2016 13:07:15 +0200
parents d7b176f7dd1b
children 869a87c08673
comparison
equal deleted inserted replaced
1969:5e40f88f4eba 1970:a1c1c606ce98
380 380
381 { 381 {
382 Json::Value b; 382 Json::Value b;
383 FromDcmtkBridge::ToJson(b, *element, DicomToJsonFormat_Short, DicomToJsonFlags_Default, 0, Encoding_Ascii); 383 FromDcmtkBridge::ToJson(b, *element, DicomToJsonFormat_Short, DicomToJsonFlags_Default, 0, Encoding_Ascii);
384 ASSERT_EQ(Json::arrayValue, b["0008,1110"].type()); 384 ASSERT_EQ(Json::arrayValue, b["0008,1110"].type());
385 ASSERT_EQ(2, b["0008,1110"].size()); 385 ASSERT_EQ(2u, b["0008,1110"].size());
386 386
387 Json::Value::ArrayIndex i = (b["0008,1110"][0]["0010,0010"].asString() == "Hello") ? 0 : 1; 387 Json::Value::ArrayIndex i = (b["0008,1110"][0]["0010,0010"].asString() == "Hello") ? 0 : 1;
388 388
389 ASSERT_EQ(3, b["0008,1110"][i].size()); 389 ASSERT_EQ(3u, b["0008,1110"][i].size());
390 ASSERT_EQ(2, b["0008,1110"][1 - i].size()); 390 ASSERT_EQ(2u, b["0008,1110"][1 - i].size());
391 ASSERT_EQ(b["0008,1110"][i]["0010,0010"].asString(), "Hello"); 391 ASSERT_EQ(b["0008,1110"][i]["0010,0010"].asString(), "Hello");
392 ASSERT_EQ(b["0008,1110"][i]["0010,0020"].asString(), "World"); 392 ASSERT_EQ(b["0008,1110"][i]["0010,0020"].asString(), "World");
393 ASSERT_EQ(b["0008,1110"][i]["0008,1030"].asString(), "Toto"); 393 ASSERT_EQ(b["0008,1110"][i]["0008,1030"].asString(), "Toto");
394 ASSERT_EQ(b["0008,1110"][1 - i]["0010,0010"].asString(), "Hello2"); 394 ASSERT_EQ(b["0008,1110"][1 - i]["0010,0010"].asString(), "Hello2");
395 ASSERT_EQ(b["0008,1110"][1 - i]["0010,0020"].asString(), "World2"); 395 ASSERT_EQ(b["0008,1110"][1 - i]["0010,0020"].asString(), "World2");