Mercurial > hg > orthanc
annotate UnitTestsSources/ServerIndexTests.cpp @ 2919:2ca9cd064b15
PamReader::ReadFromMemory
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 06 Nov 2018 15:41:21 +0100 |
| parents | e5e3253a1164 |
| children | 22524fd06225 |
| 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" |
| 705 | 41 #include "../OrthancServer/ServerContext.h" |
| 42 #include "../OrthancServer/ServerIndex.h" | |
| 1747 | 43 #include "../OrthancServer/Search/LookupIdentifierQuery.h" |
| 183 | 44 |
| 181 | 45 #include <ctype.h> |
| 521 | 46 #include <algorithm> |
| 181 | 47 |
| 183 | 48 using namespace Orthanc; |
| 181 | 49 |
| 183 | 50 namespace |
| 51 { | |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
52 enum DatabaseWrapperClass |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
53 { |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
54 DatabaseWrapperClass_SQLite |
|
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 |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
57 |
|
1432
0ac74fa21db8
rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1294
diff
changeset
|
58 class TestDatabaseListener : public IDatabaseListener |
| 181 | 59 { |
| 60 public: | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
61 std::vector<std::string> deletedFiles_; |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
62 std::vector<std::string> deletedResources_; |
| 183 | 63 std::string ancestorId_; |
| 64 ResourceType ancestorType_; | |
| 65 | |
| 66 void Reset() | |
| 181 | 67 { |
| 183 | 68 ancestorId_ = ""; |
| 69 deletedFiles_.clear(); | |
| 70 } | |
| 71 | |
| 72 virtual void SignalRemainingAncestor(ResourceType type, | |
| 73 const std::string& publicId) | |
| 74 { | |
| 75 ancestorId_ = publicId; | |
| 76 ancestorType_ = type; | |
| 181 | 77 } |
| 78 | |
|
273
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
79 virtual void SignalFileDeleted(const FileInfo& info) |
| 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 |
| 1198 | 86 virtual void SignalChange(const ServerIndexChange& change) |
|
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 |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
111 virtual void SetUp() |
|
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: | |
| 118 index_.reset(new DatabaseWrapper()); | |
| 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 |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
129 virtual void TearDown() |
|
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 { | |
| 142 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); | |
| 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 { | |
| 160 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); | |
| 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 { | |
| 178 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); | |
| 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 { | |
| 197 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); | |
| 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 { | |
| 216 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); | |
| 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 { | |
| 238 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); | |
| 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 | |
| 252 void DoLookup(std::list<std::string>& result, | |
| 253 ResourceType level, | |
| 254 const DicomTag& tag, | |
| 255 const std::string& value) | |
| 256 { | |
| 257 LookupIdentifierQuery query(level); | |
| 258 query.AddConstraint(tag, IdentifierConstraintType_Equal, value); | |
| 259 query.Apply(result, *index_); | |
| 260 } | |
| 261 | |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
262 }; |
| 181 | 263 } |
| 264 | |
| 265 | |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
266 INSTANTIATE_TEST_CASE_P(DatabaseWrapperName, |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
267 DatabaseWrapperTest, |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
268 ::testing::Values(DatabaseWrapperClass_SQLite)); |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
269 |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
270 |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
271 TEST_P(DatabaseWrapperTest, Simple) |
| 181 | 272 { |
| 273 int64_t a[] = { | |
| 738 | 274 index_->CreateResource("a", ResourceType_Patient), // 0 |
| 275 index_->CreateResource("b", ResourceType_Study), // 1 | |
| 276 index_->CreateResource("c", ResourceType_Series), // 2 | |
| 277 index_->CreateResource("d", ResourceType_Instance), // 3 | |
| 278 index_->CreateResource("e", ResourceType_Instance), // 4 | |
| 279 index_->CreateResource("f", ResourceType_Instance), // 5 | |
| 280 index_->CreateResource("g", ResourceType_Study) // 6 | |
| 181 | 281 }; |
| 282 | |
| 738 | 283 ASSERT_EQ("a", index_->GetPublicId(a[0])); |
| 284 ASSERT_EQ("b", index_->GetPublicId(a[1])); | |
| 285 ASSERT_EQ("c", index_->GetPublicId(a[2])); | |
| 286 ASSERT_EQ("d", index_->GetPublicId(a[3])); | |
| 287 ASSERT_EQ("e", index_->GetPublicId(a[4])); | |
| 288 ASSERT_EQ("f", index_->GetPublicId(a[5])); | |
| 289 ASSERT_EQ("g", index_->GetPublicId(a[6])); | |
|
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
290 |
| 738 | 291 ASSERT_EQ(ResourceType_Patient, index_->GetResourceType(a[0])); |
| 292 ASSERT_EQ(ResourceType_Study, index_->GetResourceType(a[1])); | |
| 293 ASSERT_EQ(ResourceType_Series, index_->GetResourceType(a[2])); | |
| 294 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[3])); | |
| 295 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[4])); | |
| 296 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[5])); | |
| 297 ASSERT_EQ(ResourceType_Study, index_->GetResourceType(a[6])); | |
| 304 | 298 |
| 190 | 299 { |
| 1241 | 300 std::list<std::string> t; |
| 738 | 301 index_->GetAllPublicIds(t, ResourceType_Patient); |
| 190 | 302 |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
303 ASSERT_EQ(1u, t.size()); |
| 1241 | 304 ASSERT_EQ("a", t.front()); |
| 190 | 305 |
| 738 | 306 index_->GetAllPublicIds(t, ResourceType_Series); |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
307 ASSERT_EQ(1u, t.size()); |
| 1241 | 308 ASSERT_EQ("c", t.front()); |
| 190 | 309 |
| 738 | 310 index_->GetAllPublicIds(t, ResourceType_Study); |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
311 ASSERT_EQ(2u, t.size()); |
| 190 | 312 |
| 738 | 313 index_->GetAllPublicIds(t, ResourceType_Instance); |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
314 ASSERT_EQ(3u, t.size()); |
| 190 | 315 } |
| 316 | |
| 738 | 317 index_->SetGlobalProperty(GlobalProperty_FlushSleep, "World"); |
| 181 | 318 |
| 738 | 319 index_->AttachChild(a[0], a[1]); |
| 320 index_->AttachChild(a[1], a[2]); | |
| 321 index_->AttachChild(a[2], a[3]); | |
| 322 index_->AttachChild(a[2], a[4]); | |
| 323 index_->AttachChild(a[6], a[5]); | |
| 182 | 324 |
|
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
325 int64_t parent; |
| 738 | 326 ASSERT_FALSE(index_->LookupParent(parent, a[0])); |
| 327 ASSERT_TRUE(index_->LookupParent(parent, a[1])); ASSERT_EQ(a[0], parent); | |
| 328 ASSERT_TRUE(index_->LookupParent(parent, a[2])); ASSERT_EQ(a[1], parent); | |
| 329 ASSERT_TRUE(index_->LookupParent(parent, a[3])); ASSERT_EQ(a[2], parent); | |
| 330 ASSERT_TRUE(index_->LookupParent(parent, a[4])); ASSERT_EQ(a[2], parent); | |
| 331 ASSERT_TRUE(index_->LookupParent(parent, a[5])); ASSERT_EQ(a[6], parent); | |
| 332 ASSERT_FALSE(index_->LookupParent(parent, a[6])); | |
|
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
333 |
| 182 | 334 std::string s; |
| 1286 | 335 |
| 1287 | 336 CheckNoParent(a[0]); |
| 337 CheckNoParent(a[6]); | |
| 338 CheckParentPublicId("a", a[1]); | |
| 339 CheckParentPublicId("b", a[2]); | |
| 340 CheckParentPublicId("c", a[3]); | |
| 341 CheckParentPublicId("c", a[4]); | |
| 342 CheckParentPublicId("g", a[5]); | |
| 182 | 343 |
| 185 | 344 std::list<std::string> l; |
| 738 | 345 index_->GetChildrenPublicId(l, a[0]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("b", l.front()); |
| 346 index_->GetChildrenPublicId(l, a[1]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("c", l.front()); | |
| 347 index_->GetChildrenPublicId(l, a[3]); ASSERT_EQ(0u, l.size()); | |
| 348 index_->GetChildrenPublicId(l, a[4]); ASSERT_EQ(0u, l.size()); | |
| 349 index_->GetChildrenPublicId(l, a[5]); ASSERT_EQ(0u, l.size()); | |
| 350 index_->GetChildrenPublicId(l, a[6]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("f", l.front()); | |
| 182 | 351 |
| 738 | 352 index_->GetChildrenPublicId(l, a[2]); ASSERT_EQ(2u, l.size()); |
| 182 | 353 if (l.front() == "d") |
| 354 { | |
| 355 ASSERT_EQ("e", l.back()); | |
| 356 } | |
| 357 else | |
| 358 { | |
| 359 ASSERT_EQ("d", l.back()); | |
| 360 ASSERT_EQ("e", l.front()); | |
| 361 } | |
| 362 | |
|
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
363 std::list<MetadataType> md; |
| 738 | 364 index_->ListAvailableMetadata(md, a[4]); |
|
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
365 ASSERT_EQ(0u, md.size()); |
|
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
366 |
| 738 | 367 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
|
368 CompressionType_ZlibWithSize, 21, "compressedMD5")); |
| 738 | 369 index_->AddAttachment(a[4], FileInfo("my dicom file", FileContentType_Dicom, 42, "md5")); |
| 370 index_->AddAttachment(a[6], FileInfo("world", FileContentType_Dicom, 44, "md5")); | |
| 371 index_->SetMetadata(a[4], MetadataType_Instance_RemoteAet, "PINNACLE"); | |
|
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
372 |
| 738 | 373 index_->ListAvailableMetadata(md, a[4]); |
|
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
374 ASSERT_EQ(1u, md.size()); |
|
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
375 ASSERT_EQ(MetadataType_Instance_RemoteAet, md.front()); |
| 738 | 376 index_->SetMetadata(a[4], MetadataType_ModifiedFrom, "TUTU"); |
| 377 index_->ListAvailableMetadata(md, a[4]); | |
| 438 | 378 ASSERT_EQ(2u, md.size()); |
| 1030 | 379 |
| 380 std::map<MetadataType, std::string> md2; | |
| 381 index_->GetAllMetadata(md2, a[4]); | |
| 382 ASSERT_EQ(2u, md2.size()); | |
| 383 ASSERT_EQ("TUTU", md2[MetadataType_ModifiedFrom]); | |
| 384 ASSERT_EQ("PINNACLE", md2[MetadataType_Instance_RemoteAet]); | |
| 385 | |
| 738 | 386 index_->DeleteMetadata(a[4], MetadataType_ModifiedFrom); |
| 387 index_->ListAvailableMetadata(md, a[4]); | |
| 438 | 388 ASSERT_EQ(1u, md.size()); |
| 389 ASSERT_EQ(MetadataType_Instance_RemoteAet, md.front()); | |
| 182 | 390 |
| 1030 | 391 index_->GetAllMetadata(md2, a[4]); |
| 392 ASSERT_EQ(1u, md2.size()); | |
| 393 ASSERT_EQ("PINNACLE", md2[MetadataType_Instance_RemoteAet]); | |
| 394 | |
| 395 | |
| 738 | 396 ASSERT_EQ(21u + 42u + 44u, index_->GetTotalCompressedSize()); |
| 397 ASSERT_EQ(42u + 42u + 44u, index_->GetTotalUncompressedSize()); | |
| 181 | 398 |
| 1286 | 399 index_->SetMainDicomTag(a[3], DicomTag(0x0010, 0x0010), "PatientName"); |
| 181 | 400 |
| 401 int64_t b; | |
| 402 ResourceType t; | |
| 1294 | 403 ASSERT_TRUE(index_->LookupResource(b, t, "g")); |
| 181 | 404 ASSERT_EQ(7, b); |
| 405 ASSERT_EQ(ResourceType_Study, t); | |
| 406 | |
| 738 | 407 ASSERT_TRUE(index_->LookupMetadata(s, a[4], MetadataType_Instance_RemoteAet)); |
| 408 ASSERT_FALSE(index_->LookupMetadata(s, a[4], MetadataType_Instance_IndexInSeries)); | |
| 181 | 409 ASSERT_EQ("PINNACLE", s); |
| 1238 | 410 |
| 411 std::string u; | |
| 412 ASSERT_TRUE(index_->LookupMetadata(u, a[4], MetadataType_Instance_RemoteAet)); | |
| 413 ASSERT_EQ("PINNACLE", u); | |
| 414 ASSERT_FALSE(index_->LookupMetadata(u, a[4], MetadataType_Instance_IndexInSeries)); | |
| 181 | 415 |
| 738 | 416 ASSERT_TRUE(index_->LookupGlobalProperty(s, GlobalProperty_FlushSleep)); |
| 417 ASSERT_FALSE(index_->LookupGlobalProperty(s, static_cast<GlobalProperty>(42))); | |
| 181 | 418 ASSERT_EQ("World", s); |
| 419 | |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
420 FileInfo att; |
| 738 | 421 ASSERT_TRUE(index_->LookupAttachment(att, a[4], FileContentType_DicomAsJson)); |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
422 ASSERT_EQ("my json file", att.GetUuid()); |
|
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
423 ASSERT_EQ(21u, att.GetCompressedSize()); |
|
693
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
424 ASSERT_EQ("md5", att.GetUncompressedMD5()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
425 ASSERT_EQ("compressedMD5", att.GetCompressedMD5()); |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
426 ASSERT_EQ(42u, att.GetUncompressedSize()); |
|
1514
d73a2178b319
support of deflate and gzip content-types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1492
diff
changeset
|
427 ASSERT_EQ(CompressionType_ZlibWithSize, att.GetCompressionType()); |
| 181 | 428 |
| 738 | 429 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
|
430 ASSERT_EQ("world", att.GetUuid()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
431 ASSERT_EQ(44u, att.GetCompressedSize()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
432 ASSERT_EQ("md5", att.GetUncompressedMD5()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
433 ASSERT_EQ("md5", att.GetCompressedMD5()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
434 ASSERT_EQ(44u, att.GetUncompressedSize()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
435 ASSERT_EQ(CompressionType_None, att.GetCompressionType()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
436 |
| 738 | 437 ASSERT_EQ(0u, listener_->deletedFiles_.size()); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
438 ASSERT_EQ(0u, listener_->deletedResources_.size()); |
| 1286 | 439 |
| 440 CheckTableRecordCount(7, "Resources"); | |
| 441 CheckTableRecordCount(3, "AttachedFiles"); | |
| 442 CheckTableRecordCount(1, "Metadata"); | |
| 443 CheckTableRecordCount(1, "MainDicomTags"); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
444 |
| 738 | 445 index_->DeleteResource(a[0]); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
446 ASSERT_EQ(5u, listener_->deletedResources_.size()); |
| 738 | 447 ASSERT_EQ(2u, listener_->deletedFiles_.size()); |
| 448 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(), | |
| 449 listener_->deletedFiles_.end(), | |
| 450 "my json file") == listener_->deletedFiles_.end()); | |
| 451 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(), | |
| 452 listener_->deletedFiles_.end(), | |
| 453 "my dicom file") == listener_->deletedFiles_.end()); | |
| 183 | 454 |
| 1286 | 455 CheckTableRecordCount(2, "Resources"); |
| 456 CheckTableRecordCount(0, "Metadata"); | |
| 457 CheckTableRecordCount(1, "AttachedFiles"); | |
| 458 CheckTableRecordCount(0, "MainDicomTags"); | |
| 459 | |
| 738 | 460 index_->DeleteResource(a[5]); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
461 ASSERT_EQ(7u, listener_->deletedResources_.size()); |
| 1286 | 462 |
| 463 CheckTableRecordCount(0, "Resources"); | |
| 464 CheckTableRecordCount(0, "AttachedFiles"); | |
| 465 CheckTableRecordCount(2, "GlobalProperties"); | |
| 183 | 466 |
| 738 | 467 ASSERT_EQ(3u, listener_->deletedFiles_.size()); |
| 468 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(), | |
| 469 listener_->deletedFiles_.end(), | |
| 470 "world") == listener_->deletedFiles_.end()); | |
| 183 | 471 } |
| 472 | |
| 473 | |
| 474 | |
| 475 | |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
476 TEST_P(DatabaseWrapperTest, Upward) |
| 183 | 477 { |
| 478 int64_t a[] = { | |
| 738 | 479 index_->CreateResource("a", ResourceType_Patient), // 0 |
| 480 index_->CreateResource("b", ResourceType_Study), // 1 | |
| 481 index_->CreateResource("c", ResourceType_Series), // 2 | |
| 482 index_->CreateResource("d", ResourceType_Instance), // 3 | |
| 483 index_->CreateResource("e", ResourceType_Instance), // 4 | |
| 484 index_->CreateResource("f", ResourceType_Study), // 5 | |
| 485 index_->CreateResource("g", ResourceType_Series), // 6 | |
| 486 index_->CreateResource("h", ResourceType_Series) // 7 | |
| 183 | 487 }; |
| 488 | |
| 738 | 489 index_->AttachChild(a[0], a[1]); |
| 490 index_->AttachChild(a[1], a[2]); | |
| 491 index_->AttachChild(a[2], a[3]); | |
| 492 index_->AttachChild(a[2], a[4]); | |
| 493 index_->AttachChild(a[1], a[6]); | |
| 494 index_->AttachChild(a[0], a[5]); | |
| 495 index_->AttachChild(a[5], a[7]); | |
| 183 | 496 |
| 1287 | 497 CheckTwoChildren("b", "f", a[0]); |
| 498 CheckTwoChildren("c", "g", a[1]); | |
| 499 CheckTwoChildren("d", "e", a[2]); | |
| 500 CheckNoChild(a[3]); | |
| 501 CheckNoChild(a[4]); | |
| 502 CheckOneChild("h", a[5]); | |
| 503 CheckNoChild(a[6]); | |
| 504 CheckNoChild(a[7]); | |
|
193
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
190
diff
changeset
|
505 |
| 738 | 506 listener_->Reset(); |
| 507 index_->DeleteResource(a[3]); | |
| 508 ASSERT_EQ("c", listener_->ancestorId_); | |
| 509 ASSERT_EQ(ResourceType_Series, listener_->ancestorType_); | |
| 183 | 510 |
| 738 | 511 listener_->Reset(); |
| 512 index_->DeleteResource(a[4]); | |
| 513 ASSERT_EQ("b", listener_->ancestorId_); | |
| 514 ASSERT_EQ(ResourceType_Study, listener_->ancestorType_); | |
| 183 | 515 |
| 738 | 516 listener_->Reset(); |
| 517 index_->DeleteResource(a[7]); | |
| 518 ASSERT_EQ("a", listener_->ancestorId_); | |
| 519 ASSERT_EQ(ResourceType_Patient, listener_->ancestorType_); | |
| 183 | 520 |
| 738 | 521 listener_->Reset(); |
| 522 index_->DeleteResource(a[6]); | |
| 523 ASSERT_EQ("", listener_->ancestorId_); // No more ancestor | |
| 181 | 524 } |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
525 |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
526 |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
527 TEST_P(DatabaseWrapperTest, PatientRecycling) |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
528 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
529 std::vector<int64_t> patients; |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
530 for (int i = 0; i < 10; i++) |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
531 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
532 std::string p = "Patient " + boost::lexical_cast<std::string>(i); |
| 738 | 533 patients.push_back(index_->CreateResource(p, ResourceType_Patient)); |
| 534 index_->AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10, | |
| 1287 | 535 "md5-" + boost::lexical_cast<std::string>(i))); |
| 738 | 536 ASSERT_FALSE(index_->IsProtectedPatient(patients[i])); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
537 } |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
538 |
| 1286 | 539 CheckTableRecordCount(10u, "Resources"); |
| 540 CheckTableRecordCount(10u, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
541 |
| 738 | 542 listener_->Reset(); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
543 ASSERT_EQ(0u, listener_->deletedResources_.size()); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
544 |
| 738 | 545 index_->DeleteResource(patients[5]); |
| 546 index_->DeleteResource(patients[0]); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
547 ASSERT_EQ(2u, listener_->deletedResources_.size()); |
| 1286 | 548 |
| 549 CheckTableRecordCount(8u, "Resources"); | |
| 550 CheckTableRecordCount(8u, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
551 |
| 738 | 552 ASSERT_EQ(2u, listener_->deletedFiles_.size()); |
| 553 ASSERT_EQ("Patient 5", listener_->deletedFiles_[0]); | |
| 554 ASSERT_EQ("Patient 0", listener_->deletedFiles_[1]); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
555 |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
556 int64_t p; |
| 738 | 557 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[1]); |
| 558 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
559 ASSERT_EQ(3u, listener_->deletedResources_.size()); |
| 738 | 560 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[2]); |
| 561 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
562 ASSERT_EQ(4u, listener_->deletedResources_.size()); |
| 738 | 563 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[3]); |
| 564 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
565 ASSERT_EQ(5u, listener_->deletedResources_.size()); |
| 738 | 566 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[4]); |
| 567 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
568 ASSERT_EQ(6u, listener_->deletedResources_.size()); |
| 738 | 569 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[6]); |
| 570 index_->DeleteResource(p); | |
| 571 index_->DeleteResource(patients[8]); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
572 ASSERT_EQ(8u, listener_->deletedResources_.size()); |
| 738 | 573 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[7]); |
| 574 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
575 ASSERT_EQ(9u, listener_->deletedResources_.size()); |
| 738 | 576 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[9]); |
| 577 index_->DeleteResource(p); | |
| 578 ASSERT_FALSE(index_->SelectPatientToRecycle(p)); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
579 ASSERT_EQ(10u, listener_->deletedResources_.size()); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
580 |
| 738 | 581 ASSERT_EQ(10u, listener_->deletedFiles_.size()); |
| 1286 | 582 |
| 583 CheckTableRecordCount(0, "Resources"); | |
| 584 CheckTableRecordCount(0, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
585 } |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
586 |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
587 |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
588 TEST_P(DatabaseWrapperTest, PatientProtection) |
|
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 std::vector<int64_t> patients; |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
591 for (int i = 0; i < 5; i++) |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
592 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
593 std::string p = "Patient " + boost::lexical_cast<std::string>(i); |
| 738 | 594 patients.push_back(index_->CreateResource(p, ResourceType_Patient)); |
| 595 index_->AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10, | |
| 1287 | 596 "md5-" + boost::lexical_cast<std::string>(i))); |
| 738 | 597 ASSERT_FALSE(index_->IsProtectedPatient(patients[i])); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
598 } |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
599 |
| 1286 | 600 CheckTableRecordCount(5, "Resources"); |
| 601 CheckTableRecordCount(5, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
602 |
| 738 | 603 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); |
| 604 index_->SetProtectedPatient(patients[2], true); | |
| 605 ASSERT_TRUE(index_->IsProtectedPatient(patients[2])); | |
| 1286 | 606 CheckTableRecordCount(5, "Resources"); |
| 607 CheckTableRecordCount(4, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
608 |
| 738 | 609 index_->SetProtectedPatient(patients[2], true); |
| 610 ASSERT_TRUE(index_->IsProtectedPatient(patients[2])); | |
| 1286 | 611 CheckTableRecordCount(4, "PatientRecyclingOrder"); |
| 738 | 612 index_->SetProtectedPatient(patients[2], false); |
| 613 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); | |
| 1286 | 614 CheckTableRecordCount(5, "PatientRecyclingOrder"); |
| 738 | 615 index_->SetProtectedPatient(patients[2], false); |
| 616 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); | |
| 1286 | 617 CheckTableRecordCount(5, "PatientRecyclingOrder"); |
| 618 CheckTableRecordCount(5, "Resources"); | |
| 738 | 619 index_->SetProtectedPatient(patients[2], true); |
| 620 ASSERT_TRUE(index_->IsProtectedPatient(patients[2])); | |
| 1286 | 621 CheckTableRecordCount(4, "PatientRecyclingOrder"); |
| 738 | 622 index_->SetProtectedPatient(patients[2], false); |
| 623 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); | |
| 1286 | 624 CheckTableRecordCount(5, "PatientRecyclingOrder"); |
| 738 | 625 index_->SetProtectedPatient(patients[3], true); |
| 626 ASSERT_TRUE(index_->IsProtectedPatient(patients[3])); | |
| 1286 | 627 CheckTableRecordCount(4, "PatientRecyclingOrder"); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
628 |
| 1286 | 629 CheckTableRecordCount(5, "Resources"); |
| 738 | 630 ASSERT_EQ(0u, listener_->deletedFiles_.size()); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
631 |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
632 // 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
|
633 int64_t p; |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
634 ASSERT_EQ(0u, listener_->deletedResources_.size()); |
| 738 | 635 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[0]); |
| 636 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
637 ASSERT_EQ(1u, listener_->deletedResources_.size()); |
| 738 | 638 ASSERT_TRUE(index_->SelectPatientToRecycle(p, patients[1])); ASSERT_EQ(p, patients[4]); |
| 639 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[1]); | |
| 640 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
641 ASSERT_EQ(2u, listener_->deletedResources_.size()); |
| 738 | 642 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[4]); |
| 643 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
644 ASSERT_EQ(3u, listener_->deletedResources_.size()); |
| 738 | 645 ASSERT_FALSE(index_->SelectPatientToRecycle(p, patients[2])); |
| 646 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[2]); | |
| 647 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
648 ASSERT_EQ(4u, listener_->deletedResources_.size()); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
649 // "patients[3]" is still protected |
| 738 | 650 ASSERT_FALSE(index_->SelectPatientToRecycle(p)); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
651 |
| 738 | 652 ASSERT_EQ(4u, listener_->deletedFiles_.size()); |
| 1286 | 653 CheckTableRecordCount(1, "Resources"); |
| 654 CheckTableRecordCount(0, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
655 |
| 738 | 656 index_->SetProtectedPatient(patients[3], false); |
| 1286 | 657 CheckTableRecordCount(1, "PatientRecyclingOrder"); |
| 738 | 658 ASSERT_FALSE(index_->SelectPatientToRecycle(p, patients[3])); |
| 659 ASSERT_TRUE(index_->SelectPatientToRecycle(p, patients[2])); | |
| 660 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[3]); | |
| 661 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
662 ASSERT_EQ(5u, listener_->deletedResources_.size()); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
663 |
| 738 | 664 ASSERT_EQ(5u, listener_->deletedFiles_.size()); |
| 1286 | 665 CheckTableRecordCount(0, "Resources"); |
| 666 CheckTableRecordCount(0, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
667 } |
| 310 | 668 |
| 669 | |
| 670 | |
| 1237 | 671 TEST(ServerIndex, Sequence) |
| 310 | 672 { |
| 1237 | 673 const std::string path = "UnitTestsStorage"; |
| 674 | |
| 2140 | 675 SystemToolbox::RemoveFile(path + "/index"); |
| 1237 | 676 FilesystemStorage storage(path); |
| 1247 | 677 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
|
678 db.Open(); |
|
2815
925d8dc03a23
unserialization of jobs from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2671
diff
changeset
|
679 ServerContext context(db, storage, true /* running unit tests */); |
|
925d8dc03a23
unserialization of jobs from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2671
diff
changeset
|
680 context.SetupJobsEngine(true, false); |
|
925d8dc03a23
unserialization of jobs from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2671
diff
changeset
|
681 |
| 1237 | 682 ServerIndex& index = context.GetIndex(); |
| 683 | |
| 684 ASSERT_EQ(1u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
| 685 ASSERT_EQ(2u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
| 686 ASSERT_EQ(3u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
| 687 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
|
688 |
|
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1432
diff
changeset
|
689 context.Stop(); |
|
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
690 db.Close(); |
| 310 | 691 } |
| 521 | 692 |
| 693 | |
| 694 | |
| 1162 | 695 TEST_P(DatabaseWrapperTest, LookupIdentifier) |
| 521 | 696 { |
| 697 int64_t a[] = { | |
| 738 | 698 index_->CreateResource("a", ResourceType_Study), // 0 |
| 699 index_->CreateResource("b", ResourceType_Study), // 1 | |
| 700 index_->CreateResource("c", ResourceType_Study), // 2 | |
| 701 index_->CreateResource("d", ResourceType_Series) // 3 | |
| 521 | 702 }; |
| 703 | |
| 1713 | 704 index_->SetIdentifierTag(a[0], DICOM_TAG_STUDY_INSTANCE_UID, "0"); |
| 705 index_->SetIdentifierTag(a[1], DICOM_TAG_STUDY_INSTANCE_UID, "1"); | |
| 706 index_->SetIdentifierTag(a[2], DICOM_TAG_STUDY_INSTANCE_UID, "0"); | |
| 707 index_->SetIdentifierTag(a[3], DICOM_TAG_SERIES_INSTANCE_UID, "0"); | |
| 521 | 708 |
| 1746 | 709 std::list<std::string> s; |
| 521 | 710 |
| 1746 | 711 DoLookup(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, "0"); |
| 521 | 712 ASSERT_EQ(2u, s.size()); |
| 1746 | 713 ASSERT_TRUE(std::find(s.begin(), s.end(), "a") != s.end()); |
| 714 ASSERT_TRUE(std::find(s.begin(), s.end(), "c") != s.end()); | |
| 521 | 715 |
| 1746 | 716 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
|
717 ASSERT_EQ(1u, s.size()); |
| 1746 | 718 ASSERT_TRUE(std::find(s.begin(), s.end(), "d") != s.end()); |
| 521 | 719 |
| 1746 | 720 DoLookup(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, "1"); |
| 521 | 721 ASSERT_EQ(1u, s.size()); |
| 1746 | 722 ASSERT_TRUE(std::find(s.begin(), s.end(), "b") != s.end()); |
| 521 | 723 |
| 1746 | 724 DoLookup(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, "1"); |
| 521 | 725 ASSERT_EQ(1u, s.size()); |
| 1746 | 726 ASSERT_TRUE(std::find(s.begin(), s.end(), "b") != s.end()); |
| 521 | 727 |
| 1746 | 728 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
|
729 ASSERT_EQ(0u, s.size()); |
| 521 | 730 |
| 1746 | 731 { |
| 732 LookupIdentifierQuery query(ResourceType_Study); | |
| 733 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_GreaterOrEqual, "0"); | |
| 734 query.Apply(s, *index_); | |
| 735 ASSERT_EQ(3u, s.size()); | |
| 736 } | |
| 737 | |
| 738 { | |
| 739 LookupIdentifierQuery query(ResourceType_Study); | |
| 740 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_GreaterOrEqual, "0"); | |
| 741 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_SmallerOrEqual, "0"); | |
| 742 query.Apply(s, *index_); | |
| 743 ASSERT_EQ(2u, s.size()); | |
| 744 } | |
| 745 | |
| 746 { | |
| 747 LookupIdentifierQuery query(ResourceType_Study); | |
| 748 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_GreaterOrEqual, "1"); | |
| 749 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_SmallerOrEqual, "1"); | |
| 750 query.Apply(s, *index_); | |
| 751 ASSERT_EQ(1u, s.size()); | |
| 752 } | |
| 753 | |
| 754 { | |
| 755 LookupIdentifierQuery query(ResourceType_Study); | |
| 756 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_GreaterOrEqual, "1"); | |
| 757 query.Apply(s, *index_); | |
| 758 ASSERT_EQ(1u, s.size()); | |
| 759 } | |
| 760 | |
| 761 { | |
| 762 LookupIdentifierQuery query(ResourceType_Study); | |
| 763 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_GreaterOrEqual, "2"); | |
| 764 query.Apply(s, *index_); | |
| 765 ASSERT_EQ(0u, s.size()); | |
| 766 } | |
|
562
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
767 } |
| 705 | 768 |
| 769 | |
| 770 | |
|
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
771 TEST(ServerIndex, AttachmentRecycling) |
| 705 | 772 { |
|
803
4689e400e0fa
directory to store the results of the unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
738
diff
changeset
|
773 const std::string path = "UnitTestsStorage"; |
|
1124
790ff7a5b3bf
IStorageArea abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1030
diff
changeset
|
774 |
| 2140 | 775 SystemToolbox::RemoveFile(path + "/index"); |
|
1124
790ff7a5b3bf
IStorageArea abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1030
diff
changeset
|
776 FilesystemStorage storage(path); |
| 1247 | 777 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
|
778 db.Open(); |
|
2815
925d8dc03a23
unserialization of jobs from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2671
diff
changeset
|
779 ServerContext context(db, storage, true /* running unit tests */); |
|
925d8dc03a23
unserialization of jobs from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2671
diff
changeset
|
780 context.SetupJobsEngine(true, false); |
| 705 | 781 ServerIndex& index = context.GetIndex(); |
|
707
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
706
diff
changeset
|
782 |
| 706 | 783 index.SetMaximumStorageSize(10); |
| 784 | |
| 705 | 785 Json::Value tmp; |
| 786 index.ComputeStatistics(tmp); | |
|
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
787 ASSERT_EQ(0, tmp["CountPatients"].asInt()); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
788 ASSERT_EQ(0, boost::lexical_cast<int>(tmp["TotalDiskSize"].asString())); |
| 705 | 789 |
| 790 ServerIndex::Attachments attachments; | |
| 791 | |
|
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
792 std::vector<std::string> ids; |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
793 for (int i = 0; i < 10; i++) |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
794 { |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
795 std::string id = boost::lexical_cast<std::string>(i); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
796 DicomMap instance; |
|
2007
655489d9165d
DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1971
diff
changeset
|
797 instance.SetValue(DICOM_TAG_PATIENT_ID, "patient-" + id, false); |
|
655489d9165d
DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1971
diff
changeset
|
798 instance.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "study-" + id, false); |
|
655489d9165d
DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1971
diff
changeset
|
799 instance.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, "series-" + id, false); |
|
655489d9165d
DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1971
diff
changeset
|
800 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
|
801 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
|
802 |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
803 std::map<MetadataType, std::string> instanceMetadata; |
| 1822 | 804 DicomInstanceToStore toStore; |
| 805 toStore.SetSummary(instance); | |
| 806 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
|
807 ASSERT_EQ(5u, instanceMetadata.size()); |
| 1029 | 808 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_RemoteAet) != instanceMetadata.end()); |
| 809 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_ReceptionDate) != instanceMetadata.end()); | |
| 2190 | 810 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
|
811 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_SopClassUid) != instanceMetadata.end()); |
| 2190 | 812 |
| 813 // By default, an Explicit VR Little Endian is used by Orthanc | |
| 814 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
|
815 |
|
2208
90ea60bee5ff
New metadata automatically computed at the instance level: "SopClassUid"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2190
diff
changeset
|
816 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
|
817 |
|
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
818 DicomInstanceHasher hasher(instance); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
819 ids.push_back(hasher.HashPatient()); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
820 ids.push_back(hasher.HashStudy()); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
821 ids.push_back(hasher.HashSeries()); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
822 ids.push_back(hasher.HashInstance()); |
|
2898
e5e3253a1164
DicomInstanceToStore::GetHasher()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2828
diff
changeset
|
823 |
|
e5e3253a1164
DicomInstanceToStore::GetHasher()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2828
diff
changeset
|
824 ASSERT_EQ(hasher.HashPatient(), toStore.GetHasher().HashPatient()); |
|
e5e3253a1164
DicomInstanceToStore::GetHasher()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2828
diff
changeset
|
825 ASSERT_EQ(hasher.HashStudy(), toStore.GetHasher().HashStudy()); |
|
e5e3253a1164
DicomInstanceToStore::GetHasher()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2828
diff
changeset
|
826 ASSERT_EQ(hasher.HashSeries(), toStore.GetHasher().HashSeries()); |
|
e5e3253a1164
DicomInstanceToStore::GetHasher()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2828
diff
changeset
|
827 ASSERT_EQ(hasher.HashInstance(), toStore.GetHasher().HashInstance()); |
|
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
828 } |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
829 |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
830 index.ComputeStatistics(tmp); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
831 ASSERT_EQ(10, tmp["CountPatients"].asInt()); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
832 ASSERT_EQ(0, boost::lexical_cast<int>(tmp["TotalDiskSize"].asString())); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
833 |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
834 for (size_t i = 0; i < ids.size(); i++) |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
835 { |
|
2512
4dcafa8d6633
SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
836 FileInfo info(Toolbox::GenerateUuid(), FileContentType_Dicom, 1, "md5"); |
|
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
837 index.AddAttachment(info, ids[i]); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
838 |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
839 index.ComputeStatistics(tmp); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
840 ASSERT_GE(10, boost::lexical_cast<int>(tmp["TotalDiskSize"].asString())); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
841 } |
|
707
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
706
diff
changeset
|
842 |
|
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
706
diff
changeset
|
843 // Because the DB is in memory, the SQLite index must not have been created |
| 2140 | 844 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
|
845 |
|
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1432
diff
changeset
|
846 context.Stop(); |
|
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
847 db.Close(); |
| 705 | 848 } |
| 1764 | 849 |
| 850 | |
| 851 TEST(LookupIdentifierQuery, NormalizeIdentifier) | |
| 852 { | |
| 2121 | 853 ASSERT_EQ("H^L.LO", ServerToolbox::NormalizeIdentifier(" Hé^l.LO %_ ")); |
| 854 ASSERT_EQ("1.2.840.113619.2.176.2025", ServerToolbox::NormalizeIdentifier(" 1.2.840.113619.2.176.2025 ")); | |
| 1764 | 855 } |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
856 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
857 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
858 TEST(ServerIndex, Overwrite) |
|
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 for (unsigned int i = 0; i < 2; i++) |
|
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 bool overwrite = (i == 0); |
|
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 MemoryStorageArea storage; |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
865 DatabaseWrapper db; // The SQLite DB is in memory |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
866 db.Open(); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
867 ServerContext context(db, storage, true /* running unit tests */); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
868 context.SetupJobsEngine(true, false); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
869 context.SetCompressionEnabled(true); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
870 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
871 DicomMap instance; |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
872 instance.SetValue(DICOM_TAG_PATIENT_ID, "patient", false); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
873 instance.SetValue(DICOM_TAG_PATIENT_NAME, "name", false); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
874 instance.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "study", false); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
875 instance.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, "series", false); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
876 instance.SetValue(DICOM_TAG_SOP_INSTANCE_UID, "sop", false); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
877 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
|
878 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
879 DicomInstanceHasher hasher(instance); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
880 std::string id = hasher.HashInstance(); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
881 context.GetIndex().SetOverwriteInstances(overwrite); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
882 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
883 Json::Value tmp; |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
884 context.GetIndex().ComputeStatistics(tmp); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
885 ASSERT_EQ(0, tmp["CountInstances"].asInt()); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
886 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
|
887 |
|
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 DicomInstanceToStore toStore; |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
890 toStore.SetSummary(instance); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
891 toStore.SetOrigin(DicomInstanceOrigin::FromPlugins()); |
|
2898
e5e3253a1164
DicomInstanceToStore::GetHasher()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2828
diff
changeset
|
892 ASSERT_EQ(id, toStore.GetHasher().HashInstance()); |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
893 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
894 std::string id2; |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
895 ASSERT_EQ(StoreStatus_Success, context.Store(id2, toStore)); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
896 ASSERT_EQ(id, id2); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
897 } |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
898 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
899 FileInfo dicom1, json1; |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
900 ASSERT_TRUE(context.GetIndex().LookupAttachment(dicom1, id, FileContentType_Dicom)); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
901 ASSERT_TRUE(context.GetIndex().LookupAttachment(json1, id, FileContentType_DicomAsJson)); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
902 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
903 context.GetIndex().ComputeStatistics(tmp); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
904 ASSERT_EQ(1, tmp["CountInstances"].asInt()); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
905 ASSERT_EQ(dicom1.GetCompressedSize() + json1.GetCompressedSize(), |
| 2828 | 906 boost::lexical_cast<size_t>(tmp["TotalDiskSize"].asString())); |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
907 ASSERT_EQ(dicom1.GetUncompressedSize() + json1.GetUncompressedSize(), |
| 2828 | 908 boost::lexical_cast<size_t>(tmp["TotalUncompressedSize"].asString())); |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
909 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
910 context.ReadDicomAsJson(tmp, id); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
911 ASSERT_EQ("name", tmp["0010,0010"]["Value"].asString()); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
912 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
913 { |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
914 ServerContext::DicomCacheLocker locker(context, id); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
915 std::string tmp; |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
916 locker.GetDicom().GetTagValue(tmp, DICOM_TAG_PATIENT_NAME); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
917 ASSERT_EQ("name", tmp); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
918 } |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
919 |
|
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 DicomMap instance2; |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
922 instance2.Assign(instance); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
923 instance2.SetValue(DICOM_TAG_PATIENT_NAME, "overwritten", false); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
924 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
925 DicomInstanceToStore toStore; |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
926 toStore.SetSummary(instance2); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
927 toStore.SetOrigin(DicomInstanceOrigin::FromPlugins()); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
928 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
929 std::string id2; |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
930 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
|
931 ASSERT_EQ(id, id2); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
932 } |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
933 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
934 FileInfo dicom2, json2; |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
935 ASSERT_TRUE(context.GetIndex().LookupAttachment(dicom2, id, FileContentType_Dicom)); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
936 ASSERT_TRUE(context.GetIndex().LookupAttachment(json2, id, FileContentType_DicomAsJson)); |
|
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 context.GetIndex().ComputeStatistics(tmp); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
939 ASSERT_EQ(1, tmp["CountInstances"].asInt()); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
940 ASSERT_EQ(dicom2.GetCompressedSize() + json2.GetCompressedSize(), |
| 2828 | 941 boost::lexical_cast<size_t>(tmp["TotalDiskSize"].asString())); |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
942 ASSERT_EQ(dicom2.GetUncompressedSize() + json2.GetUncompressedSize(), |
| 2828 | 943 boost::lexical_cast<size_t>(tmp["TotalUncompressedSize"].asString())); |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
944 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
945 if (overwrite) |
|
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 ASSERT_NE(dicom1.GetUuid(), dicom2.GetUuid()); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
948 ASSERT_NE(json1.GetUuid(), json2.GetUuid()); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
949 ASSERT_NE(dicom1.GetUncompressedSize(), dicom2.GetUncompressedSize()); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
950 ASSERT_NE(json1.GetUncompressedSize(), json2.GetUncompressedSize()); |
|
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 context.ReadDicomAsJson(tmp, id); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
953 ASSERT_EQ("overwritten", tmp["0010,0010"]["Value"].asString()); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
954 |
|
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 ServerContext::DicomCacheLocker locker(context, id); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
957 std::string tmp; |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
958 locker.GetDicom().GetTagValue(tmp, DICOM_TAG_PATIENT_NAME); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
959 ASSERT_EQ("overwritten", tmp); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
960 } |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
961 } |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
962 else |
|
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 ASSERT_EQ(dicom1.GetUuid(), dicom2.GetUuid()); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
965 ASSERT_EQ(json1.GetUuid(), json2.GetUuid()); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
966 ASSERT_EQ(dicom1.GetUncompressedSize(), dicom2.GetUncompressedSize()); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
967 ASSERT_EQ(json1.GetUncompressedSize(), json2.GetUncompressedSize()); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
968 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
969 context.ReadDicomAsJson(tmp, id); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
970 ASSERT_EQ("name", tmp["0010,0010"]["Value"].asString()); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
971 |
|
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 ServerContext::DicomCacheLocker locker(context, id); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
974 std::string tmp; |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
975 locker.GetDicom().GetTagValue(tmp, DICOM_TAG_PATIENT_NAME); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
976 ASSERT_EQ("name", tmp); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
977 } |
|
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 context.Stop(); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
981 db.Close(); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
982 } |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
983 } |
|
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 |