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