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