Mercurial > hg > orthanc

comparison UnitTestsSources/ServerIndexTests.cpp @ 2828:859a4950d48f

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 Thu, 20 Sep 2018 08:57:46 +0200
parents c277e0421200
children e5e3253a1164
comparison
equal deleted inserted replaced
2827:d4fd4614f275 2828:859a4950d48f
895 ASSERT_TRUE(context.GetIndex().LookupAttachment(json1, id, FileContentType_DicomAsJson)); 895 ASSERT_TRUE(context.GetIndex().LookupAttachment(json1, id, FileContentType_DicomAsJson));
896 896
897 context.GetIndex().ComputeStatistics(tmp); 897 context.GetIndex().ComputeStatistics(tmp);
898 ASSERT_EQ(1, tmp["CountInstances"].asInt()); 898 ASSERT_EQ(1, tmp["CountInstances"].asInt());
899 ASSERT_EQ(dicom1.GetCompressedSize() + json1.GetCompressedSize(), 899 ASSERT_EQ(dicom1.GetCompressedSize() + json1.GetCompressedSize(),
900 boost::lexical_cast<int>(tmp["TotalDiskSize"].asString())); 900 boost::lexical_cast<size_t>(tmp["TotalDiskSize"].asString()));
901 ASSERT_EQ(dicom1.GetUncompressedSize() + json1.GetUncompressedSize(), 901 ASSERT_EQ(dicom1.GetUncompressedSize() + json1.GetUncompressedSize(),
902 boost::lexical_cast<int>(tmp["TotalUncompressedSize"].asString())); 902 boost::lexical_cast<size_t>(tmp["TotalUncompressedSize"].asString()));
903 903
904 context.ReadDicomAsJson(tmp, id); 904 context.ReadDicomAsJson(tmp, id);
905 ASSERT_EQ("name", tmp["0010,0010"]["Value"].asString()); 905 ASSERT_EQ("name", tmp["0010,0010"]["Value"].asString());
906 906
907 { 907 {
930 ASSERT_TRUE(context.GetIndex().LookupAttachment(json2, id, FileContentType_DicomAsJson)); 930 ASSERT_TRUE(context.GetIndex().LookupAttachment(json2, id, FileContentType_DicomAsJson));
931 931
932 context.GetIndex().ComputeStatistics(tmp); 932 context.GetIndex().ComputeStatistics(tmp);
933 ASSERT_EQ(1, tmp["CountInstances"].asInt()); 933 ASSERT_EQ(1, tmp["CountInstances"].asInt());
934 ASSERT_EQ(dicom2.GetCompressedSize() + json2.GetCompressedSize(), 934 ASSERT_EQ(dicom2.GetCompressedSize() + json2.GetCompressedSize(),
935 boost::lexical_cast<int>(tmp["TotalDiskSize"].asString())); 935 boost::lexical_cast<size_t>(tmp["TotalDiskSize"].asString()));
936 ASSERT_EQ(dicom2.GetUncompressedSize() + json2.GetUncompressedSize(), 936 ASSERT_EQ(dicom2.GetUncompressedSize() + json2.GetUncompressedSize(),
937 boost::lexical_cast<int>(tmp["TotalUncompressedSize"].asString())); 937 boost::lexical_cast<size_t>(tmp["TotalUncompressedSize"].asString()));
938 938
939 if (overwrite) 939 if (overwrite)
940 { 940 {
941 ASSERT_NE(dicom1.GetUuid(), dicom2.GetUuid()); 941 ASSERT_NE(dicom1.GetUuid(), dicom2.GetUuid());
942 ASSERT_NE(json1.GetUuid(), json2.GetUuid()); 942 ASSERT_NE(json1.GetUuid(), json2.GetUuid());