Mercurial > hg > orthanc
annotate UnitTestsSources/ServerIndexTests.cpp @ 2457:2a211c0fc7ca
note about ar
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 04 Jan 2018 09:27:16 +0100 |
parents | 878b59270859 |
children | 4dcafa8d6633 |
rev | line source |
---|---|
827
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
1 /** |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
2 * Orthanc - A Lightweight, RESTful DICOM Store |
1900 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1287
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
2447
878b59270859
upgrade to year 2018
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
5 * Copyright (C) 2017-2018 Osimis S.A., Belgium |
827
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
6 * |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
7 * This program is free software: you can redistribute it and/or |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
8 * modify it under the terms of the GNU General Public License as |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
9 * published by the Free Software Foundation, either version 3 of the |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
10 * License, or (at your option) any later version. |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
11 * |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
12 * In addition, as a special exception, the copyright holders of this |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
13 * program give permission to link the code of its release with the |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
14 * OpenSSL project's "OpenSSL" library (or with modified versions of it |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
15 * that use the same license as the "OpenSSL" library), and distribute |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
16 * the linked executables. You must obey the GNU General Public License |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
17 * in all respects for all of the code used other than "OpenSSL". If you |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
18 * modify file(s) with this exception, you may extend this exception to |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
19 * your version of the file(s), but you are not obligated to do so. If |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
20 * you do not wish to do so, delete this exception statement from your |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
21 * version. If you delete this exception statement from all source files |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
22 * in the program, then also delete it here. |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
23 * |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
24 * This program is distributed in the hope that it will be useful, but |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
25 * WITHOUT ANY WARRANTY; without even the implied warranty of |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
27 * General Public License for more details. |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
28 * |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
29 * You should have received a copy of the GNU General Public License |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
30 * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
31 **/ |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
32 |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
33 |
831
84513f2ee1f3
pch for unit tests and server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
827
diff
changeset
|
34 #include "PrecompiledHeadersUnitTests.h" |
181 | 35 #include "gtest/gtest.h" |
36 | |
1486
f967bdf8534e
refactoring to Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1453
diff
changeset
|
37 #include "../Core/FileStorage/FilesystemStorage.h" |
f967bdf8534e
refactoring to Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1453
diff
changeset
|
38 #include "../Core/Logging.h" |
183 | 39 #include "../OrthancServer/DatabaseWrapper.h" |
705 | 40 #include "../OrthancServer/ServerContext.h" |
41 #include "../OrthancServer/ServerIndex.h" | |
1747 | 42 #include "../OrthancServer/Search/LookupIdentifierQuery.h" |
183 | 43 |
181 | 44 #include <ctype.h> |
521 | 45 #include <algorithm> |
181 | 46 |
183 | 47 using namespace Orthanc; |
181 | 48 |
183 | 49 namespace |
50 { | |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
51 enum DatabaseWrapperClass |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
52 { |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
53 DatabaseWrapperClass_SQLite |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
54 }; |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
55 |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
56 |
1432
0ac74fa21db8
rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1294
diff
changeset
|
57 class TestDatabaseListener : public IDatabaseListener |
181 | 58 { |
59 public: | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
60 std::vector<std::string> deletedFiles_; |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
61 std::vector<std::string> deletedResources_; |
183 | 62 std::string ancestorId_; |
63 ResourceType ancestorType_; | |
64 | |
65 void Reset() | |
181 | 66 { |
183 | 67 ancestorId_ = ""; |
68 deletedFiles_.clear(); | |
69 } | |
70 | |
71 virtual void SignalRemainingAncestor(ResourceType type, | |
72 const std::string& publicId) | |
73 { | |
74 ancestorId_ = publicId; | |
75 ancestorType_ = type; | |
181 | 76 } |
77 | |
273
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
78 virtual void SignalFileDeleted(const FileInfo& info) |
181 | 79 { |
273
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
80 const std::string fileUuid = info.GetUuid(); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
81 deletedFiles_.push_back(fileUuid); |
181 | 82 LOG(INFO) << "A file must be removed: " << fileUuid; |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
83 } |
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
84 |
1198 | 85 virtual void SignalChange(const ServerIndexChange& change) |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
86 { |
1198 | 87 if (change.GetChangeType() == ChangeType_Deleted) |
1177
5b2d8c280ac2
Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
88 { |
1198 | 89 deletedResources_.push_back(change.GetPublicId()); |
1177
5b2d8c280ac2
Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
90 } |
5b2d8c280ac2
Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
91 |
1198 | 92 LOG(INFO) << "Change related to resource " << change.GetPublicId() << " of type " |
93 << EnumerationToString(change.GetResourceType()) << ": " | |
94 << EnumerationToString(change.GetChangeType()); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
95 } |
1177
5b2d8c280ac2
Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
96 |
181 | 97 }; |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
98 |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
99 |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
100 class DatabaseWrapperTest : public ::testing::TestWithParam<DatabaseWrapperClass> |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
101 { |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
102 protected: |
1432
0ac74fa21db8
rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1294
diff
changeset
|
103 std::auto_ptr<TestDatabaseListener> listener_; |
1252 | 104 std::auto_ptr<IDatabaseWrapper> index_; |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
105 |
738 | 106 DatabaseWrapperTest() |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
107 { |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
108 } |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
109 |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
110 virtual void SetUp() |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
111 { |
1432
0ac74fa21db8
rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1294
diff
changeset
|
112 listener_.reset(new TestDatabaseListener); |
1287 | 113 |
114 switch (GetParam()) | |
115 { | |
116 case DatabaseWrapperClass_SQLite: | |
117 index_.reset(new DatabaseWrapper()); | |
118 break; | |
119 | |
120 default: | |
121 throw OrthancException(ErrorCode_InternalError); | |
122 } | |
123 | |
1247 | 124 index_->SetListener(*listener_); |
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
125 index_->Open(); |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
126 } |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
127 |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
128 virtual void TearDown() |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
129 { |
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
130 index_->Close(); |
738 | 131 index_.reset(NULL); |
132 listener_.reset(NULL); | |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
133 } |
1286 | 134 |
135 void CheckTableRecordCount(uint32_t expected, const char* table) | |
136 { | |
1287 | 137 switch (GetParam()) |
138 { | |
139 case DatabaseWrapperClass_SQLite: | |
140 { | |
141 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); | |
142 ASSERT_EQ(expected, sqlite->GetTableRecordCount(table)); | |
143 break; | |
144 } | |
145 | |
146 default: | |
147 throw OrthancException(ErrorCode_InternalError); | |
148 } | |
149 } | |
150 | |
151 void CheckNoParent(int64_t id) | |
152 { | |
153 std::string s; | |
154 | |
155 switch (GetParam()) | |
1286 | 156 { |
1287 | 157 case DatabaseWrapperClass_SQLite: |
158 { | |
159 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); | |
160 ASSERT_FALSE(sqlite->GetParentPublicId(s, id)); | |
161 break; | |
162 } | |
163 | |
164 default: | |
165 throw OrthancException(ErrorCode_InternalError); | |
166 } | |
167 } | |
168 | |
169 void CheckParentPublicId(const char* expected, int64_t id) | |
170 { | |
171 std::string s; | |
172 | |
173 switch (GetParam()) | |
174 { | |
175 case DatabaseWrapperClass_SQLite: | |
176 { | |
177 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); | |
178 ASSERT_TRUE(sqlite->GetParentPublicId(s, id)); | |
179 ASSERT_EQ(expected, s); | |
180 break; | |
181 } | |
182 | |
183 default: | |
184 throw OrthancException(ErrorCode_InternalError); | |
1286 | 185 } |
186 } | |
187 | |
1287 | 188 void CheckNoChild(int64_t id) |
189 { | |
190 std::list<std::string> j; | |
191 | |
192 switch (GetParam()) | |
193 { | |
194 case DatabaseWrapperClass_SQLite: | |
195 { | |
196 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); | |
197 sqlite->GetChildren(j, id); | |
1492 | 198 ASSERT_EQ(0u, j.size()); |
1287 | 199 break; |
200 } | |
201 | |
202 default: | |
203 throw OrthancException(ErrorCode_InternalError); | |
204 } | |
205 } | |
206 | |
207 void CheckOneChild(const char* expected, int64_t id) | |
208 { | |
209 std::list<std::string> j; | |
210 | |
211 switch (GetParam()) | |
212 { | |
213 case DatabaseWrapperClass_SQLite: | |
214 { | |
215 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); | |
216 sqlite->GetChildren(j, id); | |
1492 | 217 ASSERT_EQ(1u, j.size()); |
1287 | 218 ASSERT_EQ(expected, j.front()); |
219 break; | |
220 } | |
221 | |
222 default: | |
223 throw OrthancException(ErrorCode_InternalError); | |
224 } | |
225 } | |
226 | |
227 void CheckTwoChildren(const char* expected1, | |
228 const char* expected2, | |
229 int64_t id) | |
230 { | |
231 std::list<std::string> j; | |
232 | |
233 switch (GetParam()) | |
234 { | |
235 case DatabaseWrapperClass_SQLite: | |
236 { | |
237 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); | |
238 sqlite->GetChildren(j, id); | |
1492 | 239 ASSERT_EQ(2u, j.size()); |
1287 | 240 ASSERT_TRUE((expected1 == j.front() && expected2 == j.back()) || |
241 (expected1 == j.back() && expected2 == j.front())); | |
242 break; | |
243 } | |
244 | |
245 default: | |
246 throw OrthancException(ErrorCode_InternalError); | |
247 } | |
248 } | |
1746 | 249 |
250 | |
251 void DoLookup(std::list<std::string>& result, | |
252 ResourceType level, | |
253 const DicomTag& tag, | |
254 const std::string& value) | |
255 { | |
256 LookupIdentifierQuery query(level); | |
257 query.AddConstraint(tag, IdentifierConstraintType_Equal, value); | |
258 query.Apply(result, *index_); | |
259 } | |
260 | |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
261 }; |
181 | 262 } |
263 | |
264 | |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
265 INSTANTIATE_TEST_CASE_P(DatabaseWrapperName, |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
266 DatabaseWrapperTest, |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
267 ::testing::Values(DatabaseWrapperClass_SQLite)); |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
268 |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
269 |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
270 TEST_P(DatabaseWrapperTest, Simple) |
181 | 271 { |
272 int64_t a[] = { | |
738 | 273 index_->CreateResource("a", ResourceType_Patient), // 0 |
274 index_->CreateResource("b", ResourceType_Study), // 1 | |
275 index_->CreateResource("c", ResourceType_Series), // 2 | |
276 index_->CreateResource("d", ResourceType_Instance), // 3 | |
277 index_->CreateResource("e", ResourceType_Instance), // 4 | |
278 index_->CreateResource("f", ResourceType_Instance), // 5 | |
279 index_->CreateResource("g", ResourceType_Study) // 6 | |
181 | 280 }; |
281 | |
738 | 282 ASSERT_EQ("a", index_->GetPublicId(a[0])); |
283 ASSERT_EQ("b", index_->GetPublicId(a[1])); | |
284 ASSERT_EQ("c", index_->GetPublicId(a[2])); | |
285 ASSERT_EQ("d", index_->GetPublicId(a[3])); | |
286 ASSERT_EQ("e", index_->GetPublicId(a[4])); | |
287 ASSERT_EQ("f", index_->GetPublicId(a[5])); | |
288 ASSERT_EQ("g", index_->GetPublicId(a[6])); | |
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
289 |
738 | 290 ASSERT_EQ(ResourceType_Patient, index_->GetResourceType(a[0])); |
291 ASSERT_EQ(ResourceType_Study, index_->GetResourceType(a[1])); | |
292 ASSERT_EQ(ResourceType_Series, index_->GetResourceType(a[2])); | |
293 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[3])); | |
294 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[4])); | |
295 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[5])); | |
296 ASSERT_EQ(ResourceType_Study, index_->GetResourceType(a[6])); | |
304 | 297 |
190 | 298 { |
1241 | 299 std::list<std::string> t; |
738 | 300 index_->GetAllPublicIds(t, ResourceType_Patient); |
190 | 301 |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
302 ASSERT_EQ(1u, t.size()); |
1241 | 303 ASSERT_EQ("a", t.front()); |
190 | 304 |
738 | 305 index_->GetAllPublicIds(t, ResourceType_Series); |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
306 ASSERT_EQ(1u, t.size()); |
1241 | 307 ASSERT_EQ("c", t.front()); |
190 | 308 |
738 | 309 index_->GetAllPublicIds(t, ResourceType_Study); |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
310 ASSERT_EQ(2u, t.size()); |
190 | 311 |
738 | 312 index_->GetAllPublicIds(t, ResourceType_Instance); |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
313 ASSERT_EQ(3u, t.size()); |
190 | 314 } |
315 | |
738 | 316 index_->SetGlobalProperty(GlobalProperty_FlushSleep, "World"); |
181 | 317 |
738 | 318 index_->AttachChild(a[0], a[1]); |
319 index_->AttachChild(a[1], a[2]); | |
320 index_->AttachChild(a[2], a[3]); | |
321 index_->AttachChild(a[2], a[4]); | |
322 index_->AttachChild(a[6], a[5]); | |
182 | 323 |
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
324 int64_t parent; |
738 | 325 ASSERT_FALSE(index_->LookupParent(parent, a[0])); |
326 ASSERT_TRUE(index_->LookupParent(parent, a[1])); ASSERT_EQ(a[0], parent); | |
327 ASSERT_TRUE(index_->LookupParent(parent, a[2])); ASSERT_EQ(a[1], parent); | |
328 ASSERT_TRUE(index_->LookupParent(parent, a[3])); ASSERT_EQ(a[2], parent); | |
329 ASSERT_TRUE(index_->LookupParent(parent, a[4])); ASSERT_EQ(a[2], parent); | |
330 ASSERT_TRUE(index_->LookupParent(parent, a[5])); ASSERT_EQ(a[6], parent); | |
331 ASSERT_FALSE(index_->LookupParent(parent, a[6])); | |
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
332 |
182 | 333 std::string s; |
1286 | 334 |
1287 | 335 CheckNoParent(a[0]); |
336 CheckNoParent(a[6]); | |
337 CheckParentPublicId("a", a[1]); | |
338 CheckParentPublicId("b", a[2]); | |
339 CheckParentPublicId("c", a[3]); | |
340 CheckParentPublicId("c", a[4]); | |
341 CheckParentPublicId("g", a[5]); | |
182 | 342 |
185 | 343 std::list<std::string> l; |
738 | 344 index_->GetChildrenPublicId(l, a[0]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("b", l.front()); |
345 index_->GetChildrenPublicId(l, a[1]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("c", l.front()); | |
346 index_->GetChildrenPublicId(l, a[3]); ASSERT_EQ(0u, l.size()); | |
347 index_->GetChildrenPublicId(l, a[4]); ASSERT_EQ(0u, l.size()); | |
348 index_->GetChildrenPublicId(l, a[5]); ASSERT_EQ(0u, l.size()); | |
349 index_->GetChildrenPublicId(l, a[6]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("f", l.front()); | |
182 | 350 |
738 | 351 index_->GetChildrenPublicId(l, a[2]); ASSERT_EQ(2u, l.size()); |
182 | 352 if (l.front() == "d") |
353 { | |
354 ASSERT_EQ("e", l.back()); | |
355 } | |
356 else | |
357 { | |
358 ASSERT_EQ("d", l.back()); | |
359 ASSERT_EQ("e", l.front()); | |
360 } | |
361 | |
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
362 std::list<MetadataType> md; |
738 | 363 index_->ListAvailableMetadata(md, a[4]); |
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
364 ASSERT_EQ(0u, md.size()); |
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
365 |
738 | 366 index_->AddAttachment(a[4], FileInfo("my json file", FileContentType_DicomAsJson, 42, "md5", |
1514
d73a2178b319
support of deflate and gzip content-types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1492
diff
changeset
|
367 CompressionType_ZlibWithSize, 21, "compressedMD5")); |
738 | 368 index_->AddAttachment(a[4], FileInfo("my dicom file", FileContentType_Dicom, 42, "md5")); |
369 index_->AddAttachment(a[6], FileInfo("world", FileContentType_Dicom, 44, "md5")); | |
370 index_->SetMetadata(a[4], MetadataType_Instance_RemoteAet, "PINNACLE"); | |
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
371 |
738 | 372 index_->ListAvailableMetadata(md, a[4]); |
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
373 ASSERT_EQ(1u, md.size()); |
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
374 ASSERT_EQ(MetadataType_Instance_RemoteAet, md.front()); |
738 | 375 index_->SetMetadata(a[4], MetadataType_ModifiedFrom, "TUTU"); |
376 index_->ListAvailableMetadata(md, a[4]); | |
438 | 377 ASSERT_EQ(2u, md.size()); |
1030 | 378 |
379 std::map<MetadataType, std::string> md2; | |
380 index_->GetAllMetadata(md2, a[4]); | |
381 ASSERT_EQ(2u, md2.size()); | |
382 ASSERT_EQ("TUTU", md2[MetadataType_ModifiedFrom]); | |
383 ASSERT_EQ("PINNACLE", md2[MetadataType_Instance_RemoteAet]); | |
384 | |
738 | 385 index_->DeleteMetadata(a[4], MetadataType_ModifiedFrom); |
386 index_->ListAvailableMetadata(md, a[4]); | |
438 | 387 ASSERT_EQ(1u, md.size()); |
388 ASSERT_EQ(MetadataType_Instance_RemoteAet, md.front()); | |
182 | 389 |
1030 | 390 index_->GetAllMetadata(md2, a[4]); |
391 ASSERT_EQ(1u, md2.size()); | |
392 ASSERT_EQ("PINNACLE", md2[MetadataType_Instance_RemoteAet]); | |
393 | |
394 | |
738 | 395 ASSERT_EQ(21u + 42u + 44u, index_->GetTotalCompressedSize()); |
396 ASSERT_EQ(42u + 42u + 44u, index_->GetTotalUncompressedSize()); | |
181 | 397 |
1286 | 398 index_->SetMainDicomTag(a[3], DicomTag(0x0010, 0x0010), "PatientName"); |
181 | 399 |
400 int64_t b; | |
401 ResourceType t; | |
1294 | 402 ASSERT_TRUE(index_->LookupResource(b, t, "g")); |
181 | 403 ASSERT_EQ(7, b); |
404 ASSERT_EQ(ResourceType_Study, t); | |
405 | |
738 | 406 ASSERT_TRUE(index_->LookupMetadata(s, a[4], MetadataType_Instance_RemoteAet)); |
407 ASSERT_FALSE(index_->LookupMetadata(s, a[4], MetadataType_Instance_IndexInSeries)); | |
181 | 408 ASSERT_EQ("PINNACLE", s); |
1238 | 409 |
410 std::string u; | |
411 ASSERT_TRUE(index_->LookupMetadata(u, a[4], MetadataType_Instance_RemoteAet)); | |
412 ASSERT_EQ("PINNACLE", u); | |
413 ASSERT_FALSE(index_->LookupMetadata(u, a[4], MetadataType_Instance_IndexInSeries)); | |
181 | 414 |
738 | 415 ASSERT_TRUE(index_->LookupGlobalProperty(s, GlobalProperty_FlushSleep)); |
416 ASSERT_FALSE(index_->LookupGlobalProperty(s, static_cast<GlobalProperty>(42))); | |
181 | 417 ASSERT_EQ("World", s); |
418 | |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
419 FileInfo att; |
738 | 420 ASSERT_TRUE(index_->LookupAttachment(att, a[4], FileContentType_DicomAsJson)); |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
421 ASSERT_EQ("my json file", att.GetUuid()); |
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
422 ASSERT_EQ(21u, att.GetCompressedSize()); |
693
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
423 ASSERT_EQ("md5", att.GetUncompressedMD5()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
424 ASSERT_EQ("compressedMD5", att.GetCompressedMD5()); |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
425 ASSERT_EQ(42u, att.GetUncompressedSize()); |
1514
d73a2178b319
support of deflate and gzip content-types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1492
diff
changeset
|
426 ASSERT_EQ(CompressionType_ZlibWithSize, att.GetCompressionType()); |
181 | 427 |
738 | 428 ASSERT_TRUE(index_->LookupAttachment(att, a[6], FileContentType_Dicom)); |
693
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
429 ASSERT_EQ("world", att.GetUuid()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
430 ASSERT_EQ(44u, att.GetCompressedSize()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
431 ASSERT_EQ("md5", att.GetUncompressedMD5()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
432 ASSERT_EQ("md5", att.GetCompressedMD5()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
433 ASSERT_EQ(44u, att.GetUncompressedSize()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
434 ASSERT_EQ(CompressionType_None, att.GetCompressionType()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
435 |
738 | 436 ASSERT_EQ(0u, listener_->deletedFiles_.size()); |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
437 ASSERT_EQ(0u, listener_->deletedResources_.size()); |
1286 | 438 |
439 CheckTableRecordCount(7, "Resources"); | |
440 CheckTableRecordCount(3, "AttachedFiles"); | |
441 CheckTableRecordCount(1, "Metadata"); | |
442 CheckTableRecordCount(1, "MainDicomTags"); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
443 |
738 | 444 index_->DeleteResource(a[0]); |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
445 ASSERT_EQ(5u, listener_->deletedResources_.size()); |
738 | 446 ASSERT_EQ(2u, listener_->deletedFiles_.size()); |
447 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(), | |
448 listener_->deletedFiles_.end(), | |
449 "my json file") == listener_->deletedFiles_.end()); | |
450 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(), | |
451 listener_->deletedFiles_.end(), | |
452 "my dicom file") == listener_->deletedFiles_.end()); | |
183 | 453 |
1286 | 454 CheckTableRecordCount(2, "Resources"); |
455 CheckTableRecordCount(0, "Metadata"); | |
456 CheckTableRecordCount(1, "AttachedFiles"); | |
457 CheckTableRecordCount(0, "MainDicomTags"); | |
458 | |
738 | 459 index_->DeleteResource(a[5]); |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
460 ASSERT_EQ(7u, listener_->deletedResources_.size()); |
1286 | 461 |
462 CheckTableRecordCount(0, "Resources"); | |
463 CheckTableRecordCount(0, "AttachedFiles"); | |
464 CheckTableRecordCount(2, "GlobalProperties"); | |
183 | 465 |
738 | 466 ASSERT_EQ(3u, listener_->deletedFiles_.size()); |
467 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(), | |
468 listener_->deletedFiles_.end(), | |
469 "world") == listener_->deletedFiles_.end()); | |
183 | 470 } |
471 | |
472 | |
473 | |
474 | |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
475 TEST_P(DatabaseWrapperTest, Upward) |
183 | 476 { |
477 int64_t a[] = { | |
738 | 478 index_->CreateResource("a", ResourceType_Patient), // 0 |
479 index_->CreateResource("b", ResourceType_Study), // 1 | |
480 index_->CreateResource("c", ResourceType_Series), // 2 | |
481 index_->CreateResource("d", ResourceType_Instance), // 3 | |
482 index_->CreateResource("e", ResourceType_Instance), // 4 | |
483 index_->CreateResource("f", ResourceType_Study), // 5 | |
484 index_->CreateResource("g", ResourceType_Series), // 6 | |
485 index_->CreateResource("h", ResourceType_Series) // 7 | |
183 | 486 }; |
487 | |
738 | 488 index_->AttachChild(a[0], a[1]); |
489 index_->AttachChild(a[1], a[2]); | |
490 index_->AttachChild(a[2], a[3]); | |
491 index_->AttachChild(a[2], a[4]); | |
492 index_->AttachChild(a[1], a[6]); | |
493 index_->AttachChild(a[0], a[5]); | |
494 index_->AttachChild(a[5], a[7]); | |
183 | 495 |
1287 | 496 CheckTwoChildren("b", "f", a[0]); |
497 CheckTwoChildren("c", "g", a[1]); | |
498 CheckTwoChildren("d", "e", a[2]); | |
499 CheckNoChild(a[3]); | |
500 CheckNoChild(a[4]); | |
501 CheckOneChild("h", a[5]); | |
502 CheckNoChild(a[6]); | |
503 CheckNoChild(a[7]); | |
193
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
190
diff
changeset
|
504 |
738 | 505 listener_->Reset(); |
506 index_->DeleteResource(a[3]); | |
507 ASSERT_EQ("c", listener_->ancestorId_); | |
508 ASSERT_EQ(ResourceType_Series, listener_->ancestorType_); | |
183 | 509 |
738 | 510 listener_->Reset(); |
511 index_->DeleteResource(a[4]); | |
512 ASSERT_EQ("b", listener_->ancestorId_); | |
513 ASSERT_EQ(ResourceType_Study, listener_->ancestorType_); | |
183 | 514 |
738 | 515 listener_->Reset(); |
516 index_->DeleteResource(a[7]); | |
517 ASSERT_EQ("a", listener_->ancestorId_); | |
518 ASSERT_EQ(ResourceType_Patient, listener_->ancestorType_); | |
183 | 519 |
738 | 520 listener_->Reset(); |
521 index_->DeleteResource(a[6]); | |
522 ASSERT_EQ("", listener_->ancestorId_); // No more ancestor | |
181 | 523 } |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
524 |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
525 |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
526 TEST_P(DatabaseWrapperTest, PatientRecycling) |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
527 { |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
528 std::vector<int64_t> patients; |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
529 for (int i = 0; i < 10; i++) |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
530 { |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
531 std::string p = "Patient " + boost::lexical_cast<std::string>(i); |
738 | 532 patients.push_back(index_->CreateResource(p, ResourceType_Patient)); |
533 index_->AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10, | |
1287 | 534 "md5-" + boost::lexical_cast<std::string>(i))); |
738 | 535 ASSERT_FALSE(index_->IsProtectedPatient(patients[i])); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
536 } |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
537 |
1286 | 538 CheckTableRecordCount(10u, "Resources"); |
539 CheckTableRecordCount(10u, "PatientRecyclingOrder"); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
540 |
738 | 541 listener_->Reset(); |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
542 ASSERT_EQ(0u, listener_->deletedResources_.size()); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
543 |
738 | 544 index_->DeleteResource(patients[5]); |
545 index_->DeleteResource(patients[0]); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
546 ASSERT_EQ(2u, listener_->deletedResources_.size()); |
1286 | 547 |
548 CheckTableRecordCount(8u, "Resources"); | |
549 CheckTableRecordCount(8u, "PatientRecyclingOrder"); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
550 |
738 | 551 ASSERT_EQ(2u, listener_->deletedFiles_.size()); |
552 ASSERT_EQ("Patient 5", listener_->deletedFiles_[0]); | |
553 ASSERT_EQ("Patient 0", listener_->deletedFiles_[1]); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
554 |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
555 int64_t p; |
738 | 556 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[1]); |
557 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
558 ASSERT_EQ(3u, listener_->deletedResources_.size()); |
738 | 559 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[2]); |
560 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
561 ASSERT_EQ(4u, listener_->deletedResources_.size()); |
738 | 562 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[3]); |
563 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
564 ASSERT_EQ(5u, listener_->deletedResources_.size()); |
738 | 565 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[4]); |
566 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
567 ASSERT_EQ(6u, listener_->deletedResources_.size()); |
738 | 568 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[6]); |
569 index_->DeleteResource(p); | |
570 index_->DeleteResource(patients[8]); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
571 ASSERT_EQ(8u, listener_->deletedResources_.size()); |
738 | 572 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[7]); |
573 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
574 ASSERT_EQ(9u, listener_->deletedResources_.size()); |
738 | 575 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[9]); |
576 index_->DeleteResource(p); | |
577 ASSERT_FALSE(index_->SelectPatientToRecycle(p)); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
578 ASSERT_EQ(10u, listener_->deletedResources_.size()); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
579 |
738 | 580 ASSERT_EQ(10u, listener_->deletedFiles_.size()); |
1286 | 581 |
582 CheckTableRecordCount(0, "Resources"); | |
583 CheckTableRecordCount(0, "PatientRecyclingOrder"); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
584 } |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
585 |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
586 |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
587 TEST_P(DatabaseWrapperTest, PatientProtection) |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
588 { |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
589 std::vector<int64_t> patients; |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
590 for (int i = 0; i < 5; i++) |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
591 { |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
592 std::string p = "Patient " + boost::lexical_cast<std::string>(i); |
738 | 593 patients.push_back(index_->CreateResource(p, ResourceType_Patient)); |
594 index_->AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10, | |
1287 | 595 "md5-" + boost::lexical_cast<std::string>(i))); |
738 | 596 ASSERT_FALSE(index_->IsProtectedPatient(patients[i])); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
597 } |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
598 |
1286 | 599 CheckTableRecordCount(5, "Resources"); |
600 CheckTableRecordCount(5, "PatientRecyclingOrder"); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
601 |
738 | 602 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); |
603 index_->SetProtectedPatient(patients[2], true); | |
604 ASSERT_TRUE(index_->IsProtectedPatient(patients[2])); | |
1286 | 605 CheckTableRecordCount(5, "Resources"); |
606 CheckTableRecordCount(4, "PatientRecyclingOrder"); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
607 |
738 | 608 index_->SetProtectedPatient(patients[2], true); |
609 ASSERT_TRUE(index_->IsProtectedPatient(patients[2])); | |
1286 | 610 CheckTableRecordCount(4, "PatientRecyclingOrder"); |
738 | 611 index_->SetProtectedPatient(patients[2], false); |
612 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); | |
1286 | 613 CheckTableRecordCount(5, "PatientRecyclingOrder"); |
738 | 614 index_->SetProtectedPatient(patients[2], false); |
615 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); | |
1286 | 616 CheckTableRecordCount(5, "PatientRecyclingOrder"); |
617 CheckTableRecordCount(5, "Resources"); | |
738 | 618 index_->SetProtectedPatient(patients[2], true); |
619 ASSERT_TRUE(index_->IsProtectedPatient(patients[2])); | |
1286 | 620 CheckTableRecordCount(4, "PatientRecyclingOrder"); |
738 | 621 index_->SetProtectedPatient(patients[2], false); |
622 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); | |
1286 | 623 CheckTableRecordCount(5, "PatientRecyclingOrder"); |
738 | 624 index_->SetProtectedPatient(patients[3], true); |
625 ASSERT_TRUE(index_->IsProtectedPatient(patients[3])); | |
1286 | 626 CheckTableRecordCount(4, "PatientRecyclingOrder"); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
627 |
1286 | 628 CheckTableRecordCount(5, "Resources"); |
738 | 629 ASSERT_EQ(0u, listener_->deletedFiles_.size()); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
630 |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
631 // Unprotecting a patient puts it at the last position in the recycling queue |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
632 int64_t p; |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
633 ASSERT_EQ(0u, listener_->deletedResources_.size()); |
738 | 634 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[0]); |
635 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
636 ASSERT_EQ(1u, listener_->deletedResources_.size()); |
738 | 637 ASSERT_TRUE(index_->SelectPatientToRecycle(p, patients[1])); ASSERT_EQ(p, patients[4]); |
638 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[1]); | |
639 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
640 ASSERT_EQ(2u, listener_->deletedResources_.size()); |
738 | 641 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[4]); |
642 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
643 ASSERT_EQ(3u, listener_->deletedResources_.size()); |
738 | 644 ASSERT_FALSE(index_->SelectPatientToRecycle(p, patients[2])); |
645 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[2]); | |
646 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
647 ASSERT_EQ(4u, listener_->deletedResources_.size()); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
648 // "patients[3]" is still protected |
738 | 649 ASSERT_FALSE(index_->SelectPatientToRecycle(p)); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
650 |
738 | 651 ASSERT_EQ(4u, listener_->deletedFiles_.size()); |
1286 | 652 CheckTableRecordCount(1, "Resources"); |
653 CheckTableRecordCount(0, "PatientRecyclingOrder"); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
654 |
738 | 655 index_->SetProtectedPatient(patients[3], false); |
1286 | 656 CheckTableRecordCount(1, "PatientRecyclingOrder"); |
738 | 657 ASSERT_FALSE(index_->SelectPatientToRecycle(p, patients[3])); |
658 ASSERT_TRUE(index_->SelectPatientToRecycle(p, patients[2])); | |
659 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[3]); | |
660 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
661 ASSERT_EQ(5u, listener_->deletedResources_.size()); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
662 |
738 | 663 ASSERT_EQ(5u, listener_->deletedFiles_.size()); |
1286 | 664 CheckTableRecordCount(0, "Resources"); |
665 CheckTableRecordCount(0, "PatientRecyclingOrder"); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
666 } |
310 | 667 |
668 | |
669 | |
1237 | 670 TEST(ServerIndex, Sequence) |
310 | 671 { |
1237 | 672 const std::string path = "UnitTestsStorage"; |
673 | |
2140 | 674 SystemToolbox::RemoveFile(path + "/index"); |
1237 | 675 FilesystemStorage storage(path); |
1247 | 676 DatabaseWrapper db; // The SQLite DB is in memory |
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
677 db.Open(); |
1549
e5e975e9b738
refactoring and simplification of StorageAccessor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1514
diff
changeset
|
678 ServerContext context(db, storage); |
1237 | 679 ServerIndex& index = context.GetIndex(); |
680 | |
681 ASSERT_EQ(1u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
682 ASSERT_EQ(2u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
683 ASSERT_EQ(3u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
684 ASSERT_EQ(4u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
1453
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1432
diff
changeset
|
685 |
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1432
diff
changeset
|
686 context.Stop(); |
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
687 db.Close(); |
310 | 688 } |
521 | 689 |
690 | |
691 | |
1162 | 692 TEST_P(DatabaseWrapperTest, LookupIdentifier) |
521 | 693 { |
694 int64_t a[] = { | |
738 | 695 index_->CreateResource("a", ResourceType_Study), // 0 |
696 index_->CreateResource("b", ResourceType_Study), // 1 | |
697 index_->CreateResource("c", ResourceType_Study), // 2 | |
698 index_->CreateResource("d", ResourceType_Series) // 3 | |
521 | 699 }; |
700 | |
1713 | 701 index_->SetIdentifierTag(a[0], DICOM_TAG_STUDY_INSTANCE_UID, "0"); |
702 index_->SetIdentifierTag(a[1], DICOM_TAG_STUDY_INSTANCE_UID, "1"); | |
703 index_->SetIdentifierTag(a[2], DICOM_TAG_STUDY_INSTANCE_UID, "0"); | |
704 index_->SetIdentifierTag(a[3], DICOM_TAG_SERIES_INSTANCE_UID, "0"); | |
521 | 705 |
1746 | 706 std::list<std::string> s; |
521 | 707 |
1746 | 708 DoLookup(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, "0"); |
521 | 709 ASSERT_EQ(2u, s.size()); |
1746 | 710 ASSERT_TRUE(std::find(s.begin(), s.end(), "a") != s.end()); |
711 ASSERT_TRUE(std::find(s.begin(), s.end(), "c") != s.end()); | |
521 | 712 |
1746 | 713 DoLookup(s, ResourceType_Series, DICOM_TAG_SERIES_INSTANCE_UID, "0"); |
1718
2b812969e136
getting rid of an IDatabaseWrapper::LookupIdentifier flavor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
714 ASSERT_EQ(1u, s.size()); |
1746 | 715 ASSERT_TRUE(std::find(s.begin(), s.end(), "d") != s.end()); |
521 | 716 |
1746 | 717 DoLookup(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, "1"); |
521 | 718 ASSERT_EQ(1u, s.size()); |
1746 | 719 ASSERT_TRUE(std::find(s.begin(), s.end(), "b") != s.end()); |
521 | 720 |
1746 | 721 DoLookup(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, "1"); |
521 | 722 ASSERT_EQ(1u, s.size()); |
1746 | 723 ASSERT_TRUE(std::find(s.begin(), s.end(), "b") != s.end()); |
521 | 724 |
1746 | 725 DoLookup(s, ResourceType_Series, DICOM_TAG_SERIES_INSTANCE_UID, "1"); |
1718
2b812969e136
getting rid of an IDatabaseWrapper::LookupIdentifier flavor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
726 ASSERT_EQ(0u, s.size()); |
521 | 727 |
1746 | 728 { |
729 LookupIdentifierQuery query(ResourceType_Study); | |
730 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_GreaterOrEqual, "0"); | |
731 query.Apply(s, *index_); | |
732 ASSERT_EQ(3u, s.size()); | |
733 } | |
734 | |
735 { | |
736 LookupIdentifierQuery query(ResourceType_Study); | |
737 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_GreaterOrEqual, "0"); | |
738 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_SmallerOrEqual, "0"); | |
739 query.Apply(s, *index_); | |
740 ASSERT_EQ(2u, s.size()); | |
741 } | |
742 | |
743 { | |
744 LookupIdentifierQuery query(ResourceType_Study); | |
745 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_GreaterOrEqual, "1"); | |
746 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_SmallerOrEqual, "1"); | |
747 query.Apply(s, *index_); | |
748 ASSERT_EQ(1u, s.size()); | |
749 } | |
750 | |
751 { | |
752 LookupIdentifierQuery query(ResourceType_Study); | |
753 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_GreaterOrEqual, "1"); | |
754 query.Apply(s, *index_); | |
755 ASSERT_EQ(1u, s.size()); | |
756 } | |
757 | |
758 { | |
759 LookupIdentifierQuery query(ResourceType_Study); | |
760 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_GreaterOrEqual, "2"); | |
761 query.Apply(s, *index_); | |
762 ASSERT_EQ(0u, s.size()); | |
763 } | |
562
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
764 } |
705 | 765 |
766 | |
767 | |
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
768 TEST(ServerIndex, AttachmentRecycling) |
705 | 769 { |
803
4689e400e0fa
directory to store the results of the unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
738
diff
changeset
|
770 const std::string path = "UnitTestsStorage"; |
1124
790ff7a5b3bf
IStorageArea abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1030
diff
changeset
|
771 |
2140 | 772 SystemToolbox::RemoveFile(path + "/index"); |
1124
790ff7a5b3bf
IStorageArea abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1030
diff
changeset
|
773 FilesystemStorage storage(path); |
1247 | 774 DatabaseWrapper db; // The SQLite DB is in memory |
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
775 db.Open(); |
1549
e5e975e9b738
refactoring and simplification of StorageAccessor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1514
diff
changeset
|
776 ServerContext context(db, storage); |
705 | 777 ServerIndex& index = context.GetIndex(); |
707
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
706
diff
changeset
|
778 |
706 | 779 index.SetMaximumStorageSize(10); |
780 | |
705 | 781 Json::Value tmp; |
782 index.ComputeStatistics(tmp); | |
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
783 ASSERT_EQ(0, tmp["CountPatients"].asInt()); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
784 ASSERT_EQ(0, boost::lexical_cast<int>(tmp["TotalDiskSize"].asString())); |
705 | 785 |
786 ServerIndex::Attachments attachments; | |
787 | |
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
788 std::vector<std::string> ids; |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
789 for (int i = 0; i < 10; i++) |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
790 { |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
791 std::string id = boost::lexical_cast<std::string>(i); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
792 DicomMap instance; |
2007
655489d9165d
DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1971
diff
changeset
|
793 instance.SetValue(DICOM_TAG_PATIENT_ID, "patient-" + id, false); |
655489d9165d
DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1971
diff
changeset
|
794 instance.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "study-" + id, false); |
655489d9165d
DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1971
diff
changeset
|
795 instance.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, "series-" + id, false); |
655489d9165d
DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1971
diff
changeset
|
796 instance.SetValue(DICOM_TAG_SOP_INSTANCE_UID, "instance-" + id, false); |
2208
90ea60bee5ff
New metadata automatically computed at the instance level: "SopClassUid"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2190
diff
changeset
|
797 instance.SetValue(DICOM_TAG_SOP_CLASS_UID, "1.2.840.10008.5.1.4.1.1.1", false); // CR image |
1006
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
798 |
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
799 std::map<MetadataType, std::string> instanceMetadata; |
1822 | 800 DicomInstanceToStore toStore; |
801 toStore.SetSummary(instance); | |
802 ASSERT_EQ(StoreStatus_Success, index.Store(instanceMetadata, toStore, attachments)); | |
2208
90ea60bee5ff
New metadata automatically computed at the instance level: "SopClassUid"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2190
diff
changeset
|
803 ASSERT_EQ(5u, instanceMetadata.size()); |
1029 | 804 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_RemoteAet) != instanceMetadata.end()); |
805 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_ReceptionDate) != instanceMetadata.end()); | |
2190 | 806 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_TransferSyntax) != instanceMetadata.end()); |
2208
90ea60bee5ff
New metadata automatically computed at the instance level: "SopClassUid"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2190
diff
changeset
|
807 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_SopClassUid) != instanceMetadata.end()); |
2190 | 808 |
809 // By default, an Explicit VR Little Endian is used by Orthanc | |
810 ASSERT_EQ("1.2.840.10008.1.2.1", instanceMetadata[MetadataType_Instance_TransferSyntax]); | |
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
811 |
2208
90ea60bee5ff
New metadata automatically computed at the instance level: "SopClassUid"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2190
diff
changeset
|
812 ASSERT_EQ("1.2.840.10008.5.1.4.1.1.1", instanceMetadata[MetadataType_Instance_SopClassUid]); |
90ea60bee5ff
New metadata automatically computed at the instance level: "SopClassUid"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2190
diff
changeset
|
813 |
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
814 DicomInstanceHasher hasher(instance); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
815 ids.push_back(hasher.HashPatient()); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
816 ids.push_back(hasher.HashStudy()); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
817 ids.push_back(hasher.HashSeries()); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
818 ids.push_back(hasher.HashInstance()); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
819 } |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
820 |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
821 index.ComputeStatistics(tmp); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
822 ASSERT_EQ(10, tmp["CountPatients"].asInt()); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
823 ASSERT_EQ(0, boost::lexical_cast<int>(tmp["TotalDiskSize"].asString())); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
824 |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
825 for (size_t i = 0; i < ids.size(); i++) |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
826 { |
2172
84d1d392a9ab
GenerateUuid() not available in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2142
diff
changeset
|
827 FileInfo info(SystemToolbox::GenerateUuid(), FileContentType_Dicom, 1, "md5"); |
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
828 index.AddAttachment(info, ids[i]); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
829 |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
830 index.ComputeStatistics(tmp); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
831 ASSERT_GE(10, boost::lexical_cast<int>(tmp["TotalDiskSize"].asString())); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
832 } |
707
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
706
diff
changeset
|
833 |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
706
diff
changeset
|
834 // Because the DB is in memory, the SQLite index must not have been created |
2140 | 835 ASSERT_FALSE(SystemToolbox::IsRegularFile(path + "/index")); |
1453
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1432
diff
changeset
|
836 |
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1432
diff
changeset
|
837 context.Stop(); |
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
838 db.Close(); |
705 | 839 } |
1764 | 840 |
841 | |
842 TEST(LookupIdentifierQuery, NormalizeIdentifier) | |
843 { | |
2121 | 844 ASSERT_EQ("H^L.LO", ServerToolbox::NormalizeIdentifier(" Hé^l.LO %_ ")); |
845 ASSERT_EQ("1.2.840.113619.2.176.2025", ServerToolbox::NormalizeIdentifier(" 1.2.840.113619.2.176.2025 ")); | |
1764 | 846 } |