comparison UnitTestsSources/ServerIndexTests.cpp @ 1726:9d8bb6bc2890

integration db-changes->mainline
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 20 Oct 2015 11:22:50 +0200
parents 2b812969e136
children 1ae29c5e52fb ec66a16aa398
comparison
equal deleted inserted replaced
1710:d72cf0c11f42 1726:9d8bb6bc2890
684 index_->CreateResource("b", ResourceType_Study), // 1 684 index_->CreateResource("b", ResourceType_Study), // 1
685 index_->CreateResource("c", ResourceType_Study), // 2 685 index_->CreateResource("c", ResourceType_Study), // 2
686 index_->CreateResource("d", ResourceType_Series) // 3 686 index_->CreateResource("d", ResourceType_Series) // 3
687 }; 687 };
688 688
689 index_->SetMainDicomTag(a[0], DICOM_TAG_STUDY_INSTANCE_UID, "0"); 689 index_->SetIdentifierTag(a[0], DICOM_TAG_STUDY_INSTANCE_UID, "0");
690 index_->SetMainDicomTag(a[1], DICOM_TAG_STUDY_INSTANCE_UID, "1"); 690 index_->SetIdentifierTag(a[1], DICOM_TAG_STUDY_INSTANCE_UID, "1");
691 index_->SetMainDicomTag(a[2], DICOM_TAG_STUDY_INSTANCE_UID, "0"); 691 index_->SetIdentifierTag(a[2], DICOM_TAG_STUDY_INSTANCE_UID, "0");
692 index_->SetMainDicomTag(a[3], DICOM_TAG_SERIES_INSTANCE_UID, "0"); 692 index_->SetIdentifierTag(a[3], DICOM_TAG_SERIES_INSTANCE_UID, "0");
693 693
694 std::list<int64_t> s; 694 std::list<int64_t> s;
695 695
696 index_->LookupIdentifier(s, DICOM_TAG_STUDY_INSTANCE_UID, "0"); 696 index_->LookupIdentifier(s, DICOM_TAG_STUDY_INSTANCE_UID, "0");
697 ASSERT_EQ(2u, s.size()); 697 ASSERT_EQ(2u, s.size());
698 ASSERT_TRUE(std::find(s.begin(), s.end(), a[0]) != s.end()); 698 ASSERT_TRUE(std::find(s.begin(), s.end(), a[0]) != s.end());
699 ASSERT_TRUE(std::find(s.begin(), s.end(), a[2]) != s.end()); 699 ASSERT_TRUE(std::find(s.begin(), s.end(), a[2]) != s.end());
700 700
701 index_->LookupIdentifier(s, "0"); 701 index_->LookupIdentifier(s, DICOM_TAG_SERIES_INSTANCE_UID, "0");
702 ASSERT_EQ(3u, s.size()); 702 ASSERT_EQ(1u, s.size());
703 ASSERT_TRUE(std::find(s.begin(), s.end(), a[0]) != s.end());
704 ASSERT_TRUE(std::find(s.begin(), s.end(), a[2]) != s.end());
705 ASSERT_TRUE(std::find(s.begin(), s.end(), a[3]) != s.end()); 703 ASSERT_TRUE(std::find(s.begin(), s.end(), a[3]) != s.end());
706 704
707 index_->LookupIdentifier(s, DICOM_TAG_STUDY_INSTANCE_UID, "1"); 705 index_->LookupIdentifier(s, DICOM_TAG_STUDY_INSTANCE_UID, "1");
708 ASSERT_EQ(1u, s.size()); 706 ASSERT_EQ(1u, s.size());
709 ASSERT_TRUE(std::find(s.begin(), s.end(), a[1]) != s.end()); 707 ASSERT_TRUE(std::find(s.begin(), s.end(), a[1]) != s.end());
710 708
711 index_->LookupIdentifier(s, "1"); 709 index_->LookupIdentifier(s, DICOM_TAG_STUDY_INSTANCE_UID, "1");
712 ASSERT_EQ(1u, s.size()); 710 ASSERT_EQ(1u, s.size());
713 ASSERT_TRUE(std::find(s.begin(), s.end(), a[1]) != s.end()); 711 ASSERT_TRUE(std::find(s.begin(), s.end(), a[1]) != s.end());
714 712
713 index_->LookupIdentifier(s, DICOM_TAG_SERIES_INSTANCE_UID, "1");
714 ASSERT_EQ(0u, s.size());
715 715
716 /*{ 716 /*{
717 std::list<std::string> s; 717 std::list<std::string> s;
718 context.GetIndex().LookupIdentifier(s, DICOM_TAG_STUDY_INSTANCE_UID, "1.2.250.1.74.20130819132500.29000036381059"); 718 context.GetIndex().LookupIdentifier(s, DICOM_TAG_STUDY_INSTANCE_UID, "1.2.250.1.74.20130819132500.29000036381059");
719 for (std::list<std::string>::iterator i = s.begin(); i != s.end(); i++) 719 for (std::list<std::string>::iterator i = s.begin(); i != s.end(); i++)