Mercurial > hg > orthanc
annotate UnitTestsSources/ServerIndexTests.cpp @ 2222:21713ce8717b
Fix handling of Move Originator AET and ID in C-MOVE SCP
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 13 Dec 2016 14:34:33 +0100 |
| parents | 90ea60bee5ff |
| children | a3a65de1840f |
| 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 |
|
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/FileStorage/FilesystemStorage.h" |
|
f967bdf8534e
refactoring to Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1453
diff
changeset
|
37 #include "../Core/Logging.h" |
| 183 | 38 #include "../OrthancServer/DatabaseWrapper.h" |
| 705 | 39 #include "../OrthancServer/ServerContext.h" |
| 40 #include "../OrthancServer/ServerIndex.h" | |
| 1747 | 41 #include "../OrthancServer/Search/LookupIdentifierQuery.h" |
| 183 | 42 |
| 181 | 43 #include <ctype.h> |
| 521 | 44 #include <algorithm> |
| 181 | 45 |
| 183 | 46 using namespace Orthanc; |
| 181 | 47 |
| 183 | 48 namespace |
| 49 { | |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
50 enum DatabaseWrapperClass |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
51 { |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
52 DatabaseWrapperClass_SQLite |
|
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 |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
55 |
|
1432
0ac74fa21db8
rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1294
diff
changeset
|
56 class TestDatabaseListener : public IDatabaseListener |
| 181 | 57 { |
| 58 public: | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
59 std::vector<std::string> deletedFiles_; |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
60 std::vector<std::string> deletedResources_; |
| 183 | 61 std::string ancestorId_; |
| 62 ResourceType ancestorType_; | |
| 63 | |
| 64 void Reset() | |
| 181 | 65 { |
| 183 | 66 ancestorId_ = ""; |
| 67 deletedFiles_.clear(); | |
| 68 } | |
| 69 | |
| 70 virtual void SignalRemainingAncestor(ResourceType type, | |
| 71 const std::string& publicId) | |
| 72 { | |
| 73 ancestorId_ = publicId; | |
| 74 ancestorType_ = type; | |
| 181 | 75 } |
| 76 | |
|
273
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
77 virtual void SignalFileDeleted(const FileInfo& info) |
| 181 | 78 { |
|
273
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
79 const std::string fileUuid = info.GetUuid(); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
80 deletedFiles_.push_back(fileUuid); |
| 181 | 81 LOG(INFO) << "A file must be removed: " << fileUuid; |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
82 } |
|
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
83 |
| 1198 | 84 virtual void SignalChange(const ServerIndexChange& change) |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
85 { |
| 1198 | 86 if (change.GetChangeType() == ChangeType_Deleted) |
|
1177
5b2d8c280ac2
Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
87 { |
| 1198 | 88 deletedResources_.push_back(change.GetPublicId()); |
|
1177
5b2d8c280ac2
Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
89 } |
|
5b2d8c280ac2
Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
90 |
| 1198 | 91 LOG(INFO) << "Change related to resource " << change.GetPublicId() << " of type " |
| 92 << EnumerationToString(change.GetResourceType()) << ": " | |
| 93 << EnumerationToString(change.GetChangeType()); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
94 } |
|
1177
5b2d8c280ac2
Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
95 |
| 181 | 96 }; |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
97 |
|
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 class DatabaseWrapperTest : public ::testing::TestWithParam<DatabaseWrapperClass> |
|
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 protected: |
|
1432
0ac74fa21db8
rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1294
diff
changeset
|
102 std::auto_ptr<TestDatabaseListener> listener_; |
| 1252 | 103 std::auto_ptr<IDatabaseWrapper> index_; |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
104 |
| 738 | 105 DatabaseWrapperTest() |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
106 { |
|
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 virtual void SetUp() |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
110 { |
|
1432
0ac74fa21db8
rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1294
diff
changeset
|
111 listener_.reset(new TestDatabaseListener); |
| 1287 | 112 |
| 113 switch (GetParam()) | |
| 114 { | |
| 115 case DatabaseWrapperClass_SQLite: | |
| 116 index_.reset(new DatabaseWrapper()); | |
| 117 break; | |
| 118 | |
| 119 default: | |
| 120 throw OrthancException(ErrorCode_InternalError); | |
| 121 } | |
| 122 | |
| 1247 | 123 index_->SetListener(*listener_); |
|
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
124 index_->Open(); |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
125 } |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
126 |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
127 virtual void TearDown() |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
128 { |
|
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
129 index_->Close(); |
| 738 | 130 index_.reset(NULL); |
| 131 listener_.reset(NULL); | |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
132 } |
| 1286 | 133 |
| 134 void CheckTableRecordCount(uint32_t expected, const char* table) | |
| 135 { | |
| 1287 | 136 switch (GetParam()) |
| 137 { | |
| 138 case DatabaseWrapperClass_SQLite: | |
| 139 { | |
| 140 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); | |
| 141 ASSERT_EQ(expected, sqlite->GetTableRecordCount(table)); | |
| 142 break; | |
| 143 } | |
| 144 | |
| 145 default: | |
| 146 throw OrthancException(ErrorCode_InternalError); | |
| 147 } | |
| 148 } | |
| 149 | |
| 150 void CheckNoParent(int64_t id) | |
| 151 { | |
| 152 std::string s; | |
| 153 | |
| 154 switch (GetParam()) | |
| 1286 | 155 { |
| 1287 | 156 case DatabaseWrapperClass_SQLite: |
| 157 { | |
| 158 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); | |
| 159 ASSERT_FALSE(sqlite->GetParentPublicId(s, id)); | |
| 160 break; | |
| 161 } | |
| 162 | |
| 163 default: | |
| 164 throw OrthancException(ErrorCode_InternalError); | |
| 165 } | |
| 166 } | |
| 167 | |
| 168 void CheckParentPublicId(const char* expected, int64_t id) | |
| 169 { | |
| 170 std::string s; | |
| 171 | |
| 172 switch (GetParam()) | |
| 173 { | |
| 174 case DatabaseWrapperClass_SQLite: | |
| 175 { | |
| 176 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); | |
| 177 ASSERT_TRUE(sqlite->GetParentPublicId(s, id)); | |
| 178 ASSERT_EQ(expected, s); | |
| 179 break; | |
| 180 } | |
| 181 | |
| 182 default: | |
| 183 throw OrthancException(ErrorCode_InternalError); | |
| 1286 | 184 } |
| 185 } | |
| 186 | |
| 1287 | 187 void CheckNoChild(int64_t id) |
| 188 { | |
| 189 std::list<std::string> j; | |
| 190 | |
| 191 switch (GetParam()) | |
| 192 { | |
| 193 case DatabaseWrapperClass_SQLite: | |
| 194 { | |
| 195 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); | |
| 196 sqlite->GetChildren(j, id); | |
| 1492 | 197 ASSERT_EQ(0u, j.size()); |
| 1287 | 198 break; |
| 199 } | |
| 200 | |
| 201 default: | |
| 202 throw OrthancException(ErrorCode_InternalError); | |
| 203 } | |
| 204 } | |
| 205 | |
| 206 void CheckOneChild(const char* expected, int64_t id) | |
| 207 { | |
| 208 std::list<std::string> j; | |
| 209 | |
| 210 switch (GetParam()) | |
| 211 { | |
| 212 case DatabaseWrapperClass_SQLite: | |
| 213 { | |
| 214 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); | |
| 215 sqlite->GetChildren(j, id); | |
| 1492 | 216 ASSERT_EQ(1u, j.size()); |
| 1287 | 217 ASSERT_EQ(expected, j.front()); |
| 218 break; | |
| 219 } | |
| 220 | |
| 221 default: | |
| 222 throw OrthancException(ErrorCode_InternalError); | |
| 223 } | |
| 224 } | |
| 225 | |
| 226 void CheckTwoChildren(const char* expected1, | |
| 227 const char* expected2, | |
| 228 int64_t id) | |
| 229 { | |
| 230 std::list<std::string> j; | |
| 231 | |
| 232 switch (GetParam()) | |
| 233 { | |
| 234 case DatabaseWrapperClass_SQLite: | |
| 235 { | |
| 236 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); | |
| 237 sqlite->GetChildren(j, id); | |
| 1492 | 238 ASSERT_EQ(2u, j.size()); |
| 1287 | 239 ASSERT_TRUE((expected1 == j.front() && expected2 == j.back()) || |
| 240 (expected1 == j.back() && expected2 == j.front())); | |
| 241 break; | |
| 242 } | |
| 243 | |
| 244 default: | |
| 245 throw OrthancException(ErrorCode_InternalError); | |
| 246 } | |
| 247 } | |
| 1746 | 248 |
| 249 | |
| 250 void DoLookup(std::list<std::string>& result, | |
| 251 ResourceType level, | |
| 252 const DicomTag& tag, | |
| 253 const std::string& value) | |
| 254 { | |
| 255 LookupIdentifierQuery query(level); | |
| 256 query.AddConstraint(tag, IdentifierConstraintType_Equal, value); | |
| 257 query.Apply(result, *index_); | |
| 258 } | |
| 259 | |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
260 }; |
| 181 | 261 } |
| 262 | |
| 263 | |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
264 INSTANTIATE_TEST_CASE_P(DatabaseWrapperName, |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
265 DatabaseWrapperTest, |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
266 ::testing::Values(DatabaseWrapperClass_SQLite)); |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
267 |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
268 |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
269 TEST_P(DatabaseWrapperTest, Simple) |
| 181 | 270 { |
| 271 int64_t a[] = { | |
| 738 | 272 index_->CreateResource("a", ResourceType_Patient), // 0 |
| 273 index_->CreateResource("b", ResourceType_Study), // 1 | |
| 274 index_->CreateResource("c", ResourceType_Series), // 2 | |
| 275 index_->CreateResource("d", ResourceType_Instance), // 3 | |
| 276 index_->CreateResource("e", ResourceType_Instance), // 4 | |
| 277 index_->CreateResource("f", ResourceType_Instance), // 5 | |
| 278 index_->CreateResource("g", ResourceType_Study) // 6 | |
| 181 | 279 }; |
| 280 | |
| 738 | 281 ASSERT_EQ("a", index_->GetPublicId(a[0])); |
| 282 ASSERT_EQ("b", index_->GetPublicId(a[1])); | |
| 283 ASSERT_EQ("c", index_->GetPublicId(a[2])); | |
| 284 ASSERT_EQ("d", index_->GetPublicId(a[3])); | |
| 285 ASSERT_EQ("e", index_->GetPublicId(a[4])); | |
| 286 ASSERT_EQ("f", index_->GetPublicId(a[5])); | |
| 287 ASSERT_EQ("g", index_->GetPublicId(a[6])); | |
|
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
288 |
| 738 | 289 ASSERT_EQ(ResourceType_Patient, index_->GetResourceType(a[0])); |
| 290 ASSERT_EQ(ResourceType_Study, index_->GetResourceType(a[1])); | |
| 291 ASSERT_EQ(ResourceType_Series, index_->GetResourceType(a[2])); | |
| 292 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[3])); | |
| 293 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[4])); | |
| 294 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[5])); | |
| 295 ASSERT_EQ(ResourceType_Study, index_->GetResourceType(a[6])); | |
| 304 | 296 |
| 190 | 297 { |
| 1241 | 298 std::list<std::string> t; |
| 738 | 299 index_->GetAllPublicIds(t, ResourceType_Patient); |
| 190 | 300 |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
301 ASSERT_EQ(1u, t.size()); |
| 1241 | 302 ASSERT_EQ("a", t.front()); |
| 190 | 303 |
| 738 | 304 index_->GetAllPublicIds(t, ResourceType_Series); |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
305 ASSERT_EQ(1u, t.size()); |
| 1241 | 306 ASSERT_EQ("c", t.front()); |
| 190 | 307 |
| 738 | 308 index_->GetAllPublicIds(t, ResourceType_Study); |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
309 ASSERT_EQ(2u, t.size()); |
| 190 | 310 |
| 738 | 311 index_->GetAllPublicIds(t, ResourceType_Instance); |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
312 ASSERT_EQ(3u, t.size()); |
| 190 | 313 } |
| 314 | |
| 738 | 315 index_->SetGlobalProperty(GlobalProperty_FlushSleep, "World"); |
| 181 | 316 |
| 738 | 317 index_->AttachChild(a[0], a[1]); |
| 318 index_->AttachChild(a[1], a[2]); | |
| 319 index_->AttachChild(a[2], a[3]); | |
| 320 index_->AttachChild(a[2], a[4]); | |
| 321 index_->AttachChild(a[6], a[5]); | |
| 182 | 322 |
|
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
323 int64_t parent; |
| 738 | 324 ASSERT_FALSE(index_->LookupParent(parent, a[0])); |
| 325 ASSERT_TRUE(index_->LookupParent(parent, a[1])); ASSERT_EQ(a[0], parent); | |
| 326 ASSERT_TRUE(index_->LookupParent(parent, a[2])); ASSERT_EQ(a[1], parent); | |
| 327 ASSERT_TRUE(index_->LookupParent(parent, a[3])); ASSERT_EQ(a[2], parent); | |
| 328 ASSERT_TRUE(index_->LookupParent(parent, a[4])); ASSERT_EQ(a[2], parent); | |
| 329 ASSERT_TRUE(index_->LookupParent(parent, a[5])); ASSERT_EQ(a[6], parent); | |
| 330 ASSERT_FALSE(index_->LookupParent(parent, a[6])); | |
|
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
331 |
| 182 | 332 std::string s; |
| 1286 | 333 |
| 1287 | 334 CheckNoParent(a[0]); |
| 335 CheckNoParent(a[6]); | |
| 336 CheckParentPublicId("a", a[1]); | |
| 337 CheckParentPublicId("b", a[2]); | |
| 338 CheckParentPublicId("c", a[3]); | |
| 339 CheckParentPublicId("c", a[4]); | |
| 340 CheckParentPublicId("g", a[5]); | |
| 182 | 341 |
| 185 | 342 std::list<std::string> l; |
| 738 | 343 index_->GetChildrenPublicId(l, a[0]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("b", l.front()); |
| 344 index_->GetChildrenPublicId(l, a[1]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("c", l.front()); | |
| 345 index_->GetChildrenPublicId(l, a[3]); ASSERT_EQ(0u, l.size()); | |
| 346 index_->GetChildrenPublicId(l, a[4]); ASSERT_EQ(0u, l.size()); | |
| 347 index_->GetChildrenPublicId(l, a[5]); ASSERT_EQ(0u, l.size()); | |
| 348 index_->GetChildrenPublicId(l, a[6]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("f", l.front()); | |
| 182 | 349 |
| 738 | 350 index_->GetChildrenPublicId(l, a[2]); ASSERT_EQ(2u, l.size()); |
| 182 | 351 if (l.front() == "d") |
| 352 { | |
| 353 ASSERT_EQ("e", l.back()); | |
| 354 } | |
| 355 else | |
| 356 { | |
| 357 ASSERT_EQ("d", l.back()); | |
| 358 ASSERT_EQ("e", l.front()); | |
| 359 } | |
| 360 | |
|
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
361 std::list<MetadataType> md; |
| 738 | 362 index_->ListAvailableMetadata(md, a[4]); |
|
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
363 ASSERT_EQ(0u, md.size()); |
|
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
364 |
| 738 | 365 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
|
366 CompressionType_ZlibWithSize, 21, "compressedMD5")); |
| 738 | 367 index_->AddAttachment(a[4], FileInfo("my dicom file", FileContentType_Dicom, 42, "md5")); |
| 368 index_->AddAttachment(a[6], FileInfo("world", FileContentType_Dicom, 44, "md5")); | |
| 369 index_->SetMetadata(a[4], MetadataType_Instance_RemoteAet, "PINNACLE"); | |
|
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
370 |
| 738 | 371 index_->ListAvailableMetadata(md, a[4]); |
|
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
372 ASSERT_EQ(1u, md.size()); |
|
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
373 ASSERT_EQ(MetadataType_Instance_RemoteAet, md.front()); |
| 738 | 374 index_->SetMetadata(a[4], MetadataType_ModifiedFrom, "TUTU"); |
| 375 index_->ListAvailableMetadata(md, a[4]); | |
| 438 | 376 ASSERT_EQ(2u, md.size()); |
| 1030 | 377 |
| 378 std::map<MetadataType, std::string> md2; | |
| 379 index_->GetAllMetadata(md2, a[4]); | |
| 380 ASSERT_EQ(2u, md2.size()); | |
| 381 ASSERT_EQ("TUTU", md2[MetadataType_ModifiedFrom]); | |
| 382 ASSERT_EQ("PINNACLE", md2[MetadataType_Instance_RemoteAet]); | |
| 383 | |
| 738 | 384 index_->DeleteMetadata(a[4], MetadataType_ModifiedFrom); |
| 385 index_->ListAvailableMetadata(md, a[4]); | |
| 438 | 386 ASSERT_EQ(1u, md.size()); |
| 387 ASSERT_EQ(MetadataType_Instance_RemoteAet, md.front()); | |
| 182 | 388 |
| 1030 | 389 index_->GetAllMetadata(md2, a[4]); |
| 390 ASSERT_EQ(1u, md2.size()); | |
| 391 ASSERT_EQ("PINNACLE", md2[MetadataType_Instance_RemoteAet]); | |
| 392 | |
| 393 | |
| 738 | 394 ASSERT_EQ(21u + 42u + 44u, index_->GetTotalCompressedSize()); |
| 395 ASSERT_EQ(42u + 42u + 44u, index_->GetTotalUncompressedSize()); | |
| 181 | 396 |
| 1286 | 397 index_->SetMainDicomTag(a[3], DicomTag(0x0010, 0x0010), "PatientName"); |
| 181 | 398 |
| 399 int64_t b; | |
| 400 ResourceType t; | |
| 1294 | 401 ASSERT_TRUE(index_->LookupResource(b, t, "g")); |
| 181 | 402 ASSERT_EQ(7, b); |
| 403 ASSERT_EQ(ResourceType_Study, t); | |
| 404 | |
| 738 | 405 ASSERT_TRUE(index_->LookupMetadata(s, a[4], MetadataType_Instance_RemoteAet)); |
| 406 ASSERT_FALSE(index_->LookupMetadata(s, a[4], MetadataType_Instance_IndexInSeries)); | |
| 181 | 407 ASSERT_EQ("PINNACLE", s); |
| 1238 | 408 |
| 409 std::string u; | |
| 410 ASSERT_TRUE(index_->LookupMetadata(u, a[4], MetadataType_Instance_RemoteAet)); | |
| 411 ASSERT_EQ("PINNACLE", u); | |
| 412 ASSERT_FALSE(index_->LookupMetadata(u, a[4], MetadataType_Instance_IndexInSeries)); | |
| 181 | 413 |
| 738 | 414 ASSERT_TRUE(index_->LookupGlobalProperty(s, GlobalProperty_FlushSleep)); |
| 415 ASSERT_FALSE(index_->LookupGlobalProperty(s, static_cast<GlobalProperty>(42))); | |
| 181 | 416 ASSERT_EQ("World", s); |
| 417 | |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
418 FileInfo att; |
| 738 | 419 ASSERT_TRUE(index_->LookupAttachment(att, a[4], FileContentType_DicomAsJson)); |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
420 ASSERT_EQ("my json file", att.GetUuid()); |
|
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
421 ASSERT_EQ(21u, att.GetCompressedSize()); |
|
693
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
422 ASSERT_EQ("md5", att.GetUncompressedMD5()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
423 ASSERT_EQ("compressedMD5", att.GetCompressedMD5()); |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
424 ASSERT_EQ(42u, att.GetUncompressedSize()); |
|
1514
d73a2178b319
support of deflate and gzip content-types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1492
diff
changeset
|
425 ASSERT_EQ(CompressionType_ZlibWithSize, att.GetCompressionType()); |
| 181 | 426 |
| 738 | 427 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
|
428 ASSERT_EQ("world", att.GetUuid()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
429 ASSERT_EQ(44u, att.GetCompressedSize()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
430 ASSERT_EQ("md5", att.GetUncompressedMD5()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
431 ASSERT_EQ("md5", att.GetCompressedMD5()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
432 ASSERT_EQ(44u, att.GetUncompressedSize()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
433 ASSERT_EQ(CompressionType_None, att.GetCompressionType()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
434 |
| 738 | 435 ASSERT_EQ(0u, listener_->deletedFiles_.size()); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
436 ASSERT_EQ(0u, listener_->deletedResources_.size()); |
| 1286 | 437 |
| 438 CheckTableRecordCount(7, "Resources"); | |
| 439 CheckTableRecordCount(3, "AttachedFiles"); | |
| 440 CheckTableRecordCount(1, "Metadata"); | |
| 441 CheckTableRecordCount(1, "MainDicomTags"); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
442 |
| 738 | 443 index_->DeleteResource(a[0]); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
444 ASSERT_EQ(5u, listener_->deletedResources_.size()); |
| 738 | 445 ASSERT_EQ(2u, listener_->deletedFiles_.size()); |
| 446 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(), | |
| 447 listener_->deletedFiles_.end(), | |
| 448 "my json file") == listener_->deletedFiles_.end()); | |
| 449 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(), | |
| 450 listener_->deletedFiles_.end(), | |
| 451 "my dicom file") == listener_->deletedFiles_.end()); | |
| 183 | 452 |
| 1286 | 453 CheckTableRecordCount(2, "Resources"); |
| 454 CheckTableRecordCount(0, "Metadata"); | |
| 455 CheckTableRecordCount(1, "AttachedFiles"); | |
| 456 CheckTableRecordCount(0, "MainDicomTags"); | |
| 457 | |
| 738 | 458 index_->DeleteResource(a[5]); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
459 ASSERT_EQ(7u, listener_->deletedResources_.size()); |
| 1286 | 460 |
| 461 CheckTableRecordCount(0, "Resources"); | |
| 462 CheckTableRecordCount(0, "AttachedFiles"); | |
| 463 CheckTableRecordCount(2, "GlobalProperties"); | |
| 183 | 464 |
| 738 | 465 ASSERT_EQ(3u, listener_->deletedFiles_.size()); |
| 466 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(), | |
| 467 listener_->deletedFiles_.end(), | |
| 468 "world") == listener_->deletedFiles_.end()); | |
| 183 | 469 } |
| 470 | |
| 471 | |
| 472 | |
| 473 | |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
474 TEST_P(DatabaseWrapperTest, Upward) |
| 183 | 475 { |
| 476 int64_t a[] = { | |
| 738 | 477 index_->CreateResource("a", ResourceType_Patient), // 0 |
| 478 index_->CreateResource("b", ResourceType_Study), // 1 | |
| 479 index_->CreateResource("c", ResourceType_Series), // 2 | |
| 480 index_->CreateResource("d", ResourceType_Instance), // 3 | |
| 481 index_->CreateResource("e", ResourceType_Instance), // 4 | |
| 482 index_->CreateResource("f", ResourceType_Study), // 5 | |
| 483 index_->CreateResource("g", ResourceType_Series), // 6 | |
| 484 index_->CreateResource("h", ResourceType_Series) // 7 | |
| 183 | 485 }; |
| 486 | |
| 738 | 487 index_->AttachChild(a[0], a[1]); |
| 488 index_->AttachChild(a[1], a[2]); | |
| 489 index_->AttachChild(a[2], a[3]); | |
| 490 index_->AttachChild(a[2], a[4]); | |
| 491 index_->AttachChild(a[1], a[6]); | |
| 492 index_->AttachChild(a[0], a[5]); | |
| 493 index_->AttachChild(a[5], a[7]); | |
| 183 | 494 |
| 1287 | 495 CheckTwoChildren("b", "f", a[0]); |
| 496 CheckTwoChildren("c", "g", a[1]); | |
| 497 CheckTwoChildren("d", "e", a[2]); | |
| 498 CheckNoChild(a[3]); | |
| 499 CheckNoChild(a[4]); | |
| 500 CheckOneChild("h", a[5]); | |
| 501 CheckNoChild(a[6]); | |
| 502 CheckNoChild(a[7]); | |
|
193
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
190
diff
changeset
|
503 |
| 738 | 504 listener_->Reset(); |
| 505 index_->DeleteResource(a[3]); | |
| 506 ASSERT_EQ("c", listener_->ancestorId_); | |
| 507 ASSERT_EQ(ResourceType_Series, listener_->ancestorType_); | |
| 183 | 508 |
| 738 | 509 listener_->Reset(); |
| 510 index_->DeleteResource(a[4]); | |
| 511 ASSERT_EQ("b", listener_->ancestorId_); | |
| 512 ASSERT_EQ(ResourceType_Study, listener_->ancestorType_); | |
| 183 | 513 |
| 738 | 514 listener_->Reset(); |
| 515 index_->DeleteResource(a[7]); | |
| 516 ASSERT_EQ("a", listener_->ancestorId_); | |
| 517 ASSERT_EQ(ResourceType_Patient, listener_->ancestorType_); | |
| 183 | 518 |
| 738 | 519 listener_->Reset(); |
| 520 index_->DeleteResource(a[6]); | |
| 521 ASSERT_EQ("", listener_->ancestorId_); // No more ancestor | |
| 181 | 522 } |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
523 |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
524 |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
525 TEST_P(DatabaseWrapperTest, PatientRecycling) |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
526 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
527 std::vector<int64_t> patients; |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
528 for (int i = 0; i < 10; i++) |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
529 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
530 std::string p = "Patient " + boost::lexical_cast<std::string>(i); |
| 738 | 531 patients.push_back(index_->CreateResource(p, ResourceType_Patient)); |
| 532 index_->AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10, | |
| 1287 | 533 "md5-" + boost::lexical_cast<std::string>(i))); |
| 738 | 534 ASSERT_FALSE(index_->IsProtectedPatient(patients[i])); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
535 } |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
536 |
| 1286 | 537 CheckTableRecordCount(10u, "Resources"); |
| 538 CheckTableRecordCount(10u, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
539 |
| 738 | 540 listener_->Reset(); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
541 ASSERT_EQ(0u, listener_->deletedResources_.size()); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
542 |
| 738 | 543 index_->DeleteResource(patients[5]); |
| 544 index_->DeleteResource(patients[0]); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
545 ASSERT_EQ(2u, listener_->deletedResources_.size()); |
| 1286 | 546 |
| 547 CheckTableRecordCount(8u, "Resources"); | |
| 548 CheckTableRecordCount(8u, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
549 |
| 738 | 550 ASSERT_EQ(2u, listener_->deletedFiles_.size()); |
| 551 ASSERT_EQ("Patient 5", listener_->deletedFiles_[0]); | |
| 552 ASSERT_EQ("Patient 0", listener_->deletedFiles_[1]); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
553 |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
554 int64_t p; |
| 738 | 555 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[1]); |
| 556 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
557 ASSERT_EQ(3u, listener_->deletedResources_.size()); |
| 738 | 558 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[2]); |
| 559 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
560 ASSERT_EQ(4u, listener_->deletedResources_.size()); |
| 738 | 561 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[3]); |
| 562 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
563 ASSERT_EQ(5u, listener_->deletedResources_.size()); |
| 738 | 564 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[4]); |
| 565 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
566 ASSERT_EQ(6u, listener_->deletedResources_.size()); |
| 738 | 567 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[6]); |
| 568 index_->DeleteResource(p); | |
| 569 index_->DeleteResource(patients[8]); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
570 ASSERT_EQ(8u, listener_->deletedResources_.size()); |
| 738 | 571 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[7]); |
| 572 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
573 ASSERT_EQ(9u, listener_->deletedResources_.size()); |
| 738 | 574 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[9]); |
| 575 index_->DeleteResource(p); | |
| 576 ASSERT_FALSE(index_->SelectPatientToRecycle(p)); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
577 ASSERT_EQ(10u, listener_->deletedResources_.size()); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
578 |
| 738 | 579 ASSERT_EQ(10u, listener_->deletedFiles_.size()); |
| 1286 | 580 |
| 581 CheckTableRecordCount(0, "Resources"); | |
| 582 CheckTableRecordCount(0, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
583 } |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
584 |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
585 |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
586 TEST_P(DatabaseWrapperTest, PatientProtection) |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
587 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
588 std::vector<int64_t> patients; |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
589 for (int i = 0; i < 5; i++) |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
590 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
591 std::string p = "Patient " + boost::lexical_cast<std::string>(i); |
| 738 | 592 patients.push_back(index_->CreateResource(p, ResourceType_Patient)); |
| 593 index_->AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10, | |
| 1287 | 594 "md5-" + boost::lexical_cast<std::string>(i))); |
| 738 | 595 ASSERT_FALSE(index_->IsProtectedPatient(patients[i])); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
596 } |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
597 |
| 1286 | 598 CheckTableRecordCount(5, "Resources"); |
| 599 CheckTableRecordCount(5, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
600 |
| 738 | 601 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); |
| 602 index_->SetProtectedPatient(patients[2], true); | |
| 603 ASSERT_TRUE(index_->IsProtectedPatient(patients[2])); | |
| 1286 | 604 CheckTableRecordCount(5, "Resources"); |
| 605 CheckTableRecordCount(4, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
606 |
| 738 | 607 index_->SetProtectedPatient(patients[2], true); |
| 608 ASSERT_TRUE(index_->IsProtectedPatient(patients[2])); | |
| 1286 | 609 CheckTableRecordCount(4, "PatientRecyclingOrder"); |
| 738 | 610 index_->SetProtectedPatient(patients[2], false); |
| 611 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); | |
| 1286 | 612 CheckTableRecordCount(5, "PatientRecyclingOrder"); |
| 738 | 613 index_->SetProtectedPatient(patients[2], false); |
| 614 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); | |
| 1286 | 615 CheckTableRecordCount(5, "PatientRecyclingOrder"); |
| 616 CheckTableRecordCount(5, "Resources"); | |
| 738 | 617 index_->SetProtectedPatient(patients[2], true); |
| 618 ASSERT_TRUE(index_->IsProtectedPatient(patients[2])); | |
| 1286 | 619 CheckTableRecordCount(4, "PatientRecyclingOrder"); |
| 738 | 620 index_->SetProtectedPatient(patients[2], false); |
| 621 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); | |
| 1286 | 622 CheckTableRecordCount(5, "PatientRecyclingOrder"); |
| 738 | 623 index_->SetProtectedPatient(patients[3], true); |
| 624 ASSERT_TRUE(index_->IsProtectedPatient(patients[3])); | |
| 1286 | 625 CheckTableRecordCount(4, "PatientRecyclingOrder"); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
626 |
| 1286 | 627 CheckTableRecordCount(5, "Resources"); |
| 738 | 628 ASSERT_EQ(0u, listener_->deletedFiles_.size()); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
629 |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
630 // 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
|
631 int64_t p; |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
632 ASSERT_EQ(0u, listener_->deletedResources_.size()); |
| 738 | 633 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[0]); |
| 634 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
635 ASSERT_EQ(1u, listener_->deletedResources_.size()); |
| 738 | 636 ASSERT_TRUE(index_->SelectPatientToRecycle(p, patients[1])); ASSERT_EQ(p, patients[4]); |
| 637 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[1]); | |
| 638 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
639 ASSERT_EQ(2u, listener_->deletedResources_.size()); |
| 738 | 640 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[4]); |
| 641 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
642 ASSERT_EQ(3u, listener_->deletedResources_.size()); |
| 738 | 643 ASSERT_FALSE(index_->SelectPatientToRecycle(p, patients[2])); |
| 644 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[2]); | |
| 645 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
646 ASSERT_EQ(4u, listener_->deletedResources_.size()); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
647 // "patients[3]" is still protected |
| 738 | 648 ASSERT_FALSE(index_->SelectPatientToRecycle(p)); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
649 |
| 738 | 650 ASSERT_EQ(4u, listener_->deletedFiles_.size()); |
| 1286 | 651 CheckTableRecordCount(1, "Resources"); |
| 652 CheckTableRecordCount(0, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
653 |
| 738 | 654 index_->SetProtectedPatient(patients[3], false); |
| 1286 | 655 CheckTableRecordCount(1, "PatientRecyclingOrder"); |
| 738 | 656 ASSERT_FALSE(index_->SelectPatientToRecycle(p, patients[3])); |
| 657 ASSERT_TRUE(index_->SelectPatientToRecycle(p, patients[2])); | |
| 658 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[3]); | |
| 659 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
660 ASSERT_EQ(5u, listener_->deletedResources_.size()); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
661 |
| 738 | 662 ASSERT_EQ(5u, listener_->deletedFiles_.size()); |
| 1286 | 663 CheckTableRecordCount(0, "Resources"); |
| 664 CheckTableRecordCount(0, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
665 } |
| 310 | 666 |
| 667 | |
| 668 | |
| 1237 | 669 TEST(ServerIndex, Sequence) |
| 310 | 670 { |
| 1237 | 671 const std::string path = "UnitTestsStorage"; |
| 672 | |
| 2140 | 673 SystemToolbox::RemoveFile(path + "/index"); |
| 1237 | 674 FilesystemStorage storage(path); |
| 1247 | 675 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
|
676 db.Open(); |
|
1549
e5e975e9b738
refactoring and simplification of StorageAccessor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1514
diff
changeset
|
677 ServerContext context(db, storage); |
| 1237 | 678 ServerIndex& index = context.GetIndex(); |
| 679 | |
| 680 ASSERT_EQ(1u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
| 681 ASSERT_EQ(2u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
| 682 ASSERT_EQ(3u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
| 683 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
|
684 |
|
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1432
diff
changeset
|
685 context.Stop(); |
|
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
686 db.Close(); |
| 310 | 687 } |
| 521 | 688 |
| 689 | |
| 690 | |
| 1162 | 691 TEST_P(DatabaseWrapperTest, LookupIdentifier) |
| 521 | 692 { |
| 693 int64_t a[] = { | |
| 738 | 694 index_->CreateResource("a", ResourceType_Study), // 0 |
| 695 index_->CreateResource("b", ResourceType_Study), // 1 | |
| 696 index_->CreateResource("c", ResourceType_Study), // 2 | |
| 697 index_->CreateResource("d", ResourceType_Series) // 3 | |
| 521 | 698 }; |
| 699 | |
| 1713 | 700 index_->SetIdentifierTag(a[0], DICOM_TAG_STUDY_INSTANCE_UID, "0"); |
| 701 index_->SetIdentifierTag(a[1], DICOM_TAG_STUDY_INSTANCE_UID, "1"); | |
| 702 index_->SetIdentifierTag(a[2], DICOM_TAG_STUDY_INSTANCE_UID, "0"); | |
| 703 index_->SetIdentifierTag(a[3], DICOM_TAG_SERIES_INSTANCE_UID, "0"); | |
| 521 | 704 |
| 1746 | 705 std::list<std::string> s; |
| 521 | 706 |
| 1746 | 707 DoLookup(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, "0"); |
| 521 | 708 ASSERT_EQ(2u, s.size()); |
| 1746 | 709 ASSERT_TRUE(std::find(s.begin(), s.end(), "a") != s.end()); |
| 710 ASSERT_TRUE(std::find(s.begin(), s.end(), "c") != s.end()); | |
| 521 | 711 |
| 1746 | 712 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
|
713 ASSERT_EQ(1u, s.size()); |
| 1746 | 714 ASSERT_TRUE(std::find(s.begin(), s.end(), "d") != s.end()); |
| 521 | 715 |
| 1746 | 716 DoLookup(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, "1"); |
| 521 | 717 ASSERT_EQ(1u, s.size()); |
| 1746 | 718 ASSERT_TRUE(std::find(s.begin(), s.end(), "b") != 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_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
|
725 ASSERT_EQ(0u, s.size()); |
| 521 | 726 |
| 1746 | 727 { |
| 728 LookupIdentifierQuery query(ResourceType_Study); | |
| 729 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_GreaterOrEqual, "0"); | |
| 730 query.Apply(s, *index_); | |
| 731 ASSERT_EQ(3u, s.size()); | |
| 732 } | |
| 733 | |
| 734 { | |
| 735 LookupIdentifierQuery query(ResourceType_Study); | |
| 736 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_GreaterOrEqual, "0"); | |
| 737 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_SmallerOrEqual, "0"); | |
| 738 query.Apply(s, *index_); | |
| 739 ASSERT_EQ(2u, s.size()); | |
| 740 } | |
| 741 | |
| 742 { | |
| 743 LookupIdentifierQuery query(ResourceType_Study); | |
| 744 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_GreaterOrEqual, "1"); | |
| 745 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_SmallerOrEqual, "1"); | |
| 746 query.Apply(s, *index_); | |
| 747 ASSERT_EQ(1u, s.size()); | |
| 748 } | |
| 749 | |
| 750 { | |
| 751 LookupIdentifierQuery query(ResourceType_Study); | |
| 752 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_GreaterOrEqual, "1"); | |
| 753 query.Apply(s, *index_); | |
| 754 ASSERT_EQ(1u, s.size()); | |
| 755 } | |
| 756 | |
| 757 { | |
| 758 LookupIdentifierQuery query(ResourceType_Study); | |
| 759 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_GreaterOrEqual, "2"); | |
| 760 query.Apply(s, *index_); | |
| 761 ASSERT_EQ(0u, s.size()); | |
| 762 } | |
|
562
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
763 } |
| 705 | 764 |
| 765 | |
| 766 | |
|
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
767 TEST(ServerIndex, AttachmentRecycling) |
| 705 | 768 { |
|
803
4689e400e0fa
directory to store the results of the unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
738
diff
changeset
|
769 const std::string path = "UnitTestsStorage"; |
|
1124
790ff7a5b3bf
IStorageArea abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1030
diff
changeset
|
770 |
| 2140 | 771 SystemToolbox::RemoveFile(path + "/index"); |
|
1124
790ff7a5b3bf
IStorageArea abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1030
diff
changeset
|
772 FilesystemStorage storage(path); |
| 1247 | 773 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
|
774 db.Open(); |
|
1549
e5e975e9b738
refactoring and simplification of StorageAccessor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1514
diff
changeset
|
775 ServerContext context(db, storage); |
| 705 | 776 ServerIndex& index = context.GetIndex(); |
|
707
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
706
diff
changeset
|
777 |
| 706 | 778 index.SetMaximumStorageSize(10); |
| 779 | |
| 705 | 780 Json::Value tmp; |
| 781 index.ComputeStatistics(tmp); | |
|
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
782 ASSERT_EQ(0, tmp["CountPatients"].asInt()); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
783 ASSERT_EQ(0, boost::lexical_cast<int>(tmp["TotalDiskSize"].asString())); |
| 705 | 784 |
| 785 ServerIndex::Attachments attachments; | |
| 786 | |
|
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
787 std::vector<std::string> ids; |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
788 for (int i = 0; i < 10; i++) |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
789 { |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
790 std::string id = boost::lexical_cast<std::string>(i); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
791 DicomMap instance; |
|
2007
655489d9165d
DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1971
diff
changeset
|
792 instance.SetValue(DICOM_TAG_PATIENT_ID, "patient-" + id, false); |
|
655489d9165d
DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1971
diff
changeset
|
793 instance.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "study-" + id, false); |
|
655489d9165d
DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1971
diff
changeset
|
794 instance.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, "series-" + id, false); |
|
655489d9165d
DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1971
diff
changeset
|
795 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
|
796 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
|
797 |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
798 std::map<MetadataType, std::string> instanceMetadata; |
| 1822 | 799 DicomInstanceToStore toStore; |
| 800 toStore.SetSummary(instance); | |
| 801 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
|
802 ASSERT_EQ(5u, instanceMetadata.size()); |
| 1029 | 803 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_RemoteAet) != instanceMetadata.end()); |
| 804 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_ReceptionDate) != instanceMetadata.end()); | |
| 2190 | 805 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
|
806 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_SopClassUid) != instanceMetadata.end()); |
| 2190 | 807 |
| 808 // By default, an Explicit VR Little Endian is used by Orthanc | |
| 809 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
|
810 |
|
2208
90ea60bee5ff
New metadata automatically computed at the instance level: "SopClassUid"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2190
diff
changeset
|
811 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
|
812 |
|
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
813 DicomInstanceHasher hasher(instance); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
814 ids.push_back(hasher.HashPatient()); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
815 ids.push_back(hasher.HashStudy()); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
816 ids.push_back(hasher.HashSeries()); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
817 ids.push_back(hasher.HashInstance()); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
818 } |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
819 |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
820 index.ComputeStatistics(tmp); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
821 ASSERT_EQ(10, tmp["CountPatients"].asInt()); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
822 ASSERT_EQ(0, boost::lexical_cast<int>(tmp["TotalDiskSize"].asString())); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
823 |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
824 for (size_t i = 0; i < ids.size(); i++) |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
825 { |
|
2172
84d1d392a9ab
GenerateUuid() not available in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2142
diff
changeset
|
826 FileInfo info(SystemToolbox::GenerateUuid(), FileContentType_Dicom, 1, "md5"); |
|
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
827 index.AddAttachment(info, ids[i]); |
|
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 index.ComputeStatistics(tmp); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
830 ASSERT_GE(10, boost::lexical_cast<int>(tmp["TotalDiskSize"].asString())); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
831 } |
|
707
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
706
diff
changeset
|
832 |
|
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
706
diff
changeset
|
833 // Because the DB is in memory, the SQLite index must not have been created |
| 2140 | 834 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
|
835 |
|
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1432
diff
changeset
|
836 context.Stop(); |
|
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
837 db.Close(); |
| 705 | 838 } |
| 1764 | 839 |
| 840 | |
| 841 TEST(LookupIdentifierQuery, NormalizeIdentifier) | |
| 842 { | |
| 2121 | 843 ASSERT_EQ("H^L.LO", ServerToolbox::NormalizeIdentifier(" Hé^l.LO %_ ")); |
| 844 ASSERT_EQ("1.2.840.113619.2.176.2025", ServerToolbox::NormalizeIdentifier(" 1.2.840.113619.2.176.2025 ")); | |
| 1764 | 845 } |