Mercurial > hg > orthanc
annotate UnitTestsSources/ServerIndexTests.cpp @ 3071:2df061cf2fec db-changes
getting rid of IFindConstraint hierarchy
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 02 Jan 2019 11:26:27 +0100 |
parents | ce272138f15e |
children | 0e9d1731b1b0 |
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 |
3060
4e43e67f8ecf
preparing for 2019
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3001
diff
changeset
|
5 * Copyright (C) 2017-2019 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" |
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
38 #include "../Core/FileStorage/MemoryStorageArea.h" |
1486
f967bdf8534e
refactoring to Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1453
diff
changeset
|
39 #include "../Core/Logging.h" |
3017
517fc4767ae0
renamed class DatabaseWrapper as SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3001
diff
changeset
|
40 #include "../OrthancServer/SQLiteDatabaseWrapper.h" |
705 | 41 #include "../OrthancServer/ServerContext.h" |
3001
7695a9c81099
refactoring /tools/find using LookupResource::IVisitor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2950
diff
changeset
|
42 #include "../OrthancServer/ServerToolbox.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, | |
2924
22524fd06225
macros ORTHANC_OVERRIDE and ORTHANC_FINAL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2898
diff
changeset
|
72 const std::string& publicId) |
22524fd06225
macros ORTHANC_OVERRIDE and ORTHANC_FINAL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2898
diff
changeset
|
73 ORTHANC_OVERRIDE |
183 | 74 { |
75 ancestorId_ = publicId; | |
76 ancestorType_ = type; | |
181 | 77 } |
78 | |
2924
22524fd06225
macros ORTHANC_OVERRIDE and ORTHANC_FINAL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2898
diff
changeset
|
79 virtual void SignalFileDeleted(const FileInfo& info) ORTHANC_OVERRIDE |
181 | 80 { |
273
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
81 const std::string fileUuid = info.GetUuid(); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
82 deletedFiles_.push_back(fileUuid); |
181 | 83 LOG(INFO) << "A file must be removed: " << fileUuid; |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
84 } |
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
85 |
2924
22524fd06225
macros ORTHANC_OVERRIDE and ORTHANC_FINAL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2898
diff
changeset
|
86 virtual void SignalChange(const ServerIndexChange& change) ORTHANC_OVERRIDE |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
87 { |
1198 | 88 if (change.GetChangeType() == ChangeType_Deleted) |
1177
5b2d8c280ac2
Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
89 { |
1198 | 90 deletedResources_.push_back(change.GetPublicId()); |
1177
5b2d8c280ac2
Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
91 } |
5b2d8c280ac2
Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
92 |
1198 | 93 LOG(INFO) << "Change related to resource " << change.GetPublicId() << " of type " |
94 << EnumerationToString(change.GetResourceType()) << ": " | |
95 << EnumerationToString(change.GetChangeType()); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
96 } |
1177
5b2d8c280ac2
Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
97 |
181 | 98 }; |
737
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 |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
101 class DatabaseWrapperTest : public ::testing::TestWithParam<DatabaseWrapperClass> |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
102 { |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
103 protected: |
1432
0ac74fa21db8
rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1294
diff
changeset
|
104 std::auto_ptr<TestDatabaseListener> listener_; |
1252 | 105 std::auto_ptr<IDatabaseWrapper> index_; |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
106 |
738 | 107 DatabaseWrapperTest() |
737
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 |
2924
22524fd06225
macros ORTHANC_OVERRIDE and ORTHANC_FINAL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2898
diff
changeset
|
111 virtual void SetUp() ORTHANC_OVERRIDE |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
112 { |
1432
0ac74fa21db8
rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1294
diff
changeset
|
113 listener_.reset(new TestDatabaseListener); |
1287 | 114 |
115 switch (GetParam()) | |
116 { | |
117 case DatabaseWrapperClass_SQLite: | |
3017
517fc4767ae0
renamed class DatabaseWrapper as SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3001
diff
changeset
|
118 index_.reset(new SQLiteDatabaseWrapper()); |
1287 | 119 break; |
120 | |
121 default: | |
122 throw OrthancException(ErrorCode_InternalError); | |
123 } | |
124 | |
1247 | 125 index_->SetListener(*listener_); |
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
126 index_->Open(); |
737
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 |
2924
22524fd06225
macros ORTHANC_OVERRIDE and ORTHANC_FINAL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2898
diff
changeset
|
129 virtual void TearDown() ORTHANC_OVERRIDE |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
130 { |
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
131 index_->Close(); |
738 | 132 index_.reset(NULL); |
133 listener_.reset(NULL); | |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
134 } |
1286 | 135 |
136 void CheckTableRecordCount(uint32_t expected, const char* table) | |
137 { | |
1287 | 138 switch (GetParam()) |
139 { | |
140 case DatabaseWrapperClass_SQLite: | |
141 { | |
3017
517fc4767ae0
renamed class DatabaseWrapper as SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3001
diff
changeset
|
142 SQLiteDatabaseWrapper* sqlite = dynamic_cast<SQLiteDatabaseWrapper*>(index_.get()); |
1287 | 143 ASSERT_EQ(expected, sqlite->GetTableRecordCount(table)); |
144 break; | |
145 } | |
146 | |
147 default: | |
148 throw OrthancException(ErrorCode_InternalError); | |
149 } | |
150 } | |
151 | |
152 void CheckNoParent(int64_t id) | |
153 { | |
154 std::string s; | |
155 | |
156 switch (GetParam()) | |
1286 | 157 { |
1287 | 158 case DatabaseWrapperClass_SQLite: |
159 { | |
3017
517fc4767ae0
renamed class DatabaseWrapper as SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3001
diff
changeset
|
160 SQLiteDatabaseWrapper* sqlite = dynamic_cast<SQLiteDatabaseWrapper*>(index_.get()); |
1287 | 161 ASSERT_FALSE(sqlite->GetParentPublicId(s, id)); |
162 break; | |
163 } | |
164 | |
165 default: | |
166 throw OrthancException(ErrorCode_InternalError); | |
167 } | |
168 } | |
169 | |
170 void CheckParentPublicId(const char* expected, int64_t id) | |
171 { | |
172 std::string s; | |
173 | |
174 switch (GetParam()) | |
175 { | |
176 case DatabaseWrapperClass_SQLite: | |
177 { | |
3017
517fc4767ae0
renamed class DatabaseWrapper as SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3001
diff
changeset
|
178 SQLiteDatabaseWrapper* sqlite = dynamic_cast<SQLiteDatabaseWrapper*>(index_.get()); |
1287 | 179 ASSERT_TRUE(sqlite->GetParentPublicId(s, id)); |
180 ASSERT_EQ(expected, s); | |
181 break; | |
182 } | |
183 | |
184 default: | |
185 throw OrthancException(ErrorCode_InternalError); | |
1286 | 186 } |
187 } | |
188 | |
1287 | 189 void CheckNoChild(int64_t id) |
190 { | |
191 std::list<std::string> j; | |
192 | |
193 switch (GetParam()) | |
194 { | |
195 case DatabaseWrapperClass_SQLite: | |
196 { | |
3017
517fc4767ae0
renamed class DatabaseWrapper as SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3001
diff
changeset
|
197 SQLiteDatabaseWrapper* sqlite = dynamic_cast<SQLiteDatabaseWrapper*>(index_.get()); |
1287 | 198 sqlite->GetChildren(j, id); |
1492 | 199 ASSERT_EQ(0u, j.size()); |
1287 | 200 break; |
201 } | |
202 | |
203 default: | |
204 throw OrthancException(ErrorCode_InternalError); | |
205 } | |
206 } | |
207 | |
208 void CheckOneChild(const char* expected, int64_t id) | |
209 { | |
210 std::list<std::string> j; | |
211 | |
212 switch (GetParam()) | |
213 { | |
214 case DatabaseWrapperClass_SQLite: | |
215 { | |
3017
517fc4767ae0
renamed class DatabaseWrapper as SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3001
diff
changeset
|
216 SQLiteDatabaseWrapper* sqlite = dynamic_cast<SQLiteDatabaseWrapper*>(index_.get()); |
1287 | 217 sqlite->GetChildren(j, id); |
1492 | 218 ASSERT_EQ(1u, j.size()); |
1287 | 219 ASSERT_EQ(expected, j.front()); |
220 break; | |
221 } | |
222 | |
223 default: | |
224 throw OrthancException(ErrorCode_InternalError); | |
225 } | |
226 } | |
227 | |
228 void CheckTwoChildren(const char* expected1, | |
229 const char* expected2, | |
230 int64_t id) | |
231 { | |
232 std::list<std::string> j; | |
233 | |
234 switch (GetParam()) | |
235 { | |
236 case DatabaseWrapperClass_SQLite: | |
237 { | |
3017
517fc4767ae0
renamed class DatabaseWrapper as SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3001
diff
changeset
|
238 SQLiteDatabaseWrapper* sqlite = dynamic_cast<SQLiteDatabaseWrapper*>(index_.get()); |
1287 | 239 sqlite->GetChildren(j, id); |
1492 | 240 ASSERT_EQ(2u, j.size()); |
1287 | 241 ASSERT_TRUE((expected1 == j.front() && expected2 == j.back()) || |
242 (expected1 == j.back() && expected2 == j.front())); | |
243 break; | |
244 } | |
245 | |
246 default: | |
247 throw OrthancException(ErrorCode_InternalError); | |
248 } | |
249 } | |
1746 | 250 |
251 | |
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
252 void DoLookupIdentifier(std::vector<std::string>& result, |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
253 ResourceType level, |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
254 const DicomTag& tag, |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
255 ConstraintType type, |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
256 const std::string& value) |
1746 | 257 { |
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
258 assert(ServerToolbox::IsIdentifier(tag, level)); |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
259 |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
260 DicomTagConstraint c(tag, type, value, true, true); |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
261 |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
262 std::vector<DatabaseConstraint> lookup; |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
263 lookup.push_back(DatabaseConstraint(c, level, DicomTagType_Identifier)); |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
264 |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
265 index_->ApplyLookupResources(result, NULL, lookup, level, 0 /* no limit */); |
1746 | 266 } |
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
267 |
1746 | 268 |
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
269 void DoLookupIdentifier2(std::vector<std::string>& result, |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
270 ResourceType level, |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
271 const DicomTag& tag, |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
272 ConstraintType type1, |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
273 const std::string& value1, |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
274 ConstraintType type2, |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
275 const std::string& value2) |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
276 { |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
277 assert(ServerToolbox::IsIdentifier(tag, level)); |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
278 |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
279 DicomTagConstraint c1(tag, type1, value1, true, true); |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
280 DicomTagConstraint c2(tag, type2, value2, true, true); |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
281 |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
282 std::vector<DatabaseConstraint> lookup; |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
283 lookup.push_back(DatabaseConstraint(c1, level, DicomTagType_Identifier)); |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
284 lookup.push_back(DatabaseConstraint(c2, level, DicomTagType_Identifier)); |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
285 |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
286 index_->ApplyLookupResources(result, NULL, lookup, level, 0 /* no limit */); |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
287 } |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
288 }; |
181 | 289 } |
290 | |
291 | |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
292 INSTANTIATE_TEST_CASE_P(DatabaseWrapperName, |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
293 DatabaseWrapperTest, |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
294 ::testing::Values(DatabaseWrapperClass_SQLite)); |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
295 |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
296 |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
297 TEST_P(DatabaseWrapperTest, Simple) |
181 | 298 { |
299 int64_t a[] = { | |
738 | 300 index_->CreateResource("a", ResourceType_Patient), // 0 |
301 index_->CreateResource("b", ResourceType_Study), // 1 | |
302 index_->CreateResource("c", ResourceType_Series), // 2 | |
303 index_->CreateResource("d", ResourceType_Instance), // 3 | |
304 index_->CreateResource("e", ResourceType_Instance), // 4 | |
305 index_->CreateResource("f", ResourceType_Instance), // 5 | |
306 index_->CreateResource("g", ResourceType_Study) // 6 | |
181 | 307 }; |
308 | |
738 | 309 ASSERT_EQ("a", index_->GetPublicId(a[0])); |
310 ASSERT_EQ("b", index_->GetPublicId(a[1])); | |
311 ASSERT_EQ("c", index_->GetPublicId(a[2])); | |
312 ASSERT_EQ("d", index_->GetPublicId(a[3])); | |
313 ASSERT_EQ("e", index_->GetPublicId(a[4])); | |
314 ASSERT_EQ("f", index_->GetPublicId(a[5])); | |
315 ASSERT_EQ("g", index_->GetPublicId(a[6])); | |
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
316 |
738 | 317 ASSERT_EQ(ResourceType_Patient, index_->GetResourceType(a[0])); |
318 ASSERT_EQ(ResourceType_Study, index_->GetResourceType(a[1])); | |
319 ASSERT_EQ(ResourceType_Series, index_->GetResourceType(a[2])); | |
320 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[3])); | |
321 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[4])); | |
322 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[5])); | |
323 ASSERT_EQ(ResourceType_Study, index_->GetResourceType(a[6])); | |
304 | 324 |
190 | 325 { |
1241 | 326 std::list<std::string> t; |
738 | 327 index_->GetAllPublicIds(t, ResourceType_Patient); |
190 | 328 |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
329 ASSERT_EQ(1u, t.size()); |
1241 | 330 ASSERT_EQ("a", t.front()); |
190 | 331 |
738 | 332 index_->GetAllPublicIds(t, ResourceType_Series); |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
333 ASSERT_EQ(1u, t.size()); |
1241 | 334 ASSERT_EQ("c", t.front()); |
190 | 335 |
738 | 336 index_->GetAllPublicIds(t, ResourceType_Study); |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
337 ASSERT_EQ(2u, t.size()); |
190 | 338 |
738 | 339 index_->GetAllPublicIds(t, ResourceType_Instance); |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
340 ASSERT_EQ(3u, t.size()); |
190 | 341 } |
342 | |
738 | 343 index_->SetGlobalProperty(GlobalProperty_FlushSleep, "World"); |
181 | 344 |
738 | 345 index_->AttachChild(a[0], a[1]); |
346 index_->AttachChild(a[1], a[2]); | |
347 index_->AttachChild(a[2], a[3]); | |
348 index_->AttachChild(a[2], a[4]); | |
349 index_->AttachChild(a[6], a[5]); | |
182 | 350 |
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
351 int64_t parent; |
738 | 352 ASSERT_FALSE(index_->LookupParent(parent, a[0])); |
353 ASSERT_TRUE(index_->LookupParent(parent, a[1])); ASSERT_EQ(a[0], parent); | |
354 ASSERT_TRUE(index_->LookupParent(parent, a[2])); ASSERT_EQ(a[1], parent); | |
355 ASSERT_TRUE(index_->LookupParent(parent, a[3])); ASSERT_EQ(a[2], parent); | |
356 ASSERT_TRUE(index_->LookupParent(parent, a[4])); ASSERT_EQ(a[2], parent); | |
357 ASSERT_TRUE(index_->LookupParent(parent, a[5])); ASSERT_EQ(a[6], parent); | |
358 ASSERT_FALSE(index_->LookupParent(parent, a[6])); | |
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
359 |
182 | 360 std::string s; |
1286 | 361 |
1287 | 362 CheckNoParent(a[0]); |
363 CheckNoParent(a[6]); | |
364 CheckParentPublicId("a", a[1]); | |
365 CheckParentPublicId("b", a[2]); | |
366 CheckParentPublicId("c", a[3]); | |
367 CheckParentPublicId("c", a[4]); | |
368 CheckParentPublicId("g", a[5]); | |
182 | 369 |
185 | 370 std::list<std::string> l; |
738 | 371 index_->GetChildrenPublicId(l, a[0]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("b", l.front()); |
372 index_->GetChildrenPublicId(l, a[1]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("c", l.front()); | |
373 index_->GetChildrenPublicId(l, a[3]); ASSERT_EQ(0u, l.size()); | |
374 index_->GetChildrenPublicId(l, a[4]); ASSERT_EQ(0u, l.size()); | |
375 index_->GetChildrenPublicId(l, a[5]); ASSERT_EQ(0u, l.size()); | |
376 index_->GetChildrenPublicId(l, a[6]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("f", l.front()); | |
182 | 377 |
738 | 378 index_->GetChildrenPublicId(l, a[2]); ASSERT_EQ(2u, l.size()); |
182 | 379 if (l.front() == "d") |
380 { | |
381 ASSERT_EQ("e", l.back()); | |
382 } | |
383 else | |
384 { | |
385 ASSERT_EQ("d", l.back()); | |
386 ASSERT_EQ("e", l.front()); | |
387 } | |
388 | |
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
389 std::list<MetadataType> md; |
738 | 390 index_->ListAvailableMetadata(md, a[4]); |
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
391 ASSERT_EQ(0u, md.size()); |
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
392 |
738 | 393 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
|
394 CompressionType_ZlibWithSize, 21, "compressedMD5")); |
738 | 395 index_->AddAttachment(a[4], FileInfo("my dicom file", FileContentType_Dicom, 42, "md5")); |
396 index_->AddAttachment(a[6], FileInfo("world", FileContentType_Dicom, 44, "md5")); | |
397 index_->SetMetadata(a[4], MetadataType_Instance_RemoteAet, "PINNACLE"); | |
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
398 |
738 | 399 index_->ListAvailableMetadata(md, a[4]); |
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
400 ASSERT_EQ(1u, md.size()); |
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
401 ASSERT_EQ(MetadataType_Instance_RemoteAet, md.front()); |
738 | 402 index_->SetMetadata(a[4], MetadataType_ModifiedFrom, "TUTU"); |
403 index_->ListAvailableMetadata(md, a[4]); | |
438 | 404 ASSERT_EQ(2u, md.size()); |
1030 | 405 |
406 std::map<MetadataType, std::string> md2; | |
407 index_->GetAllMetadata(md2, a[4]); | |
408 ASSERT_EQ(2u, md2.size()); | |
409 ASSERT_EQ("TUTU", md2[MetadataType_ModifiedFrom]); | |
410 ASSERT_EQ("PINNACLE", md2[MetadataType_Instance_RemoteAet]); | |
411 | |
738 | 412 index_->DeleteMetadata(a[4], MetadataType_ModifiedFrom); |
413 index_->ListAvailableMetadata(md, a[4]); | |
438 | 414 ASSERT_EQ(1u, md.size()); |
415 ASSERT_EQ(MetadataType_Instance_RemoteAet, md.front()); | |
182 | 416 |
1030 | 417 index_->GetAllMetadata(md2, a[4]); |
418 ASSERT_EQ(1u, md2.size()); | |
419 ASSERT_EQ("PINNACLE", md2[MetadataType_Instance_RemoteAet]); | |
420 | |
421 | |
738 | 422 ASSERT_EQ(21u + 42u + 44u, index_->GetTotalCompressedSize()); |
423 ASSERT_EQ(42u + 42u + 44u, index_->GetTotalUncompressedSize()); | |
181 | 424 |
1286 | 425 index_->SetMainDicomTag(a[3], DicomTag(0x0010, 0x0010), "PatientName"); |
181 | 426 |
427 int64_t b; | |
428 ResourceType t; | |
1294 | 429 ASSERT_TRUE(index_->LookupResource(b, t, "g")); |
181 | 430 ASSERT_EQ(7, b); |
431 ASSERT_EQ(ResourceType_Study, t); | |
432 | |
738 | 433 ASSERT_TRUE(index_->LookupMetadata(s, a[4], MetadataType_Instance_RemoteAet)); |
434 ASSERT_FALSE(index_->LookupMetadata(s, a[4], MetadataType_Instance_IndexInSeries)); | |
181 | 435 ASSERT_EQ("PINNACLE", s); |
1238 | 436 |
437 std::string u; | |
438 ASSERT_TRUE(index_->LookupMetadata(u, a[4], MetadataType_Instance_RemoteAet)); | |
439 ASSERT_EQ("PINNACLE", u); | |
440 ASSERT_FALSE(index_->LookupMetadata(u, a[4], MetadataType_Instance_IndexInSeries)); | |
181 | 441 |
738 | 442 ASSERT_TRUE(index_->LookupGlobalProperty(s, GlobalProperty_FlushSleep)); |
443 ASSERT_FALSE(index_->LookupGlobalProperty(s, static_cast<GlobalProperty>(42))); | |
181 | 444 ASSERT_EQ("World", s); |
445 | |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
446 FileInfo att; |
738 | 447 ASSERT_TRUE(index_->LookupAttachment(att, a[4], FileContentType_DicomAsJson)); |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
448 ASSERT_EQ("my json file", att.GetUuid()); |
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
449 ASSERT_EQ(21u, att.GetCompressedSize()); |
693
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
450 ASSERT_EQ("md5", att.GetUncompressedMD5()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
451 ASSERT_EQ("compressedMD5", att.GetCompressedMD5()); |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
452 ASSERT_EQ(42u, att.GetUncompressedSize()); |
1514
d73a2178b319
support of deflate and gzip content-types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1492
diff
changeset
|
453 ASSERT_EQ(CompressionType_ZlibWithSize, att.GetCompressionType()); |
181 | 454 |
738 | 455 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
|
456 ASSERT_EQ("world", att.GetUuid()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
457 ASSERT_EQ(44u, att.GetCompressedSize()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
458 ASSERT_EQ("md5", att.GetUncompressedMD5()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
459 ASSERT_EQ("md5", att.GetCompressedMD5()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
460 ASSERT_EQ(44u, att.GetUncompressedSize()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
461 ASSERT_EQ(CompressionType_None, att.GetCompressionType()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
462 |
738 | 463 ASSERT_EQ(0u, listener_->deletedFiles_.size()); |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
464 ASSERT_EQ(0u, listener_->deletedResources_.size()); |
1286 | 465 |
466 CheckTableRecordCount(7, "Resources"); | |
467 CheckTableRecordCount(3, "AttachedFiles"); | |
468 CheckTableRecordCount(1, "Metadata"); | |
469 CheckTableRecordCount(1, "MainDicomTags"); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
470 |
738 | 471 index_->DeleteResource(a[0]); |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
472 ASSERT_EQ(5u, listener_->deletedResources_.size()); |
738 | 473 ASSERT_EQ(2u, listener_->deletedFiles_.size()); |
474 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(), | |
475 listener_->deletedFiles_.end(), | |
476 "my json file") == listener_->deletedFiles_.end()); | |
477 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(), | |
478 listener_->deletedFiles_.end(), | |
479 "my dicom file") == listener_->deletedFiles_.end()); | |
183 | 480 |
1286 | 481 CheckTableRecordCount(2, "Resources"); |
482 CheckTableRecordCount(0, "Metadata"); | |
483 CheckTableRecordCount(1, "AttachedFiles"); | |
484 CheckTableRecordCount(0, "MainDicomTags"); | |
485 | |
738 | 486 index_->DeleteResource(a[5]); |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
487 ASSERT_EQ(7u, listener_->deletedResources_.size()); |
1286 | 488 |
489 CheckTableRecordCount(0, "Resources"); | |
490 CheckTableRecordCount(0, "AttachedFiles"); | |
3018
e3b5c07146a3
speeding up the computation of the size of the attachments in SQLite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3017
diff
changeset
|
491 CheckTableRecordCount(3, "GlobalProperties"); |
e3b5c07146a3
speeding up the computation of the size of the attachments in SQLite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3017
diff
changeset
|
492 |
e3b5c07146a3
speeding up the computation of the size of the attachments in SQLite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3017
diff
changeset
|
493 std::string tmp; |
e3b5c07146a3
speeding up the computation of the size of the attachments in SQLite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3017
diff
changeset
|
494 ASSERT_TRUE(index_->LookupGlobalProperty(tmp, GlobalProperty_DatabaseSchemaVersion)); |
e3b5c07146a3
speeding up the computation of the size of the attachments in SQLite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3017
diff
changeset
|
495 ASSERT_EQ("6", tmp); |
e3b5c07146a3
speeding up the computation of the size of the attachments in SQLite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3017
diff
changeset
|
496 ASSERT_TRUE(index_->LookupGlobalProperty(tmp, GlobalProperty_FlushSleep)); |
e3b5c07146a3
speeding up the computation of the size of the attachments in SQLite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3017
diff
changeset
|
497 ASSERT_EQ("World", tmp); |
3019
8336204d95dc
refactoring computation of disk size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3018
diff
changeset
|
498 ASSERT_TRUE(index_->LookupGlobalProperty(tmp, GlobalProperty_GetTotalSizeIsFast)); |
3018
e3b5c07146a3
speeding up the computation of the size of the attachments in SQLite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3017
diff
changeset
|
499 ASSERT_EQ("1", tmp); |
183 | 500 |
738 | 501 ASSERT_EQ(3u, listener_->deletedFiles_.size()); |
502 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(), | |
503 listener_->deletedFiles_.end(), | |
504 "world") == listener_->deletedFiles_.end()); | |
183 | 505 } |
506 | |
507 | |
508 | |
509 | |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
510 TEST_P(DatabaseWrapperTest, Upward) |
183 | 511 { |
512 int64_t a[] = { | |
738 | 513 index_->CreateResource("a", ResourceType_Patient), // 0 |
514 index_->CreateResource("b", ResourceType_Study), // 1 | |
515 index_->CreateResource("c", ResourceType_Series), // 2 | |
516 index_->CreateResource("d", ResourceType_Instance), // 3 | |
517 index_->CreateResource("e", ResourceType_Instance), // 4 | |
518 index_->CreateResource("f", ResourceType_Study), // 5 | |
519 index_->CreateResource("g", ResourceType_Series), // 6 | |
520 index_->CreateResource("h", ResourceType_Series) // 7 | |
183 | 521 }; |
522 | |
738 | 523 index_->AttachChild(a[0], a[1]); |
524 index_->AttachChild(a[1], a[2]); | |
525 index_->AttachChild(a[2], a[3]); | |
526 index_->AttachChild(a[2], a[4]); | |
527 index_->AttachChild(a[1], a[6]); | |
528 index_->AttachChild(a[0], a[5]); | |
529 index_->AttachChild(a[5], a[7]); | |
183 | 530 |
1287 | 531 CheckTwoChildren("b", "f", a[0]); |
532 CheckTwoChildren("c", "g", a[1]); | |
533 CheckTwoChildren("d", "e", a[2]); | |
534 CheckNoChild(a[3]); | |
535 CheckNoChild(a[4]); | |
536 CheckOneChild("h", a[5]); | |
537 CheckNoChild(a[6]); | |
538 CheckNoChild(a[7]); | |
193
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
190
diff
changeset
|
539 |
738 | 540 listener_->Reset(); |
541 index_->DeleteResource(a[3]); | |
542 ASSERT_EQ("c", listener_->ancestorId_); | |
543 ASSERT_EQ(ResourceType_Series, listener_->ancestorType_); | |
183 | 544 |
738 | 545 listener_->Reset(); |
546 index_->DeleteResource(a[4]); | |
547 ASSERT_EQ("b", listener_->ancestorId_); | |
548 ASSERT_EQ(ResourceType_Study, listener_->ancestorType_); | |
183 | 549 |
738 | 550 listener_->Reset(); |
551 index_->DeleteResource(a[7]); | |
552 ASSERT_EQ("a", listener_->ancestorId_); | |
553 ASSERT_EQ(ResourceType_Patient, listener_->ancestorType_); | |
183 | 554 |
738 | 555 listener_->Reset(); |
556 index_->DeleteResource(a[6]); | |
557 ASSERT_EQ("", listener_->ancestorId_); // No more ancestor | |
181 | 558 } |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
559 |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
560 |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
561 TEST_P(DatabaseWrapperTest, PatientRecycling) |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
562 { |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
563 std::vector<int64_t> patients; |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
564 for (int i = 0; i < 10; i++) |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
565 { |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
566 std::string p = "Patient " + boost::lexical_cast<std::string>(i); |
738 | 567 patients.push_back(index_->CreateResource(p, ResourceType_Patient)); |
568 index_->AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10, | |
1287 | 569 "md5-" + boost::lexical_cast<std::string>(i))); |
738 | 570 ASSERT_FALSE(index_->IsProtectedPatient(patients[i])); |
262
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 |
1286 | 573 CheckTableRecordCount(10u, "Resources"); |
574 CheckTableRecordCount(10u, "PatientRecyclingOrder"); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
575 |
738 | 576 listener_->Reset(); |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
577 ASSERT_EQ(0u, listener_->deletedResources_.size()); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
578 |
738 | 579 index_->DeleteResource(patients[5]); |
580 index_->DeleteResource(patients[0]); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
581 ASSERT_EQ(2u, listener_->deletedResources_.size()); |
1286 | 582 |
583 CheckTableRecordCount(8u, "Resources"); | |
584 CheckTableRecordCount(8u, "PatientRecyclingOrder"); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
585 |
738 | 586 ASSERT_EQ(2u, listener_->deletedFiles_.size()); |
587 ASSERT_EQ("Patient 5", listener_->deletedFiles_[0]); | |
588 ASSERT_EQ("Patient 0", listener_->deletedFiles_[1]); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
589 |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
590 int64_t p; |
738 | 591 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[1]); |
592 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
593 ASSERT_EQ(3u, listener_->deletedResources_.size()); |
738 | 594 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[2]); |
595 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
596 ASSERT_EQ(4u, listener_->deletedResources_.size()); |
738 | 597 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[3]); |
598 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
599 ASSERT_EQ(5u, listener_->deletedResources_.size()); |
738 | 600 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[4]); |
601 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
602 ASSERT_EQ(6u, listener_->deletedResources_.size()); |
738 | 603 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[6]); |
604 index_->DeleteResource(p); | |
605 index_->DeleteResource(patients[8]); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
606 ASSERT_EQ(8u, listener_->deletedResources_.size()); |
738 | 607 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[7]); |
608 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
609 ASSERT_EQ(9u, listener_->deletedResources_.size()); |
738 | 610 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[9]); |
611 index_->DeleteResource(p); | |
612 ASSERT_FALSE(index_->SelectPatientToRecycle(p)); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
613 ASSERT_EQ(10u, listener_->deletedResources_.size()); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
614 |
738 | 615 ASSERT_EQ(10u, listener_->deletedFiles_.size()); |
1286 | 616 |
617 CheckTableRecordCount(0, "Resources"); | |
618 CheckTableRecordCount(0, "PatientRecyclingOrder"); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
619 } |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
620 |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
621 |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
622 TEST_P(DatabaseWrapperTest, PatientProtection) |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
623 { |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
624 std::vector<int64_t> patients; |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
625 for (int i = 0; i < 5; i++) |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
626 { |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
627 std::string p = "Patient " + boost::lexical_cast<std::string>(i); |
738 | 628 patients.push_back(index_->CreateResource(p, ResourceType_Patient)); |
629 index_->AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10, | |
1287 | 630 "md5-" + boost::lexical_cast<std::string>(i))); |
738 | 631 ASSERT_FALSE(index_->IsProtectedPatient(patients[i])); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
632 } |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
633 |
1286 | 634 CheckTableRecordCount(5, "Resources"); |
635 CheckTableRecordCount(5, "PatientRecyclingOrder"); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
636 |
738 | 637 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); |
638 index_->SetProtectedPatient(patients[2], true); | |
639 ASSERT_TRUE(index_->IsProtectedPatient(patients[2])); | |
1286 | 640 CheckTableRecordCount(5, "Resources"); |
641 CheckTableRecordCount(4, "PatientRecyclingOrder"); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
642 |
738 | 643 index_->SetProtectedPatient(patients[2], true); |
644 ASSERT_TRUE(index_->IsProtectedPatient(patients[2])); | |
1286 | 645 CheckTableRecordCount(4, "PatientRecyclingOrder"); |
738 | 646 index_->SetProtectedPatient(patients[2], false); |
647 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); | |
1286 | 648 CheckTableRecordCount(5, "PatientRecyclingOrder"); |
738 | 649 index_->SetProtectedPatient(patients[2], false); |
650 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); | |
1286 | 651 CheckTableRecordCount(5, "PatientRecyclingOrder"); |
652 CheckTableRecordCount(5, "Resources"); | |
738 | 653 index_->SetProtectedPatient(patients[2], true); |
654 ASSERT_TRUE(index_->IsProtectedPatient(patients[2])); | |
1286 | 655 CheckTableRecordCount(4, "PatientRecyclingOrder"); |
738 | 656 index_->SetProtectedPatient(patients[2], false); |
657 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); | |
1286 | 658 CheckTableRecordCount(5, "PatientRecyclingOrder"); |
738 | 659 index_->SetProtectedPatient(patients[3], true); |
660 ASSERT_TRUE(index_->IsProtectedPatient(patients[3])); | |
1286 | 661 CheckTableRecordCount(4, "PatientRecyclingOrder"); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
662 |
1286 | 663 CheckTableRecordCount(5, "Resources"); |
738 | 664 ASSERT_EQ(0u, listener_->deletedFiles_.size()); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
665 |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
666 // 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
|
667 int64_t p; |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
668 ASSERT_EQ(0u, listener_->deletedResources_.size()); |
738 | 669 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[0]); |
670 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
671 ASSERT_EQ(1u, listener_->deletedResources_.size()); |
738 | 672 ASSERT_TRUE(index_->SelectPatientToRecycle(p, patients[1])); ASSERT_EQ(p, patients[4]); |
673 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[1]); | |
674 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
675 ASSERT_EQ(2u, listener_->deletedResources_.size()); |
738 | 676 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[4]); |
677 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
678 ASSERT_EQ(3u, listener_->deletedResources_.size()); |
738 | 679 ASSERT_FALSE(index_->SelectPatientToRecycle(p, patients[2])); |
680 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[2]); | |
681 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
682 ASSERT_EQ(4u, listener_->deletedResources_.size()); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
683 // "patients[3]" is still protected |
738 | 684 ASSERT_FALSE(index_->SelectPatientToRecycle(p)); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
685 |
738 | 686 ASSERT_EQ(4u, listener_->deletedFiles_.size()); |
1286 | 687 CheckTableRecordCount(1, "Resources"); |
688 CheckTableRecordCount(0, "PatientRecyclingOrder"); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
689 |
738 | 690 index_->SetProtectedPatient(patients[3], false); |
1286 | 691 CheckTableRecordCount(1, "PatientRecyclingOrder"); |
738 | 692 ASSERT_FALSE(index_->SelectPatientToRecycle(p, patients[3])); |
693 ASSERT_TRUE(index_->SelectPatientToRecycle(p, patients[2])); | |
694 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[3]); | |
695 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
696 ASSERT_EQ(5u, listener_->deletedResources_.size()); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
697 |
738 | 698 ASSERT_EQ(5u, listener_->deletedFiles_.size()); |
1286 | 699 CheckTableRecordCount(0, "Resources"); |
700 CheckTableRecordCount(0, "PatientRecyclingOrder"); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
701 } |
310 | 702 |
703 | |
704 | |
1237 | 705 TEST(ServerIndex, Sequence) |
310 | 706 { |
1237 | 707 const std::string path = "UnitTestsStorage"; |
708 | |
2140 | 709 SystemToolbox::RemoveFile(path + "/index"); |
1237 | 710 FilesystemStorage storage(path); |
3017
517fc4767ae0
renamed class DatabaseWrapper as SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3001
diff
changeset
|
711 SQLiteDatabaseWrapper db; // The SQLite DB is in memory |
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
712 db.Open(); |
2950
dc18d5804746
support of JobsHistorySize set to zero
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2924
diff
changeset
|
713 ServerContext context(db, storage, true /* running unit tests */, 10); |
2815
925d8dc03a23
unserialization of jobs from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2671
diff
changeset
|
714 context.SetupJobsEngine(true, false); |
925d8dc03a23
unserialization of jobs from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2671
diff
changeset
|
715 |
1237 | 716 ServerIndex& index = context.GetIndex(); |
717 | |
718 ASSERT_EQ(1u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
719 ASSERT_EQ(2u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
720 ASSERT_EQ(3u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
721 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
|
722 |
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1432
diff
changeset
|
723 context.Stop(); |
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
724 db.Close(); |
310 | 725 } |
521 | 726 |
727 | |
728 | |
1162 | 729 TEST_P(DatabaseWrapperTest, LookupIdentifier) |
521 | 730 { |
731 int64_t a[] = { | |
738 | 732 index_->CreateResource("a", ResourceType_Study), // 0 |
733 index_->CreateResource("b", ResourceType_Study), // 1 | |
734 index_->CreateResource("c", ResourceType_Study), // 2 | |
735 index_->CreateResource("d", ResourceType_Series) // 3 | |
521 | 736 }; |
737 | |
1713 | 738 index_->SetIdentifierTag(a[0], DICOM_TAG_STUDY_INSTANCE_UID, "0"); |
739 index_->SetIdentifierTag(a[1], DICOM_TAG_STUDY_INSTANCE_UID, "1"); | |
740 index_->SetIdentifierTag(a[2], DICOM_TAG_STUDY_INSTANCE_UID, "0"); | |
741 index_->SetIdentifierTag(a[3], DICOM_TAG_SERIES_INSTANCE_UID, "0"); | |
521 | 742 |
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
743 std::vector<std::string> s; |
521 | 744 |
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
745 DoLookupIdentifier(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, ConstraintType_Equal, "0"); |
521 | 746 ASSERT_EQ(2u, s.size()); |
1746 | 747 ASSERT_TRUE(std::find(s.begin(), s.end(), "a") != s.end()); |
748 ASSERT_TRUE(std::find(s.begin(), s.end(), "c") != s.end()); | |
521 | 749 |
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
750 DoLookupIdentifier(s, ResourceType_Series, DICOM_TAG_SERIES_INSTANCE_UID, ConstraintType_Equal, "0"); |
1718
2b812969e136
getting rid of an IDatabaseWrapper::LookupIdentifier flavor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
751 ASSERT_EQ(1u, s.size()); |
1746 | 752 ASSERT_TRUE(std::find(s.begin(), s.end(), "d") != s.end()); |
521 | 753 |
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
754 DoLookupIdentifier(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, ConstraintType_Equal, "1"); |
521 | 755 ASSERT_EQ(1u, s.size()); |
1746 | 756 ASSERT_TRUE(std::find(s.begin(), s.end(), "b") != s.end()); |
521 | 757 |
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
758 DoLookupIdentifier(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, ConstraintType_Equal, "1"); |
521 | 759 ASSERT_EQ(1u, s.size()); |
1746 | 760 ASSERT_TRUE(std::find(s.begin(), s.end(), "b") != s.end()); |
521 | 761 |
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
762 DoLookupIdentifier(s, ResourceType_Series, DICOM_TAG_SERIES_INSTANCE_UID, ConstraintType_Equal, "1"); |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
763 ASSERT_EQ(0u, s.size()); |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
764 |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
765 DoLookupIdentifier(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, ConstraintType_GreaterOrEqual, "0"); |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
766 ASSERT_EQ(3u, s.size()); |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
767 |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
768 DoLookupIdentifier(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, ConstraintType_GreaterOrEqual, "1"); |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
769 ASSERT_EQ(1u, s.size()); |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
770 |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
771 DoLookupIdentifier(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, ConstraintType_GreaterOrEqual, "2"); |
1718
2b812969e136
getting rid of an IDatabaseWrapper::LookupIdentifier flavor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
772 ASSERT_EQ(0u, s.size()); |
521 | 773 |
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
774 DoLookupIdentifier2(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
775 ConstraintType_GreaterOrEqual, "0", ConstraintType_SmallerOrEqual, "0"); |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
776 ASSERT_EQ(2u, s.size()); |
1746 | 777 |
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
778 DoLookupIdentifier2(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
779 ConstraintType_GreaterOrEqual, "1", ConstraintType_SmallerOrEqual, "1"); |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
780 ASSERT_EQ(1u, s.size()); |
1746 | 781 |
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
782 DoLookupIdentifier2(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
783 ConstraintType_GreaterOrEqual, "0", ConstraintType_SmallerOrEqual, "1"); |
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
784 ASSERT_EQ(3u, s.size()); |
562
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
785 } |
705 | 786 |
787 | |
788 | |
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
789 TEST(ServerIndex, AttachmentRecycling) |
705 | 790 { |
803
4689e400e0fa
directory to store the results of the unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
738
diff
changeset
|
791 const std::string path = "UnitTestsStorage"; |
1124
790ff7a5b3bf
IStorageArea abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1030
diff
changeset
|
792 |
2140 | 793 SystemToolbox::RemoveFile(path + "/index"); |
1124
790ff7a5b3bf
IStorageArea abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1030
diff
changeset
|
794 FilesystemStorage storage(path); |
3017
517fc4767ae0
renamed class DatabaseWrapper as SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3001
diff
changeset
|
795 SQLiteDatabaseWrapper db; // The SQLite DB is in memory |
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
796 db.Open(); |
2950
dc18d5804746
support of JobsHistorySize set to zero
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2924
diff
changeset
|
797 ServerContext context(db, storage, true /* running unit tests */, 10); |
2815
925d8dc03a23
unserialization of jobs from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2671
diff
changeset
|
798 context.SetupJobsEngine(true, false); |
705 | 799 ServerIndex& index = context.GetIndex(); |
707
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
706
diff
changeset
|
800 |
706 | 801 index.SetMaximumStorageSize(10); |
802 | |
705 | 803 Json::Value tmp; |
804 index.ComputeStatistics(tmp); | |
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
805 ASSERT_EQ(0, tmp["CountPatients"].asInt()); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
806 ASSERT_EQ(0, boost::lexical_cast<int>(tmp["TotalDiskSize"].asString())); |
705 | 807 |
808 ServerIndex::Attachments attachments; | |
809 | |
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
810 std::vector<std::string> ids; |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
811 for (int i = 0; i < 10; i++) |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
812 { |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
813 std::string id = boost::lexical_cast<std::string>(i); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
814 DicomMap instance; |
2007
655489d9165d
DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1971
diff
changeset
|
815 instance.SetValue(DICOM_TAG_PATIENT_ID, "patient-" + id, false); |
655489d9165d
DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1971
diff
changeset
|
816 instance.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "study-" + id, false); |
655489d9165d
DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1971
diff
changeset
|
817 instance.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, "series-" + id, false); |
655489d9165d
DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1971
diff
changeset
|
818 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
|
819 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
|
820 |
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
821 std::map<MetadataType, std::string> instanceMetadata; |
1822 | 822 DicomInstanceToStore toStore; |
823 toStore.SetSummary(instance); | |
824 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
|
825 ASSERT_EQ(5u, instanceMetadata.size()); |
1029 | 826 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_RemoteAet) != instanceMetadata.end()); |
827 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_ReceptionDate) != instanceMetadata.end()); | |
2190 | 828 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
|
829 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_SopClassUid) != instanceMetadata.end()); |
2190 | 830 |
831 // By default, an Explicit VR Little Endian is used by Orthanc | |
832 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
|
833 |
2208
90ea60bee5ff
New metadata automatically computed at the instance level: "SopClassUid"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2190
diff
changeset
|
834 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
|
835 |
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
836 DicomInstanceHasher hasher(instance); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
837 ids.push_back(hasher.HashPatient()); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
838 ids.push_back(hasher.HashStudy()); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
839 ids.push_back(hasher.HashSeries()); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
840 ids.push_back(hasher.HashInstance()); |
2898
e5e3253a1164
DicomInstanceToStore::GetHasher()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2828
diff
changeset
|
841 |
e5e3253a1164
DicomInstanceToStore::GetHasher()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2828
diff
changeset
|
842 ASSERT_EQ(hasher.HashPatient(), toStore.GetHasher().HashPatient()); |
e5e3253a1164
DicomInstanceToStore::GetHasher()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2828
diff
changeset
|
843 ASSERT_EQ(hasher.HashStudy(), toStore.GetHasher().HashStudy()); |
e5e3253a1164
DicomInstanceToStore::GetHasher()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2828
diff
changeset
|
844 ASSERT_EQ(hasher.HashSeries(), toStore.GetHasher().HashSeries()); |
e5e3253a1164
DicomInstanceToStore::GetHasher()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2828
diff
changeset
|
845 ASSERT_EQ(hasher.HashInstance(), toStore.GetHasher().HashInstance()); |
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
846 } |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
847 |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
848 index.ComputeStatistics(tmp); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
849 ASSERT_EQ(10, tmp["CountPatients"].asInt()); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
850 ASSERT_EQ(0, boost::lexical_cast<int>(tmp["TotalDiskSize"].asString())); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
851 |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
852 for (size_t i = 0; i < ids.size(); i++) |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
853 { |
2512
4dcafa8d6633
SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
854 FileInfo info(Toolbox::GenerateUuid(), FileContentType_Dicom, 1, "md5"); |
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
855 index.AddAttachment(info, ids[i]); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
856 |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
857 index.ComputeStatistics(tmp); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
858 ASSERT_GE(10, boost::lexical_cast<int>(tmp["TotalDiskSize"].asString())); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
859 } |
707
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
706
diff
changeset
|
860 |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
706
diff
changeset
|
861 // Because the DB is in memory, the SQLite index must not have been created |
2140 | 862 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
|
863 |
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1432
diff
changeset
|
864 context.Stop(); |
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
865 db.Close(); |
705 | 866 } |
1764 | 867 |
868 | |
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
869 TEST(ServerIndex, NormalizeIdentifier) |
1764 | 870 { |
2121 | 871 ASSERT_EQ("H^L.LO", ServerToolbox::NormalizeIdentifier(" Hé^l.LO %_ ")); |
872 ASSERT_EQ("1.2.840.113619.2.176.2025", ServerToolbox::NormalizeIdentifier(" 1.2.840.113619.2.176.2025 ")); | |
1764 | 873 } |
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
874 |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
875 |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
876 TEST(ServerIndex, Overwrite) |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
877 { |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
878 for (unsigned int i = 0; i < 2; i++) |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
879 { |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
880 bool overwrite = (i == 0); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
881 |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
882 MemoryStorageArea storage; |
3017
517fc4767ae0
renamed class DatabaseWrapper as SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3001
diff
changeset
|
883 SQLiteDatabaseWrapper db; // The SQLite DB is in memory |
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
884 db.Open(); |
2950
dc18d5804746
support of JobsHistorySize set to zero
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2924
diff
changeset
|
885 ServerContext context(db, storage, true /* running unit tests */, 10); |
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
886 context.SetupJobsEngine(true, false); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
887 context.SetCompressionEnabled(true); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
888 |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
889 DicomMap instance; |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
890 instance.SetValue(DICOM_TAG_PATIENT_ID, "patient", false); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
891 instance.SetValue(DICOM_TAG_PATIENT_NAME, "name", false); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
892 instance.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "study", false); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
893 instance.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, "series", false); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
894 instance.SetValue(DICOM_TAG_SOP_INSTANCE_UID, "sop", false); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
895 instance.SetValue(DICOM_TAG_SOP_CLASS_UID, "1.2.840.10008.5.1.4.1.1.1", false); // CR image |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
896 |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
897 DicomInstanceHasher hasher(instance); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
898 std::string id = hasher.HashInstance(); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
899 context.GetIndex().SetOverwriteInstances(overwrite); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
900 |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
901 Json::Value tmp; |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
902 context.GetIndex().ComputeStatistics(tmp); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
903 ASSERT_EQ(0, tmp["CountInstances"].asInt()); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
904 ASSERT_EQ(0, boost::lexical_cast<int>(tmp["TotalDiskSize"].asString())); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
905 |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
906 { |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
907 DicomInstanceToStore toStore; |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
908 toStore.SetSummary(instance); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
909 toStore.SetOrigin(DicomInstanceOrigin::FromPlugins()); |
2898
e5e3253a1164
DicomInstanceToStore::GetHasher()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2828
diff
changeset
|
910 ASSERT_EQ(id, toStore.GetHasher().HashInstance()); |
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
911 |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
912 std::string id2; |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
913 ASSERT_EQ(StoreStatus_Success, context.Store(id2, toStore)); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
914 ASSERT_EQ(id, id2); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
915 } |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
916 |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
917 FileInfo dicom1, json1; |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
918 ASSERT_TRUE(context.GetIndex().LookupAttachment(dicom1, id, FileContentType_Dicom)); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
919 ASSERT_TRUE(context.GetIndex().LookupAttachment(json1, id, FileContentType_DicomAsJson)); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
920 |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
921 context.GetIndex().ComputeStatistics(tmp); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
922 ASSERT_EQ(1, tmp["CountInstances"].asInt()); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
923 ASSERT_EQ(dicom1.GetCompressedSize() + json1.GetCompressedSize(), |
2828 | 924 boost::lexical_cast<size_t>(tmp["TotalDiskSize"].asString())); |
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
925 ASSERT_EQ(dicom1.GetUncompressedSize() + json1.GetUncompressedSize(), |
2828 | 926 boost::lexical_cast<size_t>(tmp["TotalUncompressedSize"].asString())); |
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
927 |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
928 context.ReadDicomAsJson(tmp, id); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
929 ASSERT_EQ("name", tmp["0010,0010"]["Value"].asString()); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
930 |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
931 { |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
932 ServerContext::DicomCacheLocker locker(context, id); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
933 std::string tmp; |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
934 locker.GetDicom().GetTagValue(tmp, DICOM_TAG_PATIENT_NAME); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
935 ASSERT_EQ("name", tmp); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
936 } |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
937 |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
938 { |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
939 DicomMap instance2; |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
940 instance2.Assign(instance); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
941 instance2.SetValue(DICOM_TAG_PATIENT_NAME, "overwritten", false); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
942 |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
943 DicomInstanceToStore toStore; |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
944 toStore.SetSummary(instance2); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
945 toStore.SetOrigin(DicomInstanceOrigin::FromPlugins()); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
946 |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
947 std::string id2; |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
948 ASSERT_EQ(overwrite ? StoreStatus_Success : StoreStatus_AlreadyStored, context.Store(id2, toStore)); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
949 ASSERT_EQ(id, id2); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
950 } |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
951 |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
952 FileInfo dicom2, json2; |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
953 ASSERT_TRUE(context.GetIndex().LookupAttachment(dicom2, id, FileContentType_Dicom)); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
954 ASSERT_TRUE(context.GetIndex().LookupAttachment(json2, id, FileContentType_DicomAsJson)); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
955 |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
956 context.GetIndex().ComputeStatistics(tmp); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
957 ASSERT_EQ(1, tmp["CountInstances"].asInt()); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
958 ASSERT_EQ(dicom2.GetCompressedSize() + json2.GetCompressedSize(), |
2828 | 959 boost::lexical_cast<size_t>(tmp["TotalDiskSize"].asString())); |
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
960 ASSERT_EQ(dicom2.GetUncompressedSize() + json2.GetUncompressedSize(), |
2828 | 961 boost::lexical_cast<size_t>(tmp["TotalUncompressedSize"].asString())); |
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
962 |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
963 if (overwrite) |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
964 { |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
965 ASSERT_NE(dicom1.GetUuid(), dicom2.GetUuid()); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
966 ASSERT_NE(json1.GetUuid(), json2.GetUuid()); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
967 ASSERT_NE(dicom1.GetUncompressedSize(), dicom2.GetUncompressedSize()); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
968 ASSERT_NE(json1.GetUncompressedSize(), json2.GetUncompressedSize()); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
969 |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
970 context.ReadDicomAsJson(tmp, id); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
971 ASSERT_EQ("overwritten", tmp["0010,0010"]["Value"].asString()); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
972 |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
973 { |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
974 ServerContext::DicomCacheLocker locker(context, id); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
975 std::string tmp; |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
976 locker.GetDicom().GetTagValue(tmp, DICOM_TAG_PATIENT_NAME); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
977 ASSERT_EQ("overwritten", tmp); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
978 } |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
979 } |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
980 else |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
981 { |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
982 ASSERT_EQ(dicom1.GetUuid(), dicom2.GetUuid()); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
983 ASSERT_EQ(json1.GetUuid(), json2.GetUuid()); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
984 ASSERT_EQ(dicom1.GetUncompressedSize(), dicom2.GetUncompressedSize()); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
985 ASSERT_EQ(json1.GetUncompressedSize(), json2.GetUncompressedSize()); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
986 |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
987 context.ReadDicomAsJson(tmp, id); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
988 ASSERT_EQ("name", tmp["0010,0010"]["Value"].asString()); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
989 |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
990 { |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
991 ServerContext::DicomCacheLocker locker(context, id); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
992 std::string tmp; |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
993 locker.GetDicom().GetTagValue(tmp, DICOM_TAG_PATIENT_NAME); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
994 ASSERT_EQ("name", tmp); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
995 } |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
996 } |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
997 |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
998 context.Stop(); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
999 db.Close(); |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
1000 } |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
1001 } |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
1002 |
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
1003 |