comparison UnitTestsSources/ServerIndexTests.cpp @ 3187:4bbadcd03966

refactoring retrieval of metadata from database
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 04 Feb 2019 12:06:19 +0100
parents fca730c267d7
children 94f4a18a79cc
comparison
equal deleted inserted replaced
3184:5d1f5984dc41 3187:4bbadcd03966
291 { 291 {
292 ASSERT_EQ("d", l.back()); 292 ASSERT_EQ("d", l.back());
293 ASSERT_EQ("e", l.front()); 293 ASSERT_EQ("e", l.front());
294 } 294 }
295 295
296 std::list<MetadataType> md; 296 std::map<MetadataType, std::string> md;
297 index_->ListAvailableMetadata(md, a[4]); 297 index_->GetAllMetadata(md, a[4]);
298 ASSERT_EQ(0u, md.size()); 298 ASSERT_EQ(0u, md.size());
299 299
300 index_->AddAttachment(a[4], FileInfo("my json file", FileContentType_DicomAsJson, 42, "md5", 300 index_->AddAttachment(a[4], FileInfo("my json file", FileContentType_DicomAsJson, 42, "md5",
301 CompressionType_ZlibWithSize, 21, "compressedMD5")); 301 CompressionType_ZlibWithSize, 21, "compressedMD5"));
302 index_->AddAttachment(a[4], FileInfo("my dicom file", FileContentType_Dicom, 42, "md5")); 302 index_->AddAttachment(a[4], FileInfo("my dicom file", FileContentType_Dicom, 42, "md5"));
303 index_->AddAttachment(a[6], FileInfo("world", FileContentType_Dicom, 44, "md5")); 303 index_->AddAttachment(a[6], FileInfo("world", FileContentType_Dicom, 44, "md5"));
304 index_->SetMetadata(a[4], MetadataType_Instance_RemoteAet, "PINNACLE"); 304 index_->SetMetadata(a[4], MetadataType_Instance_RemoteAet, "PINNACLE");
305 305
306 index_->ListAvailableMetadata(md, a[4]); 306 index_->GetAllMetadata(md, a[4]);
307 ASSERT_EQ(1u, md.size()); 307 ASSERT_EQ(1u, md.size());
308 ASSERT_EQ(MetadataType_Instance_RemoteAet, md.front()); 308 ASSERT_EQ("PINNACLE", md[MetadataType_Instance_RemoteAet]);
309 index_->SetMetadata(a[4], MetadataType_ModifiedFrom, "TUTU"); 309 index_->SetMetadata(a[4], MetadataType_ModifiedFrom, "TUTU");
310 index_->ListAvailableMetadata(md, a[4]); 310 index_->GetAllMetadata(md, a[4]);
311 ASSERT_EQ(2u, md.size()); 311 ASSERT_EQ(2u, md.size());
312 312
313 std::map<MetadataType, std::string> md2; 313 std::map<MetadataType, std::string> md2;
314 index_->GetAllMetadata(md2, a[4]); 314 index_->GetAllMetadata(md2, a[4]);
315 ASSERT_EQ(2u, md2.size()); 315 ASSERT_EQ(2u, md2.size());
316 ASSERT_EQ("TUTU", md2[MetadataType_ModifiedFrom]); 316 ASSERT_EQ("TUTU", md2[MetadataType_ModifiedFrom]);
317 ASSERT_EQ("PINNACLE", md2[MetadataType_Instance_RemoteAet]); 317 ASSERT_EQ("PINNACLE", md2[MetadataType_Instance_RemoteAet]);
318 318
319 index_->DeleteMetadata(a[4], MetadataType_ModifiedFrom); 319 index_->DeleteMetadata(a[4], MetadataType_ModifiedFrom);
320 index_->ListAvailableMetadata(md, a[4]); 320 index_->GetAllMetadata(md, a[4]);
321 ASSERT_EQ(1u, md.size()); 321 ASSERT_EQ(1u, md.size());
322 ASSERT_EQ(MetadataType_Instance_RemoteAet, md.front()); 322 ASSERT_EQ("PINNACLE", md[MetadataType_Instance_RemoteAet]);
323 323
324 index_->GetAllMetadata(md2, a[4]); 324 index_->GetAllMetadata(md2, a[4]);
325 ASSERT_EQ(1u, md2.size()); 325 ASSERT_EQ(1u, md2.size());
326 ASSERT_EQ("PINNACLE", md2[MetadataType_Instance_RemoteAet]); 326 ASSERT_EQ("PINNACLE", md2[MetadataType_Instance_RemoteAet]);
327 327