Mercurial > hg > orthanc

comparison UnitTestsSources/ServerIndexTests.cpp @ 928:882833632b1f mac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline -> mac
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 16 Apr 2014 17:02:07 +0200
parents c60743fadd4e
children 4689e400e0fa
comparison
equal deleted inserted replaced
927:ff1812962f30 928:882833632b1f
12 12
13 using namespace Orthanc; 13 using namespace Orthanc;
14 14
15 namespace 15 namespace
16 { 16 {
17 enum DatabaseWrapperClass
18 {
19 DatabaseWrapperClass_SQLite
20 };
21
22
17 class ServerIndexListener : public IServerIndexListener 23 class ServerIndexListener : public IServerIndexListener
18 { 24 {
19 public: 25 public:
20 std::vector<std::string> deletedFiles_; 26 std::vector<std::string> deletedFiles_;
21 std::string ancestorId_; 27 std::string ancestorId_;
39 const std::string fileUuid = info.GetUuid(); 45 const std::string fileUuid = info.GetUuid();
40 deletedFiles_.push_back(fileUuid); 46 deletedFiles_.push_back(fileUuid);
41 LOG(INFO) << "A file must be removed: " << fileUuid; 47 LOG(INFO) << "A file must be removed: " << fileUuid;
42 } 48 }
43 }; 49 };
44 } 50
45 51
46 52 class DatabaseWrapperTest : public ::testing::TestWithParam<DatabaseWrapperClass>
47 TEST(DatabaseWrapper, Simple) 53 {
48 { 54 protected:
49 ServerIndexListener listener; 55 std::auto_ptr<ServerIndexListener> listener_;
50 DatabaseWrapper index(listener); 56 std::auto_ptr<DatabaseWrapper> index_;
51 57
58 DatabaseWrapperTest()
59 {
60 }
61
62 virtual void SetUp()
63 {
64 listener_.reset(new ServerIndexListener);
65 index_.reset(new DatabaseWrapper(*listener_));
66 }
67
68 virtual void TearDown()
69 {
70 index_.reset(NULL);
71 listener_.reset(NULL);
72 }
73 };
74 }
75
76
77 INSTANTIATE_TEST_CASE_P(DatabaseWrapperName,
78 DatabaseWrapperTest,
79 ::testing::Values(DatabaseWrapperClass_SQLite));
80
81
82 TEST_P(DatabaseWrapperTest, Simple)
83 {
52 int64_t a[] = { 84 int64_t a[] = {
53 index.CreateResource("a", ResourceType_Patient), // 0 85 index_->CreateResource("a", ResourceType_Patient), // 0
54 index.CreateResource("b", ResourceType_Study), // 1 86 index_->CreateResource("b", ResourceType_Study), // 1
55 index.CreateResource("c", ResourceType_Series), // 2 87 index_->CreateResource("c", ResourceType_Series), // 2
56 index.CreateResource("d", ResourceType_Instance), // 3 88 index_->CreateResource("d", ResourceType_Instance), // 3
57 index.CreateResource("e", ResourceType_Instance), // 4 89 index_->CreateResource("e", ResourceType_Instance), // 4
58 index.CreateResource("f", ResourceType_Instance), // 5 90 index_->CreateResource("f", ResourceType_Instance), // 5
59 index.CreateResource("g", ResourceType_Study) // 6 91 index_->CreateResource("g", ResourceType_Study) // 6
60 }; 92 };
61 93
62 ASSERT_EQ("a", index.GetPublicId(a[0])); 94 ASSERT_EQ("a", index_->GetPublicId(a[0]));
63 ASSERT_EQ("b", index.GetPublicId(a[1])); 95 ASSERT_EQ("b", index_->GetPublicId(a[1]));
64 ASSERT_EQ("c", index.GetPublicId(a[2])); 96 ASSERT_EQ("c", index_->GetPublicId(a[2]));
65 ASSERT_EQ("d", index.GetPublicId(a[3])); 97 ASSERT_EQ("d", index_->GetPublicId(a[3]));
66 ASSERT_EQ("e", index.GetPublicId(a[4])); 98 ASSERT_EQ("e", index_->GetPublicId(a[4]));
67 ASSERT_EQ("f", index.GetPublicId(a[5])); 99 ASSERT_EQ("f", index_->GetPublicId(a[5]));
68 ASSERT_EQ("g", index.GetPublicId(a[6])); 100 ASSERT_EQ("g", index_->GetPublicId(a[6]));
69 101
70 ASSERT_EQ(ResourceType_Patient, index.GetResourceType(a[0])); 102 ASSERT_EQ(ResourceType_Patient, index_->GetResourceType(a[0]));
71 ASSERT_EQ(ResourceType_Study, index.GetResourceType(a[1])); 103 ASSERT_EQ(ResourceType_Study, index_->GetResourceType(a[1]));
72 ASSERT_EQ(ResourceType_Series, index.GetResourceType(a[2])); 104 ASSERT_EQ(ResourceType_Series, index_->GetResourceType(a[2]));
73 ASSERT_EQ(ResourceType_Instance, index.GetResourceType(a[3])); 105 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[3]));
74 ASSERT_EQ(ResourceType_Instance, index.GetResourceType(a[4])); 106 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[4]));
75 ASSERT_EQ(ResourceType_Instance, index.GetResourceType(a[5])); 107 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[5]));
76 ASSERT_EQ(ResourceType_Study, index.GetResourceType(a[6])); 108 ASSERT_EQ(ResourceType_Study, index_->GetResourceType(a[6]));
77 109
78 { 110 {
79 Json::Value t; 111 Json::Value t;
80 index.GetAllPublicIds(t, ResourceType_Patient); 112 index_->GetAllPublicIds(t, ResourceType_Patient);
81 113
82 ASSERT_EQ(1u, t.size()); 114 ASSERT_EQ(1u, t.size());
83 ASSERT_EQ("a", t[0u].asString()); 115 ASSERT_EQ("a", t[0u].asString());
84 116
85 index.GetAllPublicIds(t, ResourceType_Series); 117 index_->GetAllPublicIds(t, ResourceType_Series);
86 ASSERT_EQ(1u, t.size()); 118 ASSERT_EQ(1u, t.size());
87 ASSERT_EQ("c", t[0u].asString()); 119 ASSERT_EQ("c", t[0u].asString());
88 120
89 index.GetAllPublicIds(t, ResourceType_Study); 121 index_->GetAllPublicIds(t, ResourceType_Study);
90 ASSERT_EQ(2u, t.size()); 122 ASSERT_EQ(2u, t.size());
91 123
92 index.GetAllPublicIds(t, ResourceType_Instance); 124 index_->GetAllPublicIds(t, ResourceType_Instance);
93 ASSERT_EQ(3u, t.size()); 125 ASSERT_EQ(3u, t.size());
94 } 126 }
95 127
96 index.SetGlobalProperty(GlobalProperty_FlushSleep, "World"); 128 index_->SetGlobalProperty(GlobalProperty_FlushSleep, "World");
97 129
98 index.AttachChild(a[0], a[1]); 130 index_->AttachChild(a[0], a[1]);
99 index.AttachChild(a[1], a[2]); 131 index_->AttachChild(a[1], a[2]);
100 index.AttachChild(a[2], a[3]); 132 index_->AttachChild(a[2], a[3]);
101 index.AttachChild(a[2], a[4]); 133 index_->AttachChild(a[2], a[4]);
102 index.AttachChild(a[6], a[5]); 134 index_->AttachChild(a[6], a[5]);
103 135
104 int64_t parent; 136 int64_t parent;
105 ASSERT_FALSE(index.LookupParent(parent, a[0])); 137 ASSERT_FALSE(index_->LookupParent(parent, a[0]));
106 ASSERT_TRUE(index.LookupParent(parent, a[1])); ASSERT_EQ(a[0], parent); 138 ASSERT_TRUE(index_->LookupParent(parent, a[1])); ASSERT_EQ(a[0], parent);
107 ASSERT_TRUE(index.LookupParent(parent, a[2])); ASSERT_EQ(a[1], parent); 139 ASSERT_TRUE(index_->LookupParent(parent, a[2])); ASSERT_EQ(a[1], parent);
108 ASSERT_TRUE(index.LookupParent(parent, a[3])); ASSERT_EQ(a[2], parent); 140 ASSERT_TRUE(index_->LookupParent(parent, a[3])); ASSERT_EQ(a[2], parent);
109 ASSERT_TRUE(index.LookupParent(parent, a[4])); ASSERT_EQ(a[2], parent); 141 ASSERT_TRUE(index_->LookupParent(parent, a[4])); ASSERT_EQ(a[2], parent);
110 ASSERT_TRUE(index.LookupParent(parent, a[5])); ASSERT_EQ(a[6], parent); 142 ASSERT_TRUE(index_->LookupParent(parent, a[5])); ASSERT_EQ(a[6], parent);
111 ASSERT_FALSE(index.LookupParent(parent, a[6])); 143 ASSERT_FALSE(index_->LookupParent(parent, a[6]));
112 144
113 std::string s; 145 std::string s;
114 146
115 ASSERT_FALSE(index.GetParentPublicId(s, a[0])); 147 ASSERT_FALSE(index_->GetParentPublicId(s, a[0]));
116 ASSERT_FALSE(index.GetParentPublicId(s, a[6])); 148 ASSERT_FALSE(index_->GetParentPublicId(s, a[6]));
117 ASSERT_TRUE(index.GetParentPublicId(s, a[1])); ASSERT_EQ("a", s); 149 ASSERT_TRUE(index_->GetParentPublicId(s, a[1])); ASSERT_EQ("a", s);
118 ASSERT_TRUE(index.GetParentPublicId(s, a[2])); ASSERT_EQ("b", s); 150 ASSERT_TRUE(index_->GetParentPublicId(s, a[2])); ASSERT_EQ("b", s);
119 ASSERT_TRUE(index.GetParentPublicId(s, a[3])); ASSERT_EQ("c", s); 151 ASSERT_TRUE(index_->GetParentPublicId(s, a[3])); ASSERT_EQ("c", s);
120 ASSERT_TRUE(index.GetParentPublicId(s, a[4])); ASSERT_EQ("c", s); 152 ASSERT_TRUE(index_->GetParentPublicId(s, a[4])); ASSERT_EQ("c", s);
121 ASSERT_TRUE(index.GetParentPublicId(s, a[5])); ASSERT_EQ("g", s); 153 ASSERT_TRUE(index_->GetParentPublicId(s, a[5])); ASSERT_EQ("g", s);
122 154
123 std::list<std::string> l; 155 std::list<std::string> l;
124 index.GetChildrenPublicId(l, a[0]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("b", l.front()); 156 index_->GetChildrenPublicId(l, a[0]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("b", l.front());
125 index.GetChildrenPublicId(l, a[1]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("c", l.front()); 157 index_->GetChildrenPublicId(l, a[1]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("c", l.front());
126 index.GetChildrenPublicId(l, a[3]); ASSERT_EQ(0u, l.size()); 158 index_->GetChildrenPublicId(l, a[3]); ASSERT_EQ(0u, l.size());
127 index.GetChildrenPublicId(l, a[4]); ASSERT_EQ(0u, l.size()); 159 index_->GetChildrenPublicId(l, a[4]); ASSERT_EQ(0u, l.size());
128 index.GetChildrenPublicId(l, a[5]); ASSERT_EQ(0u, l.size()); 160 index_->GetChildrenPublicId(l, a[5]); ASSERT_EQ(0u, l.size());
129 index.GetChildrenPublicId(l, a[6]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("f", l.front()); 161 index_->GetChildrenPublicId(l, a[6]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("f", l.front());
130 162
131 index.GetChildrenPublicId(l, a[2]); ASSERT_EQ(2u, l.size()); 163 index_->GetChildrenPublicId(l, a[2]); ASSERT_EQ(2u, l.size());
132 if (l.front() == "d") 164 if (l.front() == "d")
133 { 165 {
134 ASSERT_EQ("e", l.back()); 166 ASSERT_EQ("e", l.back());
135 } 167 }
136 else 168 else
138 ASSERT_EQ("d", l.back()); 170 ASSERT_EQ("d", l.back());
139 ASSERT_EQ("e", l.front()); 171 ASSERT_EQ("e", l.front());
140 } 172 }
141 173
142 std::list<MetadataType> md; 174 std::list<MetadataType> md;
143 index.ListAvailableMetadata(md, a[4]); 175 index_->ListAvailableMetadata(md, a[4]);
144 ASSERT_EQ(0u, md.size()); 176 ASSERT_EQ(0u, md.size());
145 177
146 index.AddAttachment(a[4], FileInfo("my json file", FileContentType_DicomAsJson, 42, "md5", 178 index_->AddAttachment(a[4], FileInfo("my json file", FileContentType_DicomAsJson, 42, "md5",
147 CompressionType_Zlib, 21, "compressedMD5")); 179 CompressionType_Zlib, 21, "compressedMD5"));
148 index.AddAttachment(a[4], FileInfo("my dicom file", FileContentType_Dicom, 42, "md5")); 180 index_->AddAttachment(a[4], FileInfo("my dicom file", FileContentType_Dicom, 42, "md5"));
149 index.AddAttachment(a[6], FileInfo("world", FileContentType_Dicom, 44, "md5")); 181 index_->AddAttachment(a[6], FileInfo("world", FileContentType_Dicom, 44, "md5"));
150 index.SetMetadata(a[4], MetadataType_Instance_RemoteAet, "PINNACLE"); 182 index_->SetMetadata(a[4], MetadataType_Instance_RemoteAet, "PINNACLE");
151 183
152 index.ListAvailableMetadata(md, a[4]); 184 index_->ListAvailableMetadata(md, a[4]);
153 ASSERT_EQ(1u, md.size()); 185 ASSERT_EQ(1u, md.size());
154 ASSERT_EQ(MetadataType_Instance_RemoteAet, md.front()); 186 ASSERT_EQ(MetadataType_Instance_RemoteAet, md.front());
155 index.SetMetadata(a[4], MetadataType_ModifiedFrom, "TUTU"); 187 index_->SetMetadata(a[4], MetadataType_ModifiedFrom, "TUTU");
156 index.ListAvailableMetadata(md, a[4]); 188 index_->ListAvailableMetadata(md, a[4]);
157 ASSERT_EQ(2u, md.size()); 189 ASSERT_EQ(2u, md.size());
158 index.DeleteMetadata(a[4], MetadataType_ModifiedFrom); 190 index_->DeleteMetadata(a[4], MetadataType_ModifiedFrom);
159 index.ListAvailableMetadata(md, a[4]); 191 index_->ListAvailableMetadata(md, a[4]);
160 ASSERT_EQ(1u, md.size()); 192 ASSERT_EQ(1u, md.size());
161 ASSERT_EQ(MetadataType_Instance_RemoteAet, md.front()); 193 ASSERT_EQ(MetadataType_Instance_RemoteAet, md.front());
162 194
163 ASSERT_EQ(21u + 42u + 44u, index.GetTotalCompressedSize()); 195 ASSERT_EQ(21u + 42u + 44u, index_->GetTotalCompressedSize());
164 ASSERT_EQ(42u + 42u + 44u, index.GetTotalUncompressedSize()); 196 ASSERT_EQ(42u + 42u + 44u, index_->GetTotalUncompressedSize());
165 197
166 DicomMap m; 198 DicomMap m;
167 m.SetValue(0x0010, 0x0010, "PatientName"); 199 m.SetValue(0x0010, 0x0010, "PatientName");
168 index.SetMainDicomTags(a[3], m); 200 index_->SetMainDicomTags(a[3], m);
169 201
170 int64_t b; 202 int64_t b;
171 ResourceType t; 203 ResourceType t;
172 ASSERT_TRUE(index.LookupResource("g", b, t)); 204 ASSERT_TRUE(index_->LookupResource("g", b, t));
173 ASSERT_EQ(7, b); 205 ASSERT_EQ(7, b);
174 ASSERT_EQ(ResourceType_Study, t); 206 ASSERT_EQ(ResourceType_Study, t);
175 207
176 ASSERT_TRUE(index.LookupMetadata(s, a[4], MetadataType_Instance_RemoteAet)); 208 ASSERT_TRUE(index_->LookupMetadata(s, a[4], MetadataType_Instance_RemoteAet));
177 ASSERT_FALSE(index.LookupMetadata(s, a[4], MetadataType_Instance_IndexInSeries)); 209 ASSERT_FALSE(index_->LookupMetadata(s, a[4], MetadataType_Instance_IndexInSeries));
178 ASSERT_EQ("PINNACLE", s); 210 ASSERT_EQ("PINNACLE", s);
179 ASSERT_EQ("PINNACLE", index.GetMetadata(a[4], MetadataType_Instance_RemoteAet)); 211 ASSERT_EQ("PINNACLE", index_->GetMetadata(a[4], MetadataType_Instance_RemoteAet));
180 ASSERT_EQ("None", index.GetMetadata(a[4], MetadataType_Instance_IndexInSeries, "None")); 212 ASSERT_EQ("None", index_->GetMetadata(a[4], MetadataType_Instance_IndexInSeries, "None"));
181 213
182 ASSERT_TRUE(index.LookupGlobalProperty(s, GlobalProperty_FlushSleep)); 214 ASSERT_TRUE(index_->LookupGlobalProperty(s, GlobalProperty_FlushSleep));
183 ASSERT_FALSE(index.LookupGlobalProperty(s, static_cast<GlobalProperty>(42))); 215 ASSERT_FALSE(index_->LookupGlobalProperty(s, static_cast<GlobalProperty>(42)));
184 ASSERT_EQ("World", s); 216 ASSERT_EQ("World", s);
185 ASSERT_EQ("World", index.GetGlobalProperty(GlobalProperty_FlushSleep)); 217 ASSERT_EQ("World", index_->GetGlobalProperty(GlobalProperty_FlushSleep));
186 ASSERT_EQ("None", index.GetGlobalProperty(static_cast<GlobalProperty>(42), "None")); 218 ASSERT_EQ("None", index_->GetGlobalProperty(static_cast<GlobalProperty>(42), "None"));
187 219
188 FileInfo att; 220 FileInfo att;
189 ASSERT_TRUE(index.LookupAttachment(att, a[4], FileContentType_DicomAsJson)); 221 ASSERT_TRUE(index_->LookupAttachment(att, a[4], FileContentType_DicomAsJson));
190 ASSERT_EQ("my json file", att.GetUuid()); 222 ASSERT_EQ("my json file", att.GetUuid());
191 ASSERT_EQ(21u, att.GetCompressedSize()); 223 ASSERT_EQ(21u, att.GetCompressedSize());
192 ASSERT_EQ("md5", att.GetUncompressedMD5()); 224 ASSERT_EQ("md5", att.GetUncompressedMD5());
193 ASSERT_EQ("compressedMD5", att.GetCompressedMD5()); 225 ASSERT_EQ("compressedMD5", att.GetCompressedMD5());
194 ASSERT_EQ(42u, att.GetUncompressedSize()); 226 ASSERT_EQ(42u, att.GetUncompressedSize());
195 ASSERT_EQ(CompressionType_Zlib, att.GetCompressionType()); 227 ASSERT_EQ(CompressionType_Zlib, att.GetCompressionType());
196 228
197 ASSERT_TRUE(index.LookupAttachment(att, a[6], FileContentType_Dicom)); 229 ASSERT_TRUE(index_->LookupAttachment(att, a[6], FileContentType_Dicom));
198 ASSERT_EQ("world", att.GetUuid()); 230 ASSERT_EQ("world", att.GetUuid());
199 ASSERT_EQ(44u, att.GetCompressedSize()); 231 ASSERT_EQ(44u, att.GetCompressedSize());
200 ASSERT_EQ("md5", att.GetUncompressedMD5()); 232 ASSERT_EQ("md5", att.GetUncompressedMD5());
201 ASSERT_EQ("md5", att.GetCompressedMD5()); 233 ASSERT_EQ("md5", att.GetCompressedMD5());
202 ASSERT_EQ(44u, att.GetUncompressedSize()); 234 ASSERT_EQ(44u, att.GetUncompressedSize());
203 ASSERT_EQ(CompressionType_None, att.GetCompressionType()); 235 ASSERT_EQ(CompressionType_None, att.GetCompressionType());
204 236
205 ASSERT_EQ(0u, listener.deletedFiles_.size()); 237 ASSERT_EQ(0u, listener_->deletedFiles_.size());
206 ASSERT_EQ(7u, index.GetTableRecordCount("Resources")); 238 ASSERT_EQ(7u, index_->GetTableRecordCount("Resources"));
207 ASSERT_EQ(3u, index.GetTableRecordCount("AttachedFiles")); 239 ASSERT_EQ(3u, index_->GetTableRecordCount("AttachedFiles"));
208 ASSERT_EQ(1u, index.GetTableRecordCount("Metadata")); 240 ASSERT_EQ(1u, index_->GetTableRecordCount("Metadata"));
209 ASSERT_EQ(1u, index.GetTableRecordCount("MainDicomTags")); 241 ASSERT_EQ(1u, index_->GetTableRecordCount("MainDicomTags"));
210 index.DeleteResource(a[0]); 242 index_->DeleteResource(a[0]);
211 243
212 ASSERT_EQ(2u, listener.deletedFiles_.size()); 244 ASSERT_EQ(2u, listener_->deletedFiles_.size());
213 ASSERT_FALSE(std::find(listener.deletedFiles_.begin(), 245 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(),
214 listener.deletedFiles_.end(), 246 listener_->deletedFiles_.end(),
215 "my json file") == listener.deletedFiles_.end()); 247 "my json file") == listener_->deletedFiles_.end());
216 ASSERT_FALSE(std::find(listener.deletedFiles_.begin(), 248 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(),
217 listener.deletedFiles_.end(), 249 listener_->deletedFiles_.end(),
218 "my dicom file") == listener.deletedFiles_.end()); 250 "my dicom file") == listener_->deletedFiles_.end());
219 251
220 ASSERT_EQ(2u, index.GetTableRecordCount("Resources")); 252 ASSERT_EQ(2u, index_->GetTableRecordCount("Resources"));
221 ASSERT_EQ(0u, index.GetTableRecordCount("Metadata")); 253 ASSERT_EQ(0u, index_->GetTableRecordCount("Metadata"));
222 ASSERT_EQ(1u, index.GetTableRecordCount("AttachedFiles")); 254 ASSERT_EQ(1u, index_->GetTableRecordCount("AttachedFiles"));
223 ASSERT_EQ(0u, index.GetTableRecordCount("MainDicomTags")); 255 ASSERT_EQ(0u, index_->GetTableRecordCount("MainDicomTags"));
224 index.DeleteResource(a[5]); 256 index_->DeleteResource(a[5]);
225 ASSERT_EQ(0u, index.GetTableRecordCount("Resources")); 257 ASSERT_EQ(0u, index_->GetTableRecordCount("Resources"));
226 ASSERT_EQ(0u, index.GetTableRecordCount("AttachedFiles")); 258 ASSERT_EQ(0u, index_->GetTableRecordCount("AttachedFiles"));
227 ASSERT_EQ(2u, index.GetTableRecordCount("GlobalProperties")); 259 ASSERT_EQ(2u, index_->GetTableRecordCount("GlobalProperties"));
228 260
229 ASSERT_EQ(3u, listener.deletedFiles_.size()); 261 ASSERT_EQ(3u, listener_->deletedFiles_.size());
230 ASSERT_FALSE(std::find(listener.deletedFiles_.begin(), 262 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(),
231 listener.deletedFiles_.end(), 263 listener_->deletedFiles_.end(),
232 "world") == listener.deletedFiles_.end()); 264 "world") == listener_->deletedFiles_.end());
233 } 265 }
234 266
235 267
236 268
237 269
238 TEST(DatabaseWrapper, Upward) 270 TEST_P(DatabaseWrapperTest, Upward)
239 { 271 {
240 ServerIndexListener listener;
241 DatabaseWrapper index(listener);
242
243 int64_t a[] = { 272 int64_t a[] = {
244 index.CreateResource("a", ResourceType_Patient), // 0 273 index_->CreateResource("a", ResourceType_Patient), // 0
245 index.CreateResource("b", ResourceType_Study), // 1 274 index_->CreateResource("b", ResourceType_Study), // 1
246 index.CreateResource("c", ResourceType_Series), // 2 275 index_->CreateResource("c", ResourceType_Series), // 2
247 index.CreateResource("d", ResourceType_Instance), // 3 276 index_->CreateResource("d", ResourceType_Instance), // 3
248 index.CreateResource("e", ResourceType_Instance), // 4 277 index_->CreateResource("e", ResourceType_Instance), // 4
249 index.CreateResource("f", ResourceType_Study), // 5 278 index_->CreateResource("f", ResourceType_Study), // 5
250 index.CreateResource("g", ResourceType_Series), // 6 279 index_->CreateResource("g", ResourceType_Series), // 6
251 index.CreateResource("h", ResourceType_Series) // 7 280 index_->CreateResource("h", ResourceType_Series) // 7
252 }; 281 };
253 282
254 index.AttachChild(a[0], a[1]); 283 index_->AttachChild(a[0], a[1]);
255 index.AttachChild(a[1], a[2]); 284 index_->AttachChild(a[1], a[2]);
256 index.AttachChild(a[2], a[3]); 285 index_->AttachChild(a[2], a[3]);
257 index.AttachChild(a[2], a[4]); 286 index_->AttachChild(a[2], a[4]);
258 index.AttachChild(a[1], a[6]); 287 index_->AttachChild(a[1], a[6]);
259 index.AttachChild(a[0], a[5]); 288 index_->AttachChild(a[0], a[5]);
260 index.AttachChild(a[5], a[7]); 289 index_->AttachChild(a[5], a[7]);
261 290
262 { 291 {
263 Json::Value j; 292 Json::Value j;
264 index.GetChildren(j, a[0]); 293 index_->GetChildren(j, a[0]);
265 ASSERT_EQ(2u, j.size()); 294 ASSERT_EQ(2u, j.size());
266 ASSERT_TRUE((j[0u] == "b" && j[1u] == "f") || 295 ASSERT_TRUE((j[0u] == "b" && j[1u] == "f") ||
267 (j[1u] == "b" && j[0u] == "f")); 296 (j[1u] == "b" && j[0u] == "f"));
268 297
269 index.GetChildren(j, a[1]); 298 index_->GetChildren(j, a[1]);
270 ASSERT_EQ(2u, j.size()); 299 ASSERT_EQ(2u, j.size());
271 ASSERT_TRUE((j[0u] == "c" && j[1u] == "g") || 300 ASSERT_TRUE((j[0u] == "c" && j[1u] == "g") ||
272 (j[1u] == "c" && j[0u] == "g")); 301 (j[1u] == "c" && j[0u] == "g"));
273 302
274 index.GetChildren(j, a[2]); 303 index_->GetChildren(j, a[2]);
275 ASSERT_EQ(2u, j.size()); 304 ASSERT_EQ(2u, j.size());
276 ASSERT_TRUE((j[0u] == "d" && j[1u] == "e") || 305 ASSERT_TRUE((j[0u] == "d" && j[1u] == "e") ||
277 (j[1u] == "d" && j[0u] == "e")); 306 (j[1u] == "d" && j[0u] == "e"));
278 307
279 index.GetChildren(j, a[3]); ASSERT_EQ(0u, j.size()); 308 index_->GetChildren(j, a[3]); ASSERT_EQ(0u, j.size());
280 index.GetChildren(j, a[4]); ASSERT_EQ(0u, j.size()); 309 index_->GetChildren(j, a[4]); ASSERT_EQ(0u, j.size());
281 index.GetChildren(j, a[5]); ASSERT_EQ(1u, j.size()); ASSERT_EQ("h", j[0u].asString()); 310 index_->GetChildren(j, a[5]); ASSERT_EQ(1u, j.size()); ASSERT_EQ("h", j[0u].asString());
282 index.GetChildren(j, a[6]); ASSERT_EQ(0u, j.size()); 311 index_->GetChildren(j, a[6]); ASSERT_EQ(0u, j.size());
283 index.GetChildren(j, a[7]); ASSERT_EQ(0u, j.size()); 312 index_->GetChildren(j, a[7]); ASSERT_EQ(0u, j.size());
284 } 313 }
285 314
286 listener.Reset(); 315 listener_->Reset();
287 index.DeleteResource(a[3]); 316 index_->DeleteResource(a[3]);
288 ASSERT_EQ("c", listener.ancestorId_); 317 ASSERT_EQ("c", listener_->ancestorId_);
289 ASSERT_EQ(ResourceType_Series, listener.ancestorType_); 318 ASSERT_EQ(ResourceType_Series, listener_->ancestorType_);
290 319
291 listener.Reset(); 320 listener_->Reset();
292 index.DeleteResource(a[4]); 321 index_->DeleteResource(a[4]);
293 ASSERT_EQ("b", listener.ancestorId_); 322 ASSERT_EQ("b", listener_->ancestorId_);
294 ASSERT_EQ(ResourceType_Study, listener.ancestorType_); 323 ASSERT_EQ(ResourceType_Study, listener_->ancestorType_);
295 324
296 listener.Reset(); 325 listener_->Reset();
297 index.DeleteResource(a[7]); 326 index_->DeleteResource(a[7]);
298 ASSERT_EQ("a", listener.ancestorId_); 327 ASSERT_EQ("a", listener_->ancestorId_);
299 ASSERT_EQ(ResourceType_Patient, listener.ancestorType_); 328 ASSERT_EQ(ResourceType_Patient, listener_->ancestorType_);
300 329
301 listener.Reset(); 330 listener_->Reset();
302 index.DeleteResource(a[6]); 331 index_->DeleteResource(a[6]);
303 ASSERT_EQ("", listener.ancestorId_); // No more ancestor 332 ASSERT_EQ("", listener_->ancestorId_); // No more ancestor
304 } 333 }
305 334
306 335
307 TEST(DatabaseWrapper, PatientRecycling) 336 TEST_P(DatabaseWrapperTest, PatientRecycling)
308 { 337 {
309 ServerIndexListener listener;
310 DatabaseWrapper index(listener);
311
312 std::vector<int64_t> patients; 338 std::vector<int64_t> patients;
313 for (int i = 0; i < 10; i++) 339 for (int i = 0; i < 10; i++)
314 { 340 {
315 std::string p = "Patient " + boost::lexical_cast<std::string>(i); 341 std::string p = "Patient " + boost::lexical_cast<std::string>(i);
316 patients.push_back(index.CreateResource(p, ResourceType_Patient)); 342 patients.push_back(index_->CreateResource(p, ResourceType_Patient));
317 index.AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10, 343 index_->AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10,
318 "md5-" + boost::lexical_cast<std::string>(i))); 344 "md5-" + boost::lexical_cast<std::string>(i)));
319 ASSERT_FALSE(index.IsProtectedPatient(patients[i])); 345 ASSERT_FALSE(index_->IsProtectedPatient(patients[i]));
320 } 346 }
321 347
322 ASSERT_EQ(10u, index.GetTableRecordCount("Resources")); 348 ASSERT_EQ(10u, index_->GetTableRecordCount("Resources"));
323 ASSERT_EQ(10u, index.GetTableRecordCount("PatientRecyclingOrder")); 349 ASSERT_EQ(10u, index_->GetTableRecordCount("PatientRecyclingOrder"));
324 350
325 listener.Reset(); 351 listener_->Reset();
326 352
327 index.DeleteResource(patients[5]); 353 index_->DeleteResource(patients[5]);
328 index.DeleteResource(patients[0]); 354 index_->DeleteResource(patients[0]);
329 ASSERT_EQ(8u, index.GetTableRecordCount("Resources")); 355 ASSERT_EQ(8u, index_->GetTableRecordCount("Resources"));
330 ASSERT_EQ(8u, index.GetTableRecordCount("PatientRecyclingOrder")); 356 ASSERT_EQ(8u, index_->GetTableRecordCount("PatientRecyclingOrder"));
331 357
332 ASSERT_EQ(2u, listener.deletedFiles_.size()); 358 ASSERT_EQ(2u, listener_->deletedFiles_.size());
333 ASSERT_EQ("Patient 5", listener.deletedFiles_[0]); 359 ASSERT_EQ("Patient 5", listener_->deletedFiles_[0]);
334 ASSERT_EQ("Patient 0", listener.deletedFiles_[1]); 360 ASSERT_EQ("Patient 0", listener_->deletedFiles_[1]);
335 361
336 int64_t p; 362 int64_t p;
337 ASSERT_TRUE(index.SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[1]); 363 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[1]);
338 index.DeleteResource(p); 364 index_->DeleteResource(p);
339 ASSERT_TRUE(index.SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[2]); 365 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[2]);
340 index.DeleteResource(p); 366 index_->DeleteResource(p);
341 ASSERT_TRUE(index.SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[3]); 367 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[3]);
342 index.DeleteResource(p); 368 index_->DeleteResource(p);
343 ASSERT_TRUE(index.SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[4]); 369 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[4]);
344 index.DeleteResource(p); 370 index_->DeleteResource(p);
345 ASSERT_TRUE(index.SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[6]); 371 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[6]);
346 index.DeleteResource(p); 372 index_->DeleteResource(p);
347 index.DeleteResource(patients[8]); 373 index_->DeleteResource(patients[8]);
348 ASSERT_TRUE(index.SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[7]); 374 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[7]);
349 index.DeleteResource(p); 375 index_->DeleteResource(p);
350 ASSERT_TRUE(index.SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[9]); 376 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[9]);
351 index.DeleteResource(p); 377 index_->DeleteResource(p);
352 ASSERT_FALSE(index.SelectPatientToRecycle(p)); 378 ASSERT_FALSE(index_->SelectPatientToRecycle(p));
353 379
354 ASSERT_EQ(10u, listener.deletedFiles_.size()); 380 ASSERT_EQ(10u, listener_->deletedFiles_.size());
355 ASSERT_EQ(0u, index.GetTableRecordCount("Resources")); 381 ASSERT_EQ(0u, index_->GetTableRecordCount("Resources"));
356 ASSERT_EQ(0u, index.GetTableRecordCount("PatientRecyclingOrder")); 382 ASSERT_EQ(0u, index_->GetTableRecordCount("PatientRecyclingOrder"));
357 } 383 }
358 384
359 385
360 TEST(DatabaseWrapper, PatientProtection) 386 TEST_P(DatabaseWrapperTest, PatientProtection)
361 { 387 {
362 ServerIndexListener listener;
363 DatabaseWrapper index(listener);
364
365 std::vector<int64_t> patients; 388 std::vector<int64_t> patients;
366 for (int i = 0; i < 5; i++) 389 for (int i = 0; i < 5; i++)
367 { 390 {
368 std::string p = "Patient " + boost::lexical_cast<std::string>(i); 391 std::string p = "Patient " + boost::lexical_cast<std::string>(i);
369 patients.push_back(index.CreateResource(p, ResourceType_Patient)); 392 patients.push_back(index_->CreateResource(p, ResourceType_Patient));
370 index.AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10, 393 index_->AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10,
371 "md5-" + boost::lexical_cast<std::string>(i))); 394 "md5-" + boost::lexical_cast<std::string>(i)));
372 ASSERT_FALSE(index.IsProtectedPatient(patients[i])); 395 ASSERT_FALSE(index_->IsProtectedPatient(patients[i]));
373 } 396 }
374 397
375 ASSERT_EQ(5u, index.GetTableRecordCount("Resources")); 398 ASSERT_EQ(5u, index_->GetTableRecordCount("Resources"));
376 ASSERT_EQ(5u, index.GetTableRecordCount("PatientRecyclingOrder")); 399 ASSERT_EQ(5u, index_->GetTableRecordCount("PatientRecyclingOrder"));
377 400
378 ASSERT_FALSE(index.IsProtectedPatient(patients[2])); 401 ASSERT_FALSE(index_->IsProtectedPatient(patients[2]));
379 index.SetProtectedPatient(patients[2], true); 402 index_->SetProtectedPatient(patients[2], true);
380 ASSERT_TRUE(index.IsProtectedPatient(patients[2])); 403 ASSERT_TRUE(index_->IsProtectedPatient(patients[2]));
381 ASSERT_EQ(4u, index.GetTableRecordCount("PatientRecyclingOrder")); 404 ASSERT_EQ(4u, index_->GetTableRecordCount("PatientRecyclingOrder"));
382 ASSERT_EQ(5u, index.GetTableRecordCount("Resources")); 405 ASSERT_EQ(5u, index_->GetTableRecordCount("Resources"));
383 406
384 index.SetProtectedPatient(patients[2], true); 407 index_->SetProtectedPatient(patients[2], true);
385 ASSERT_TRUE(index.IsProtectedPatient(patients[2])); 408 ASSERT_TRUE(index_->IsProtectedPatient(patients[2]));
386 ASSERT_EQ(4u, index.GetTableRecordCount("PatientRecyclingOrder")); 409 ASSERT_EQ(4u, index_->GetTableRecordCount("PatientRecyclingOrder"));
387 index.SetProtectedPatient(patients[2], false); 410 index_->SetProtectedPatient(patients[2], false);
388 ASSERT_FALSE(index.IsProtectedPatient(patients[2])); 411 ASSERT_FALSE(index_->IsProtectedPatient(patients[2]));
389 ASSERT_EQ(5u, index.GetTableRecordCount("PatientRecyclingOrder")); 412 ASSERT_EQ(5u, index_->GetTableRecordCount("PatientRecyclingOrder"));
390 index.SetProtectedPatient(patients[2], false); 413 index_->SetProtectedPatient(patients[2], false);
391 ASSERT_FALSE(index.IsProtectedPatient(patients[2])); 414 ASSERT_FALSE(index_->IsProtectedPatient(patients[2]));
392 ASSERT_EQ(5u, index.GetTableRecordCount("PatientRecyclingOrder")); 415 ASSERT_EQ(5u, index_->GetTableRecordCount("PatientRecyclingOrder"));
393 416
394 ASSERT_EQ(5u, index.GetTableRecordCount("Resources")); 417 ASSERT_EQ(5u, index_->GetTableRecordCount("Resources"));
395 ASSERT_EQ(5u, index.GetTableRecordCount("PatientRecyclingOrder")); 418 ASSERT_EQ(5u, index_->GetTableRecordCount("PatientRecyclingOrder"));
396 index.SetProtectedPatient(patients[2], true); 419 index_->SetProtectedPatient(patients[2], true);
397 ASSERT_TRUE(index.IsProtectedPatient(patients[2])); 420 ASSERT_TRUE(index_->IsProtectedPatient(patients[2]));
398 ASSERT_EQ(4u, index.GetTableRecordCount("PatientRecyclingOrder")); 421 ASSERT_EQ(4u, index_->GetTableRecordCount("PatientRecyclingOrder"));
399 index.SetProtectedPatient(patients[2], false); 422 index_->SetProtectedPatient(patients[2], false);
400 ASSERT_FALSE(index.IsProtectedPatient(patients[2])); 423 ASSERT_FALSE(index_->IsProtectedPatient(patients[2]));
401 ASSERT_EQ(5u, index.GetTableRecordCount("PatientRecyclingOrder")); 424 ASSERT_EQ(5u, index_->GetTableRecordCount("PatientRecyclingOrder"));
402 index.SetProtectedPatient(patients[3], true); 425 index_->SetProtectedPatient(patients[3], true);
403 ASSERT_TRUE(index.IsProtectedPatient(patients[3])); 426 ASSERT_TRUE(index_->IsProtectedPatient(patients[3]));
404 ASSERT_EQ(4u, index.GetTableRecordCount("PatientRecyclingOrder")); 427 ASSERT_EQ(4u, index_->GetTableRecordCount("PatientRecyclingOrder"));
405 428
406 ASSERT_EQ(5u, index.GetTableRecordCount("Resources")); 429 ASSERT_EQ(5u, index_->GetTableRecordCount("Resources"));
407 ASSERT_EQ(0u, listener.deletedFiles_.size()); 430 ASSERT_EQ(0u, listener_->deletedFiles_.size());
408 431
409 // Unprotecting a patient puts it at the last position in the recycling queue 432 // Unprotecting a patient puts it at the last position in the recycling queue
410 int64_t p; 433 int64_t p;
411 ASSERT_TRUE(index.SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[0]); 434 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[0]);
412 index.DeleteResource(p); 435 index_->DeleteResource(p);
413 ASSERT_TRUE(index.SelectPatientToRecycle(p, patients[1])); ASSERT_EQ(p, patients[4]); 436 ASSERT_TRUE(index_->SelectPatientToRecycle(p, patients[1])); ASSERT_EQ(p, patients[4]);
414 ASSERT_TRUE(index.SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[1]); 437 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[1]);
415 index.DeleteResource(p); 438 index_->DeleteResource(p);
416 ASSERT_TRUE(index.SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[4]); 439 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[4]);
417 index.DeleteResource(p); 440 index_->DeleteResource(p);
418 ASSERT_FALSE(index.SelectPatientToRecycle(p, patients[2])); 441 ASSERT_FALSE(index_->SelectPatientToRecycle(p, patients[2]));
419 ASSERT_TRUE(index.SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[2]); 442 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[2]);
420 index.DeleteResource(p); 443 index_->DeleteResource(p);
421 // "patients[3]" is still protected 444 // "patients[3]" is still protected
422 ASSERT_FALSE(index.SelectPatientToRecycle(p)); 445 ASSERT_FALSE(index_->SelectPatientToRecycle(p));
423 446
424 ASSERT_EQ(4u, listener.deletedFiles_.size()); 447 ASSERT_EQ(4u, listener_->deletedFiles_.size());
425 ASSERT_EQ(1u, index.GetTableRecordCount("Resources")); 448 ASSERT_EQ(1u, index_->GetTableRecordCount("Resources"));
426 ASSERT_EQ(0u, index.GetTableRecordCount("PatientRecyclingOrder")); 449 ASSERT_EQ(0u, index_->GetTableRecordCount("PatientRecyclingOrder"));
427 450
428 index.SetProtectedPatient(patients[3], false); 451 index_->SetProtectedPatient(patients[3], false);
429 ASSERT_EQ(1u, index.GetTableRecordCount("PatientRecyclingOrder")); 452 ASSERT_EQ(1u, index_->GetTableRecordCount("PatientRecyclingOrder"));
430 ASSERT_FALSE(index.SelectPatientToRecycle(p, patients[3])); 453 ASSERT_FALSE(index_->SelectPatientToRecycle(p, patients[3]));
431 ASSERT_TRUE(index.SelectPatientToRecycle(p, patients[2])); 454 ASSERT_TRUE(index_->SelectPatientToRecycle(p, patients[2]));
432 ASSERT_TRUE(index.SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[3]); 455 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[3]);
433 index.DeleteResource(p); 456 index_->DeleteResource(p);
434 457
435 ASSERT_EQ(5u, listener.deletedFiles_.size()); 458 ASSERT_EQ(5u, listener_->deletedFiles_.size());
436 ASSERT_EQ(0u, index.GetTableRecordCount("Resources")); 459 ASSERT_EQ(0u, index_->GetTableRecordCount("Resources"));
437 ASSERT_EQ(0u, index.GetTableRecordCount("PatientRecyclingOrder")); 460 ASSERT_EQ(0u, index_->GetTableRecordCount("PatientRecyclingOrder"));
438 } 461 }
439 462
440 463
441 464
442 TEST(DatabaseWrapper, Sequence) 465 TEST_P(DatabaseWrapperTest, Sequence)
443 { 466 {
444 ServerIndexListener listener; 467 ASSERT_EQ(1u, index_->IncrementGlobalSequence(GlobalProperty_AnonymizationSequence));
445 DatabaseWrapper index(listener); 468 ASSERT_EQ(2u, index_->IncrementGlobalSequence(GlobalProperty_AnonymizationSequence));
446 469 ASSERT_EQ(3u, index_->IncrementGlobalSequence(GlobalProperty_AnonymizationSequence));
447 ASSERT_EQ(1u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); 470 ASSERT_EQ(4u, index_->IncrementGlobalSequence(GlobalProperty_AnonymizationSequence));
448 ASSERT_EQ(2u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); 471 }
449 ASSERT_EQ(3u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); 472
450 ASSERT_EQ(4u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); 473
451 } 474
452 475 TEST_P(DatabaseWrapperTest, LookupTagValue)
453 476 {
454
455 TEST(DatabaseWrapper, LookupTagValue)
456 {
457 ServerIndexListener listener;
458 DatabaseWrapper index(listener);
459
460 int64_t a[] = { 477 int64_t a[] = {
461 index.CreateResource("a", ResourceType_Study), // 0 478 index_->CreateResource("a", ResourceType_Study), // 0
462 index.CreateResource("b", ResourceType_Study), // 1 479 index_->CreateResource("b", ResourceType_Study), // 1
463 index.CreateResource("c", ResourceType_Study), // 2 480 index_->CreateResource("c", ResourceType_Study), // 2
464 index.CreateResource("d", ResourceType_Series) // 3 481 index_->CreateResource("d", ResourceType_Series) // 3
465 }; 482 };
466 483
467 DicomMap m; 484 DicomMap m;
468 m.Clear(); m.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "0"); index.SetMainDicomTags(a[0], m); 485 m.Clear(); m.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "0"); index_->SetMainDicomTags(a[0], m);
469 m.Clear(); m.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "1"); index.SetMainDicomTags(a[1], m); 486 m.Clear(); m.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "1"); index_->SetMainDicomTags(a[1], m);
470 m.Clear(); m.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "0"); index.SetMainDicomTags(a[2], m); 487 m.Clear(); m.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "0"); index_->SetMainDicomTags(a[2], m);
471 m.Clear(); m.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, "0"); index.SetMainDicomTags(a[3], m); 488 m.Clear(); m.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, "0"); index_->SetMainDicomTags(a[3], m);
472 489
473 std::list<int64_t> s; 490 std::list<int64_t> s;
474 491
475 index.LookupTagValue(s, DICOM_TAG_STUDY_INSTANCE_UID, "0"); 492 index_->LookupTagValue(s, DICOM_TAG_STUDY_INSTANCE_UID, "0");
476 ASSERT_EQ(2u, s.size()); 493 ASSERT_EQ(2u, s.size());
477 ASSERT_TRUE(std::find(s.begin(), s.end(), a[0]) != s.end()); 494 ASSERT_TRUE(std::find(s.begin(), s.end(), a[0]) != s.end());
478 ASSERT_TRUE(std::find(s.begin(), s.end(), a[2]) != s.end()); 495 ASSERT_TRUE(std::find(s.begin(), s.end(), a[2]) != s.end());
479 496
480 index.LookupTagValue(s, "0"); 497 index_->LookupTagValue(s, "0");
481 ASSERT_EQ(3u, s.size()); 498 ASSERT_EQ(3u, s.size());
482 ASSERT_TRUE(std::find(s.begin(), s.end(), a[0]) != s.end()); 499 ASSERT_TRUE(std::find(s.begin(), s.end(), a[0]) != s.end());
483 ASSERT_TRUE(std::find(s.begin(), s.end(), a[2]) != s.end()); 500 ASSERT_TRUE(std::find(s.begin(), s.end(), a[2]) != s.end());
484 ASSERT_TRUE(std::find(s.begin(), s.end(), a[3]) != s.end()); 501 ASSERT_TRUE(std::find(s.begin(), s.end(), a[3]) != s.end());
485 502
486 index.LookupTagValue(s, DICOM_TAG_STUDY_INSTANCE_UID, "1"); 503 index_->LookupTagValue(s, DICOM_TAG_STUDY_INSTANCE_UID, "1");
487 ASSERT_EQ(1u, s.size()); 504 ASSERT_EQ(1u, s.size());
488 ASSERT_TRUE(std::find(s.begin(), s.end(), a[1]) != s.end()); 505 ASSERT_TRUE(std::find(s.begin(), s.end(), a[1]) != s.end());
489 506
490 index.LookupTagValue(s, "1"); 507 index_->LookupTagValue(s, "1");
491 ASSERT_EQ(1u, s.size()); 508 ASSERT_EQ(1u, s.size());
492 ASSERT_TRUE(std::find(s.begin(), s.end(), a[1]) != s.end()); 509 ASSERT_TRUE(std::find(s.begin(), s.end(), a[1]) != s.end());
493 510
494 511
495 /*{ 512 /*{