Mercurial > hg > orthanc
annotate UnitTestsSources/ServerIndexTests.cpp @ 1630:ffd23c0104af
"/system" URI gives information about the plugins used for storage area and DB back-end
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 21 Sep 2015 13:26:45 +0200 |
parents | e5e975e9b738 |
children | 4c5a85c3ff43 |
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 |
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1287
diff
changeset
|
3 * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics |
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1287
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
827
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
5 * |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
6 * 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
|
7 * 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
|
8 * 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
|
9 * License, or (at your option) any later version. |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
10 * |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
11 * 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
|
12 * 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
|
13 * 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
|
14 * 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
|
15 * 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
|
16 * 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
|
17 * 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
|
18 * 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
|
19 * 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
|
20 * 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
|
21 * in the program, then also delete it here. |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
22 * |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
23 * 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
|
24 * 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
|
25 * 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
|
26 * General Public License for more details. |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
27 * |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
28 * 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
|
29 * 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
|
30 **/ |
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 |
831
84513f2ee1f3
pch for unit tests and server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
827
diff
changeset
|
33 #include "PrecompiledHeadersUnitTests.h" |
181 | 34 #include "gtest/gtest.h" |
35 | |
1486
f967bdf8534e
refactoring to Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1453
diff
changeset
|
36 #include "../Core/DicomFormat/DicomNullValue.h" |
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" |
f967bdf8534e
refactoring to Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1453
diff
changeset
|
39 #include "../Core/Uuid.h" |
183 | 40 #include "../OrthancServer/DatabaseWrapper.h" |
705 | 41 #include "../OrthancServer/ServerContext.h" |
42 #include "../OrthancServer/ServerIndex.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_); |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
125 } |
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 virtual void TearDown() |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
128 { |
738 | 129 index_.reset(NULL); |
130 listener_.reset(NULL); | |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
131 } |
1286 | 132 |
133 void CheckTableRecordCount(uint32_t expected, const char* table) | |
134 { | |
1287 | 135 switch (GetParam()) |
136 { | |
137 case DatabaseWrapperClass_SQLite: | |
138 { | |
139 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); | |
140 ASSERT_EQ(expected, sqlite->GetTableRecordCount(table)); | |
141 break; | |
142 } | |
143 | |
144 default: | |
145 throw OrthancException(ErrorCode_InternalError); | |
146 } | |
147 } | |
148 | |
149 void CheckNoParent(int64_t id) | |
150 { | |
151 std::string s; | |
152 | |
153 switch (GetParam()) | |
1286 | 154 { |
1287 | 155 case DatabaseWrapperClass_SQLite: |
156 { | |
157 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); | |
158 ASSERT_FALSE(sqlite->GetParentPublicId(s, id)); | |
159 break; | |
160 } | |
161 | |
162 default: | |
163 throw OrthancException(ErrorCode_InternalError); | |
164 } | |
165 } | |
166 | |
167 void CheckParentPublicId(const char* expected, int64_t id) | |
168 { | |
169 std::string s; | |
170 | |
171 switch (GetParam()) | |
172 { | |
173 case DatabaseWrapperClass_SQLite: | |
174 { | |
175 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); | |
176 ASSERT_TRUE(sqlite->GetParentPublicId(s, id)); | |
177 ASSERT_EQ(expected, s); | |
178 break; | |
179 } | |
180 | |
181 default: | |
182 throw OrthancException(ErrorCode_InternalError); | |
1286 | 183 } |
184 } | |
185 | |
1287 | 186 void CheckNoChild(int64_t id) |
187 { | |
188 std::list<std::string> j; | |
189 | |
190 switch (GetParam()) | |
191 { | |
192 case DatabaseWrapperClass_SQLite: | |
193 { | |
194 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); | |
195 sqlite->GetChildren(j, id); | |
1492 | 196 ASSERT_EQ(0u, j.size()); |
1287 | 197 break; |
198 } | |
199 | |
200 default: | |
201 throw OrthancException(ErrorCode_InternalError); | |
202 } | |
203 } | |
204 | |
205 void CheckOneChild(const char* expected, int64_t id) | |
206 { | |
207 std::list<std::string> j; | |
208 | |
209 switch (GetParam()) | |
210 { | |
211 case DatabaseWrapperClass_SQLite: | |
212 { | |
213 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); | |
214 sqlite->GetChildren(j, id); | |
1492 | 215 ASSERT_EQ(1u, j.size()); |
1287 | 216 ASSERT_EQ(expected, j.front()); |
217 break; | |
218 } | |
219 | |
220 default: | |
221 throw OrthancException(ErrorCode_InternalError); | |
222 } | |
223 } | |
224 | |
225 void CheckTwoChildren(const char* expected1, | |
226 const char* expected2, | |
227 int64_t id) | |
228 { | |
229 std::list<std::string> j; | |
230 | |
231 switch (GetParam()) | |
232 { | |
233 case DatabaseWrapperClass_SQLite: | |
234 { | |
235 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); | |
236 sqlite->GetChildren(j, id); | |
1492 | 237 ASSERT_EQ(2u, j.size()); |
1287 | 238 ASSERT_TRUE((expected1 == j.front() && expected2 == j.back()) || |
239 (expected1 == j.back() && expected2 == j.front())); | |
240 break; | |
241 } | |
242 | |
243 default: | |
244 throw OrthancException(ErrorCode_InternalError); | |
245 } | |
246 } | |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
247 }; |
181 | 248 } |
249 | |
250 | |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
251 INSTANTIATE_TEST_CASE_P(DatabaseWrapperName, |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
252 DatabaseWrapperTest, |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
253 ::testing::Values(DatabaseWrapperClass_SQLite)); |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
254 |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
255 |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
256 TEST_P(DatabaseWrapperTest, Simple) |
181 | 257 { |
258 int64_t a[] = { | |
738 | 259 index_->CreateResource("a", ResourceType_Patient), // 0 |
260 index_->CreateResource("b", ResourceType_Study), // 1 | |
261 index_->CreateResource("c", ResourceType_Series), // 2 | |
262 index_->CreateResource("d", ResourceType_Instance), // 3 | |
263 index_->CreateResource("e", ResourceType_Instance), // 4 | |
264 index_->CreateResource("f", ResourceType_Instance), // 5 | |
265 index_->CreateResource("g", ResourceType_Study) // 6 | |
181 | 266 }; |
267 | |
738 | 268 ASSERT_EQ("a", index_->GetPublicId(a[0])); |
269 ASSERT_EQ("b", index_->GetPublicId(a[1])); | |
270 ASSERT_EQ("c", index_->GetPublicId(a[2])); | |
271 ASSERT_EQ("d", index_->GetPublicId(a[3])); | |
272 ASSERT_EQ("e", index_->GetPublicId(a[4])); | |
273 ASSERT_EQ("f", index_->GetPublicId(a[5])); | |
274 ASSERT_EQ("g", index_->GetPublicId(a[6])); | |
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
275 |
738 | 276 ASSERT_EQ(ResourceType_Patient, index_->GetResourceType(a[0])); |
277 ASSERT_EQ(ResourceType_Study, index_->GetResourceType(a[1])); | |
278 ASSERT_EQ(ResourceType_Series, index_->GetResourceType(a[2])); | |
279 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[3])); | |
280 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[4])); | |
281 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[5])); | |
282 ASSERT_EQ(ResourceType_Study, index_->GetResourceType(a[6])); | |
304 | 283 |
190 | 284 { |
1241 | 285 std::list<std::string> t; |
738 | 286 index_->GetAllPublicIds(t, ResourceType_Patient); |
190 | 287 |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
288 ASSERT_EQ(1u, t.size()); |
1241 | 289 ASSERT_EQ("a", t.front()); |
190 | 290 |
738 | 291 index_->GetAllPublicIds(t, ResourceType_Series); |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
292 ASSERT_EQ(1u, t.size()); |
1241 | 293 ASSERT_EQ("c", t.front()); |
190 | 294 |
738 | 295 index_->GetAllPublicIds(t, ResourceType_Study); |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
296 ASSERT_EQ(2u, t.size()); |
190 | 297 |
738 | 298 index_->GetAllPublicIds(t, ResourceType_Instance); |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
299 ASSERT_EQ(3u, t.size()); |
190 | 300 } |
301 | |
738 | 302 index_->SetGlobalProperty(GlobalProperty_FlushSleep, "World"); |
181 | 303 |
738 | 304 index_->AttachChild(a[0], a[1]); |
305 index_->AttachChild(a[1], a[2]); | |
306 index_->AttachChild(a[2], a[3]); | |
307 index_->AttachChild(a[2], a[4]); | |
308 index_->AttachChild(a[6], a[5]); | |
182 | 309 |
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
310 int64_t parent; |
738 | 311 ASSERT_FALSE(index_->LookupParent(parent, a[0])); |
312 ASSERT_TRUE(index_->LookupParent(parent, a[1])); ASSERT_EQ(a[0], parent); | |
313 ASSERT_TRUE(index_->LookupParent(parent, a[2])); ASSERT_EQ(a[1], parent); | |
314 ASSERT_TRUE(index_->LookupParent(parent, a[3])); ASSERT_EQ(a[2], parent); | |
315 ASSERT_TRUE(index_->LookupParent(parent, a[4])); ASSERT_EQ(a[2], parent); | |
316 ASSERT_TRUE(index_->LookupParent(parent, a[5])); ASSERT_EQ(a[6], parent); | |
317 ASSERT_FALSE(index_->LookupParent(parent, a[6])); | |
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
318 |
182 | 319 std::string s; |
1286 | 320 |
1287 | 321 CheckNoParent(a[0]); |
322 CheckNoParent(a[6]); | |
323 CheckParentPublicId("a", a[1]); | |
324 CheckParentPublicId("b", a[2]); | |
325 CheckParentPublicId("c", a[3]); | |
326 CheckParentPublicId("c", a[4]); | |
327 CheckParentPublicId("g", a[5]); | |
182 | 328 |
185 | 329 std::list<std::string> l; |
738 | 330 index_->GetChildrenPublicId(l, a[0]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("b", l.front()); |
331 index_->GetChildrenPublicId(l, a[1]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("c", l.front()); | |
332 index_->GetChildrenPublicId(l, a[3]); ASSERT_EQ(0u, l.size()); | |
333 index_->GetChildrenPublicId(l, a[4]); ASSERT_EQ(0u, l.size()); | |
334 index_->GetChildrenPublicId(l, a[5]); ASSERT_EQ(0u, l.size()); | |
335 index_->GetChildrenPublicId(l, a[6]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("f", l.front()); | |
182 | 336 |
738 | 337 index_->GetChildrenPublicId(l, a[2]); ASSERT_EQ(2u, l.size()); |
182 | 338 if (l.front() == "d") |
339 { | |
340 ASSERT_EQ("e", l.back()); | |
341 } | |
342 else | |
343 { | |
344 ASSERT_EQ("d", l.back()); | |
345 ASSERT_EQ("e", l.front()); | |
346 } | |
347 | |
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
348 std::list<MetadataType> md; |
738 | 349 index_->ListAvailableMetadata(md, a[4]); |
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
350 ASSERT_EQ(0u, md.size()); |
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
351 |
738 | 352 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
|
353 CompressionType_ZlibWithSize, 21, "compressedMD5")); |
738 | 354 index_->AddAttachment(a[4], FileInfo("my dicom file", FileContentType_Dicom, 42, "md5")); |
355 index_->AddAttachment(a[6], FileInfo("world", FileContentType_Dicom, 44, "md5")); | |
356 index_->SetMetadata(a[4], MetadataType_Instance_RemoteAet, "PINNACLE"); | |
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
357 |
738 | 358 index_->ListAvailableMetadata(md, a[4]); |
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
359 ASSERT_EQ(1u, md.size()); |
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
360 ASSERT_EQ(MetadataType_Instance_RemoteAet, md.front()); |
738 | 361 index_->SetMetadata(a[4], MetadataType_ModifiedFrom, "TUTU"); |
362 index_->ListAvailableMetadata(md, a[4]); | |
438 | 363 ASSERT_EQ(2u, md.size()); |
1030 | 364 |
365 std::map<MetadataType, std::string> md2; | |
366 index_->GetAllMetadata(md2, a[4]); | |
367 ASSERT_EQ(2u, md2.size()); | |
368 ASSERT_EQ("TUTU", md2[MetadataType_ModifiedFrom]); | |
369 ASSERT_EQ("PINNACLE", md2[MetadataType_Instance_RemoteAet]); | |
370 | |
738 | 371 index_->DeleteMetadata(a[4], MetadataType_ModifiedFrom); |
372 index_->ListAvailableMetadata(md, a[4]); | |
438 | 373 ASSERT_EQ(1u, md.size()); |
374 ASSERT_EQ(MetadataType_Instance_RemoteAet, md.front()); | |
182 | 375 |
1030 | 376 index_->GetAllMetadata(md2, a[4]); |
377 ASSERT_EQ(1u, md2.size()); | |
378 ASSERT_EQ("PINNACLE", md2[MetadataType_Instance_RemoteAet]); | |
379 | |
380 | |
738 | 381 ASSERT_EQ(21u + 42u + 44u, index_->GetTotalCompressedSize()); |
382 ASSERT_EQ(42u + 42u + 44u, index_->GetTotalUncompressedSize()); | |
181 | 383 |
1286 | 384 index_->SetMainDicomTag(a[3], DicomTag(0x0010, 0x0010), "PatientName"); |
181 | 385 |
386 int64_t b; | |
387 ResourceType t; | |
1294 | 388 ASSERT_TRUE(index_->LookupResource(b, t, "g")); |
181 | 389 ASSERT_EQ(7, b); |
390 ASSERT_EQ(ResourceType_Study, t); | |
391 | |
738 | 392 ASSERT_TRUE(index_->LookupMetadata(s, a[4], MetadataType_Instance_RemoteAet)); |
393 ASSERT_FALSE(index_->LookupMetadata(s, a[4], MetadataType_Instance_IndexInSeries)); | |
181 | 394 ASSERT_EQ("PINNACLE", s); |
1238 | 395 |
396 std::string u; | |
397 ASSERT_TRUE(index_->LookupMetadata(u, a[4], MetadataType_Instance_RemoteAet)); | |
398 ASSERT_EQ("PINNACLE", u); | |
399 ASSERT_FALSE(index_->LookupMetadata(u, a[4], MetadataType_Instance_IndexInSeries)); | |
181 | 400 |
738 | 401 ASSERT_TRUE(index_->LookupGlobalProperty(s, GlobalProperty_FlushSleep)); |
402 ASSERT_FALSE(index_->LookupGlobalProperty(s, static_cast<GlobalProperty>(42))); | |
181 | 403 ASSERT_EQ("World", s); |
404 | |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
405 FileInfo att; |
738 | 406 ASSERT_TRUE(index_->LookupAttachment(att, a[4], FileContentType_DicomAsJson)); |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
407 ASSERT_EQ("my json file", att.GetUuid()); |
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
408 ASSERT_EQ(21u, att.GetCompressedSize()); |
693
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
409 ASSERT_EQ("md5", att.GetUncompressedMD5()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
410 ASSERT_EQ("compressedMD5", att.GetCompressedMD5()); |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
411 ASSERT_EQ(42u, att.GetUncompressedSize()); |
1514
d73a2178b319
support of deflate and gzip content-types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1492
diff
changeset
|
412 ASSERT_EQ(CompressionType_ZlibWithSize, att.GetCompressionType()); |
181 | 413 |
738 | 414 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
|
415 ASSERT_EQ("world", att.GetUuid()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
416 ASSERT_EQ(44u, att.GetCompressedSize()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
417 ASSERT_EQ("md5", att.GetUncompressedMD5()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
418 ASSERT_EQ("md5", att.GetCompressedMD5()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
419 ASSERT_EQ(44u, att.GetUncompressedSize()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
420 ASSERT_EQ(CompressionType_None, att.GetCompressionType()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
421 |
738 | 422 ASSERT_EQ(0u, listener_->deletedFiles_.size()); |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
423 ASSERT_EQ(0u, listener_->deletedResources_.size()); |
1286 | 424 |
425 CheckTableRecordCount(7, "Resources"); | |
426 CheckTableRecordCount(3, "AttachedFiles"); | |
427 CheckTableRecordCount(1, "Metadata"); | |
428 CheckTableRecordCount(1, "MainDicomTags"); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
429 |
738 | 430 index_->DeleteResource(a[0]); |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
431 ASSERT_EQ(5u, listener_->deletedResources_.size()); |
738 | 432 ASSERT_EQ(2u, listener_->deletedFiles_.size()); |
433 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(), | |
434 listener_->deletedFiles_.end(), | |
435 "my json file") == listener_->deletedFiles_.end()); | |
436 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(), | |
437 listener_->deletedFiles_.end(), | |
438 "my dicom file") == listener_->deletedFiles_.end()); | |
183 | 439 |
1286 | 440 CheckTableRecordCount(2, "Resources"); |
441 CheckTableRecordCount(0, "Metadata"); | |
442 CheckTableRecordCount(1, "AttachedFiles"); | |
443 CheckTableRecordCount(0, "MainDicomTags"); | |
444 | |
738 | 445 index_->DeleteResource(a[5]); |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
446 ASSERT_EQ(7u, listener_->deletedResources_.size()); |
1286 | 447 |
448 CheckTableRecordCount(0, "Resources"); | |
449 CheckTableRecordCount(0, "AttachedFiles"); | |
450 CheckTableRecordCount(2, "GlobalProperties"); | |
183 | 451 |
738 | 452 ASSERT_EQ(3u, listener_->deletedFiles_.size()); |
453 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(), | |
454 listener_->deletedFiles_.end(), | |
455 "world") == listener_->deletedFiles_.end()); | |
183 | 456 } |
457 | |
458 | |
459 | |
460 | |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
461 TEST_P(DatabaseWrapperTest, Upward) |
183 | 462 { |
463 int64_t a[] = { | |
738 | 464 index_->CreateResource("a", ResourceType_Patient), // 0 |
465 index_->CreateResource("b", ResourceType_Study), // 1 | |
466 index_->CreateResource("c", ResourceType_Series), // 2 | |
467 index_->CreateResource("d", ResourceType_Instance), // 3 | |
468 index_->CreateResource("e", ResourceType_Instance), // 4 | |
469 index_->CreateResource("f", ResourceType_Study), // 5 | |
470 index_->CreateResource("g", ResourceType_Series), // 6 | |
471 index_->CreateResource("h", ResourceType_Series) // 7 | |
183 | 472 }; |
473 | |
738 | 474 index_->AttachChild(a[0], a[1]); |
475 index_->AttachChild(a[1], a[2]); | |
476 index_->AttachChild(a[2], a[3]); | |
477 index_->AttachChild(a[2], a[4]); | |
478 index_->AttachChild(a[1], a[6]); | |
479 index_->AttachChild(a[0], a[5]); | |
480 index_->AttachChild(a[5], a[7]); | |
183 | 481 |
1287 | 482 CheckTwoChildren("b", "f", a[0]); |
483 CheckTwoChildren("c", "g", a[1]); | |
484 CheckTwoChildren("d", "e", a[2]); | |
485 CheckNoChild(a[3]); | |
486 CheckNoChild(a[4]); | |
487 CheckOneChild("h", a[5]); | |
488 CheckNoChild(a[6]); | |
489 CheckNoChild(a[7]); | |
193
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
190
diff
changeset
|
490 |
738 | 491 listener_->Reset(); |
492 index_->DeleteResource(a[3]); | |
493 ASSERT_EQ("c", listener_->ancestorId_); | |
494 ASSERT_EQ(ResourceType_Series, listener_->ancestorType_); | |
183 | 495 |
738 | 496 listener_->Reset(); |
497 index_->DeleteResource(a[4]); | |
498 ASSERT_EQ("b", listener_->ancestorId_); | |
499 ASSERT_EQ(ResourceType_Study, listener_->ancestorType_); | |
183 | 500 |
738 | 501 listener_->Reset(); |
502 index_->DeleteResource(a[7]); | |
503 ASSERT_EQ("a", listener_->ancestorId_); | |
504 ASSERT_EQ(ResourceType_Patient, listener_->ancestorType_); | |
183 | 505 |
738 | 506 listener_->Reset(); |
507 index_->DeleteResource(a[6]); | |
508 ASSERT_EQ("", listener_->ancestorId_); // No more ancestor | |
181 | 509 } |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
510 |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
511 |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
512 TEST_P(DatabaseWrapperTest, PatientRecycling) |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
513 { |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
514 std::vector<int64_t> patients; |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
515 for (int i = 0; i < 10; i++) |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
516 { |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
517 std::string p = "Patient " + boost::lexical_cast<std::string>(i); |
738 | 518 patients.push_back(index_->CreateResource(p, ResourceType_Patient)); |
519 index_->AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10, | |
1287 | 520 "md5-" + boost::lexical_cast<std::string>(i))); |
738 | 521 ASSERT_FALSE(index_->IsProtectedPatient(patients[i])); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
522 } |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
523 |
1286 | 524 CheckTableRecordCount(10u, "Resources"); |
525 CheckTableRecordCount(10u, "PatientRecyclingOrder"); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
526 |
738 | 527 listener_->Reset(); |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
528 ASSERT_EQ(0u, listener_->deletedResources_.size()); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
529 |
738 | 530 index_->DeleteResource(patients[5]); |
531 index_->DeleteResource(patients[0]); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
532 ASSERT_EQ(2u, listener_->deletedResources_.size()); |
1286 | 533 |
534 CheckTableRecordCount(8u, "Resources"); | |
535 CheckTableRecordCount(8u, "PatientRecyclingOrder"); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
536 |
738 | 537 ASSERT_EQ(2u, listener_->deletedFiles_.size()); |
538 ASSERT_EQ("Patient 5", listener_->deletedFiles_[0]); | |
539 ASSERT_EQ("Patient 0", listener_->deletedFiles_[1]); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
540 |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
541 int64_t p; |
738 | 542 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[1]); |
543 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
544 ASSERT_EQ(3u, listener_->deletedResources_.size()); |
738 | 545 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[2]); |
546 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
547 ASSERT_EQ(4u, listener_->deletedResources_.size()); |
738 | 548 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[3]); |
549 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
550 ASSERT_EQ(5u, listener_->deletedResources_.size()); |
738 | 551 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[4]); |
552 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
553 ASSERT_EQ(6u, listener_->deletedResources_.size()); |
738 | 554 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[6]); |
555 index_->DeleteResource(p); | |
556 index_->DeleteResource(patients[8]); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
557 ASSERT_EQ(8u, listener_->deletedResources_.size()); |
738 | 558 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[7]); |
559 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
560 ASSERT_EQ(9u, listener_->deletedResources_.size()); |
738 | 561 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[9]); |
562 index_->DeleteResource(p); | |
563 ASSERT_FALSE(index_->SelectPatientToRecycle(p)); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
564 ASSERT_EQ(10u, listener_->deletedResources_.size()); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
565 |
738 | 566 ASSERT_EQ(10u, listener_->deletedFiles_.size()); |
1286 | 567 |
568 CheckTableRecordCount(0, "Resources"); | |
569 CheckTableRecordCount(0, "PatientRecyclingOrder"); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
570 } |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
571 |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
572 |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
573 TEST_P(DatabaseWrapperTest, PatientProtection) |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
574 { |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
575 std::vector<int64_t> patients; |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
576 for (int i = 0; i < 5; i++) |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
577 { |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
578 std::string p = "Patient " + boost::lexical_cast<std::string>(i); |
738 | 579 patients.push_back(index_->CreateResource(p, ResourceType_Patient)); |
580 index_->AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10, | |
1287 | 581 "md5-" + boost::lexical_cast<std::string>(i))); |
738 | 582 ASSERT_FALSE(index_->IsProtectedPatient(patients[i])); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
583 } |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
584 |
1286 | 585 CheckTableRecordCount(5, "Resources"); |
586 CheckTableRecordCount(5, "PatientRecyclingOrder"); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
587 |
738 | 588 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); |
589 index_->SetProtectedPatient(patients[2], true); | |
590 ASSERT_TRUE(index_->IsProtectedPatient(patients[2])); | |
1286 | 591 CheckTableRecordCount(5, "Resources"); |
592 CheckTableRecordCount(4, "PatientRecyclingOrder"); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
593 |
738 | 594 index_->SetProtectedPatient(patients[2], true); |
595 ASSERT_TRUE(index_->IsProtectedPatient(patients[2])); | |
1286 | 596 CheckTableRecordCount(4, "PatientRecyclingOrder"); |
738 | 597 index_->SetProtectedPatient(patients[2], false); |
598 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); | |
1286 | 599 CheckTableRecordCount(5, "PatientRecyclingOrder"); |
738 | 600 index_->SetProtectedPatient(patients[2], false); |
601 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); | |
1286 | 602 CheckTableRecordCount(5, "PatientRecyclingOrder"); |
603 CheckTableRecordCount(5, "Resources"); | |
738 | 604 index_->SetProtectedPatient(patients[2], true); |
605 ASSERT_TRUE(index_->IsProtectedPatient(patients[2])); | |
1286 | 606 CheckTableRecordCount(4, "PatientRecyclingOrder"); |
738 | 607 index_->SetProtectedPatient(patients[2], false); |
608 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); | |
1286 | 609 CheckTableRecordCount(5, "PatientRecyclingOrder"); |
738 | 610 index_->SetProtectedPatient(patients[3], true); |
611 ASSERT_TRUE(index_->IsProtectedPatient(patients[3])); | |
1286 | 612 CheckTableRecordCount(4, "PatientRecyclingOrder"); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
613 |
1286 | 614 CheckTableRecordCount(5, "Resources"); |
738 | 615 ASSERT_EQ(0u, listener_->deletedFiles_.size()); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
616 |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
617 // 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
|
618 int64_t p; |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
619 ASSERT_EQ(0u, listener_->deletedResources_.size()); |
738 | 620 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[0]); |
621 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
622 ASSERT_EQ(1u, listener_->deletedResources_.size()); |
738 | 623 ASSERT_TRUE(index_->SelectPatientToRecycle(p, patients[1])); ASSERT_EQ(p, patients[4]); |
624 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[1]); | |
625 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
626 ASSERT_EQ(2u, listener_->deletedResources_.size()); |
738 | 627 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[4]); |
628 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
629 ASSERT_EQ(3u, listener_->deletedResources_.size()); |
738 | 630 ASSERT_FALSE(index_->SelectPatientToRecycle(p, patients[2])); |
631 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[2]); | |
632 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
633 ASSERT_EQ(4u, listener_->deletedResources_.size()); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
634 // "patients[3]" is still protected |
738 | 635 ASSERT_FALSE(index_->SelectPatientToRecycle(p)); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
636 |
738 | 637 ASSERT_EQ(4u, listener_->deletedFiles_.size()); |
1286 | 638 CheckTableRecordCount(1, "Resources"); |
639 CheckTableRecordCount(0, "PatientRecyclingOrder"); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
640 |
738 | 641 index_->SetProtectedPatient(patients[3], false); |
1286 | 642 CheckTableRecordCount(1, "PatientRecyclingOrder"); |
738 | 643 ASSERT_FALSE(index_->SelectPatientToRecycle(p, patients[3])); |
644 ASSERT_TRUE(index_->SelectPatientToRecycle(p, patients[2])); | |
645 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[3]); | |
646 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
647 ASSERT_EQ(5u, listener_->deletedResources_.size()); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
648 |
738 | 649 ASSERT_EQ(5u, listener_->deletedFiles_.size()); |
1286 | 650 CheckTableRecordCount(0, "Resources"); |
651 CheckTableRecordCount(0, "PatientRecyclingOrder"); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
652 } |
310 | 653 |
654 | |
655 | |
1237 | 656 TEST(ServerIndex, Sequence) |
310 | 657 { |
1237 | 658 const std::string path = "UnitTestsStorage"; |
659 | |
660 Toolbox::RemoveFile(path + "/index"); | |
661 FilesystemStorage storage(path); | |
1247 | 662 DatabaseWrapper db; // The SQLite DB is in memory |
1549
e5e975e9b738
refactoring and simplification of StorageAccessor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1514
diff
changeset
|
663 ServerContext context(db, storage); |
1237 | 664 ServerIndex& index = context.GetIndex(); |
665 | |
666 ASSERT_EQ(1u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
667 ASSERT_EQ(2u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
668 ASSERT_EQ(3u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
669 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
|
670 |
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1432
diff
changeset
|
671 context.Stop(); |
310 | 672 } |
521 | 673 |
674 | |
675 | |
1162 | 676 TEST_P(DatabaseWrapperTest, LookupIdentifier) |
521 | 677 { |
678 int64_t a[] = { | |
738 | 679 index_->CreateResource("a", ResourceType_Study), // 0 |
680 index_->CreateResource("b", ResourceType_Study), // 1 | |
681 index_->CreateResource("c", ResourceType_Study), // 2 | |
682 index_->CreateResource("d", ResourceType_Series) // 3 | |
521 | 683 }; |
684 | |
1286 | 685 index_->SetMainDicomTag(a[0], DICOM_TAG_STUDY_INSTANCE_UID, "0"); |
686 index_->SetMainDicomTag(a[1], DICOM_TAG_STUDY_INSTANCE_UID, "1"); | |
687 index_->SetMainDicomTag(a[2], DICOM_TAG_STUDY_INSTANCE_UID, "0"); | |
688 index_->SetMainDicomTag(a[3], DICOM_TAG_SERIES_INSTANCE_UID, "0"); | |
521 | 689 |
690 std::list<int64_t> s; | |
691 | |
1162 | 692 index_->LookupIdentifier(s, DICOM_TAG_STUDY_INSTANCE_UID, "0"); |
521 | 693 ASSERT_EQ(2u, s.size()); |
694 ASSERT_TRUE(std::find(s.begin(), s.end(), a[0]) != s.end()); | |
695 ASSERT_TRUE(std::find(s.begin(), s.end(), a[2]) != s.end()); | |
696 | |
1162 | 697 index_->LookupIdentifier(s, "0"); |
521 | 698 ASSERT_EQ(3u, s.size()); |
699 ASSERT_TRUE(std::find(s.begin(), s.end(), a[0]) != s.end()); | |
700 ASSERT_TRUE(std::find(s.begin(), s.end(), a[2]) != s.end()); | |
701 ASSERT_TRUE(std::find(s.begin(), s.end(), a[3]) != s.end()); | |
702 | |
1162 | 703 index_->LookupIdentifier(s, DICOM_TAG_STUDY_INSTANCE_UID, "1"); |
521 | 704 ASSERT_EQ(1u, s.size()); |
705 ASSERT_TRUE(std::find(s.begin(), s.end(), a[1]) != s.end()); | |
706 | |
1162 | 707 index_->LookupIdentifier(s, "1"); |
521 | 708 ASSERT_EQ(1u, s.size()); |
709 ASSERT_TRUE(std::find(s.begin(), s.end(), a[1]) != s.end()); | |
710 | |
711 | |
712 /*{ | |
1287 | 713 std::list<std::string> s; |
714 context.GetIndex().LookupIdentifier(s, DICOM_TAG_STUDY_INSTANCE_UID, "1.2.250.1.74.20130819132500.29000036381059"); | |
715 for (std::list<std::string>::iterator i = s.begin(); i != s.end(); i++) | |
716 { | |
717 std::cout << "*** " << *i << std::endl;; | |
718 } | |
719 }*/ | |
562
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
720 } |
705 | 721 |
722 | |
723 | |
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
724 TEST(ServerIndex, AttachmentRecycling) |
705 | 725 { |
803
4689e400e0fa
directory to store the results of the unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
738
diff
changeset
|
726 const std::string path = "UnitTestsStorage"; |
1124
790ff7a5b3bf
IStorageArea abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1030
diff
changeset
|
727 |
705 | 728 Toolbox::RemoveFile(path + "/index"); |
1124
790ff7a5b3bf
IStorageArea abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1030
diff
changeset
|
729 FilesystemStorage storage(path); |
1247 | 730 DatabaseWrapper db; // The SQLite DB is in memory |
1549
e5e975e9b738
refactoring and simplification of StorageAccessor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1514
diff
changeset
|
731 ServerContext context(db, storage); |
705 | 732 ServerIndex& index = context.GetIndex(); |
707
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
706
diff
changeset
|
733 |
706 | 734 index.SetMaximumStorageSize(10); |
735 | |
705 | 736 Json::Value tmp; |
737 index.ComputeStatistics(tmp); | |
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
738 ASSERT_EQ(0, tmp["CountPatients"].asInt()); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
739 ASSERT_EQ(0, boost::lexical_cast<int>(tmp["TotalDiskSize"].asString())); |
705 | 740 |
741 ServerIndex::Attachments attachments; | |
742 | |
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
743 std::vector<std::string> ids; |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
744 for (int i = 0; i < 10; i++) |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
745 { |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
746 std::string id = boost::lexical_cast<std::string>(i); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
747 DicomMap instance; |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
748 instance.SetValue(DICOM_TAG_PATIENT_ID, "patient-" + id); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
749 instance.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "study-" + id); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
750 instance.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, "series-" + id); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
751 instance.SetValue(DICOM_TAG_SOP_INSTANCE_UID, "instance-" + id); |
1006
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
752 |
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
753 std::map<MetadataType, std::string> instanceMetadata; |
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
754 ServerIndex::MetadataMap metadata; |
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
755 ASSERT_EQ(StoreStatus_Success, index.Store(instanceMetadata, instance, attachments, "", metadata)); |
1492 | 756 ASSERT_EQ(2u, instanceMetadata.size()); |
1029 | 757 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_RemoteAet) != instanceMetadata.end()); |
758 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_ReceptionDate) != instanceMetadata.end()); | |
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
759 |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
760 DicomInstanceHasher hasher(instance); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
761 ids.push_back(hasher.HashPatient()); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
762 ids.push_back(hasher.HashStudy()); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
763 ids.push_back(hasher.HashSeries()); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
764 ids.push_back(hasher.HashInstance()); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
765 } |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
766 |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
767 index.ComputeStatistics(tmp); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
768 ASSERT_EQ(10, tmp["CountPatients"].asInt()); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
769 ASSERT_EQ(0, boost::lexical_cast<int>(tmp["TotalDiskSize"].asString())); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
770 |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
771 for (size_t i = 0; i < ids.size(); i++) |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
772 { |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
773 FileInfo info(Toolbox::GenerateUuid(), FileContentType_Dicom, 1, "md5"); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
774 index.AddAttachment(info, ids[i]); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
775 |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
776 index.ComputeStatistics(tmp); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
777 ASSERT_GE(10, boost::lexical_cast<int>(tmp["TotalDiskSize"].asString())); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
778 } |
707
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
706
diff
changeset
|
779 |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
706
diff
changeset
|
780 // Because the DB is in memory, the SQLite index must not have been created |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
706
diff
changeset
|
781 ASSERT_THROW(Toolbox::GetFileSize(path + "/index"), OrthancException); |
1453
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1432
diff
changeset
|
782 |
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1432
diff
changeset
|
783 context.Stop(); |
705 | 784 } |