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