Mercurial > hg > orthanc
annotate UnitTestsSources/ServerIndexTests.cpp @ 1744:b3de74dec2d5 db-changes
integration mainline->db-changes
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 26 Oct 2015 12:30:34 +0100 |
| parents | 4941494b5dd8 ec66a16aa398 |
| children | d143db00a794 |
| 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/FileStorage/FilesystemStorage.h" |
|
f967bdf8534e
refactoring to Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1453
diff
changeset
|
37 #include "../Core/Logging.h" |
|
f967bdf8534e
refactoring to Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1453
diff
changeset
|
38 #include "../Core/Uuid.h" |
| 183 | 39 #include "../OrthancServer/DatabaseWrapper.h" |
| 705 | 40 #include "../OrthancServer/ServerContext.h" |
| 41 #include "../OrthancServer/ServerIndex.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 } | |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
248 }; |
| 181 | 249 } |
| 250 | |
| 251 | |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
252 INSTANTIATE_TEST_CASE_P(DatabaseWrapperName, |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
253 DatabaseWrapperTest, |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
254 ::testing::Values(DatabaseWrapperClass_SQLite)); |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
255 |
|
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 TEST_P(DatabaseWrapperTest, Simple) |
| 181 | 258 { |
| 259 int64_t a[] = { | |
| 738 | 260 index_->CreateResource("a", ResourceType_Patient), // 0 |
| 261 index_->CreateResource("b", ResourceType_Study), // 1 | |
| 262 index_->CreateResource("c", ResourceType_Series), // 2 | |
| 263 index_->CreateResource("d", ResourceType_Instance), // 3 | |
| 264 index_->CreateResource("e", ResourceType_Instance), // 4 | |
| 265 index_->CreateResource("f", ResourceType_Instance), // 5 | |
| 266 index_->CreateResource("g", ResourceType_Study) // 6 | |
| 181 | 267 }; |
| 268 | |
| 738 | 269 ASSERT_EQ("a", index_->GetPublicId(a[0])); |
| 270 ASSERT_EQ("b", index_->GetPublicId(a[1])); | |
| 271 ASSERT_EQ("c", index_->GetPublicId(a[2])); | |
| 272 ASSERT_EQ("d", index_->GetPublicId(a[3])); | |
| 273 ASSERT_EQ("e", index_->GetPublicId(a[4])); | |
| 274 ASSERT_EQ("f", index_->GetPublicId(a[5])); | |
| 275 ASSERT_EQ("g", index_->GetPublicId(a[6])); | |
|
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
276 |
| 738 | 277 ASSERT_EQ(ResourceType_Patient, index_->GetResourceType(a[0])); |
| 278 ASSERT_EQ(ResourceType_Study, index_->GetResourceType(a[1])); | |
| 279 ASSERT_EQ(ResourceType_Series, index_->GetResourceType(a[2])); | |
| 280 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[3])); | |
| 281 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[4])); | |
| 282 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[5])); | |
| 283 ASSERT_EQ(ResourceType_Study, index_->GetResourceType(a[6])); | |
| 304 | 284 |
| 190 | 285 { |
| 1241 | 286 std::list<std::string> t; |
| 738 | 287 index_->GetAllPublicIds(t, ResourceType_Patient); |
| 190 | 288 |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
289 ASSERT_EQ(1u, t.size()); |
| 1241 | 290 ASSERT_EQ("a", t.front()); |
| 190 | 291 |
| 738 | 292 index_->GetAllPublicIds(t, ResourceType_Series); |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
293 ASSERT_EQ(1u, t.size()); |
| 1241 | 294 ASSERT_EQ("c", t.front()); |
| 190 | 295 |
| 738 | 296 index_->GetAllPublicIds(t, ResourceType_Study); |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
297 ASSERT_EQ(2u, t.size()); |
| 190 | 298 |
| 738 | 299 index_->GetAllPublicIds(t, ResourceType_Instance); |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
300 ASSERT_EQ(3u, t.size()); |
| 190 | 301 } |
| 302 | |
| 738 | 303 index_->SetGlobalProperty(GlobalProperty_FlushSleep, "World"); |
| 181 | 304 |
| 738 | 305 index_->AttachChild(a[0], a[1]); |
| 306 index_->AttachChild(a[1], a[2]); | |
| 307 index_->AttachChild(a[2], a[3]); | |
| 308 index_->AttachChild(a[2], a[4]); | |
| 309 index_->AttachChild(a[6], a[5]); | |
| 182 | 310 |
|
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
311 int64_t parent; |
| 738 | 312 ASSERT_FALSE(index_->LookupParent(parent, a[0])); |
| 313 ASSERT_TRUE(index_->LookupParent(parent, a[1])); ASSERT_EQ(a[0], parent); | |
| 314 ASSERT_TRUE(index_->LookupParent(parent, a[2])); ASSERT_EQ(a[1], parent); | |
| 315 ASSERT_TRUE(index_->LookupParent(parent, a[3])); ASSERT_EQ(a[2], parent); | |
| 316 ASSERT_TRUE(index_->LookupParent(parent, a[4])); ASSERT_EQ(a[2], parent); | |
| 317 ASSERT_TRUE(index_->LookupParent(parent, a[5])); ASSERT_EQ(a[6], parent); | |
| 318 ASSERT_FALSE(index_->LookupParent(parent, a[6])); | |
|
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
319 |
| 182 | 320 std::string s; |
| 1286 | 321 |
| 1287 | 322 CheckNoParent(a[0]); |
| 323 CheckNoParent(a[6]); | |
| 324 CheckParentPublicId("a", a[1]); | |
| 325 CheckParentPublicId("b", a[2]); | |
| 326 CheckParentPublicId("c", a[3]); | |
| 327 CheckParentPublicId("c", a[4]); | |
| 328 CheckParentPublicId("g", a[5]); | |
| 182 | 329 |
| 185 | 330 std::list<std::string> l; |
| 738 | 331 index_->GetChildrenPublicId(l, a[0]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("b", l.front()); |
| 332 index_->GetChildrenPublicId(l, a[1]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("c", l.front()); | |
| 333 index_->GetChildrenPublicId(l, a[3]); ASSERT_EQ(0u, l.size()); | |
| 334 index_->GetChildrenPublicId(l, a[4]); ASSERT_EQ(0u, l.size()); | |
| 335 index_->GetChildrenPublicId(l, a[5]); ASSERT_EQ(0u, l.size()); | |
| 336 index_->GetChildrenPublicId(l, a[6]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("f", l.front()); | |
| 182 | 337 |
| 738 | 338 index_->GetChildrenPublicId(l, a[2]); ASSERT_EQ(2u, l.size()); |
| 182 | 339 if (l.front() == "d") |
| 340 { | |
| 341 ASSERT_EQ("e", l.back()); | |
| 342 } | |
| 343 else | |
| 344 { | |
| 345 ASSERT_EQ("d", l.back()); | |
| 346 ASSERT_EQ("e", l.front()); | |
| 347 } | |
| 348 | |
|
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
349 std::list<MetadataType> md; |
| 738 | 350 index_->ListAvailableMetadata(md, a[4]); |
|
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
351 ASSERT_EQ(0u, md.size()); |
|
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
352 |
| 738 | 353 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
|
354 CompressionType_ZlibWithSize, 21, "compressedMD5")); |
| 738 | 355 index_->AddAttachment(a[4], FileInfo("my dicom file", FileContentType_Dicom, 42, "md5")); |
| 356 index_->AddAttachment(a[6], FileInfo("world", FileContentType_Dicom, 44, "md5")); | |
| 357 index_->SetMetadata(a[4], MetadataType_Instance_RemoteAet, "PINNACLE"); | |
|
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
358 |
| 738 | 359 index_->ListAvailableMetadata(md, a[4]); |
|
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
360 ASSERT_EQ(1u, md.size()); |
|
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
361 ASSERT_EQ(MetadataType_Instance_RemoteAet, md.front()); |
| 738 | 362 index_->SetMetadata(a[4], MetadataType_ModifiedFrom, "TUTU"); |
| 363 index_->ListAvailableMetadata(md, a[4]); | |
| 438 | 364 ASSERT_EQ(2u, md.size()); |
| 1030 | 365 |
| 366 std::map<MetadataType, std::string> md2; | |
| 367 index_->GetAllMetadata(md2, a[4]); | |
| 368 ASSERT_EQ(2u, md2.size()); | |
| 369 ASSERT_EQ("TUTU", md2[MetadataType_ModifiedFrom]); | |
| 370 ASSERT_EQ("PINNACLE", md2[MetadataType_Instance_RemoteAet]); | |
| 371 | |
| 738 | 372 index_->DeleteMetadata(a[4], MetadataType_ModifiedFrom); |
| 373 index_->ListAvailableMetadata(md, a[4]); | |
| 438 | 374 ASSERT_EQ(1u, md.size()); |
| 375 ASSERT_EQ(MetadataType_Instance_RemoteAet, md.front()); | |
| 182 | 376 |
| 1030 | 377 index_->GetAllMetadata(md2, a[4]); |
| 378 ASSERT_EQ(1u, md2.size()); | |
| 379 ASSERT_EQ("PINNACLE", md2[MetadataType_Instance_RemoteAet]); | |
| 380 | |
| 381 | |
| 738 | 382 ASSERT_EQ(21u + 42u + 44u, index_->GetTotalCompressedSize()); |
| 383 ASSERT_EQ(42u + 42u + 44u, index_->GetTotalUncompressedSize()); | |
| 181 | 384 |
| 1286 | 385 index_->SetMainDicomTag(a[3], DicomTag(0x0010, 0x0010), "PatientName"); |
| 181 | 386 |
| 387 int64_t b; | |
| 388 ResourceType t; | |
| 1294 | 389 ASSERT_TRUE(index_->LookupResource(b, t, "g")); |
| 181 | 390 ASSERT_EQ(7, b); |
| 391 ASSERT_EQ(ResourceType_Study, t); | |
| 392 | |
| 738 | 393 ASSERT_TRUE(index_->LookupMetadata(s, a[4], MetadataType_Instance_RemoteAet)); |
| 394 ASSERT_FALSE(index_->LookupMetadata(s, a[4], MetadataType_Instance_IndexInSeries)); | |
| 181 | 395 ASSERT_EQ("PINNACLE", s); |
| 1238 | 396 |
| 397 std::string u; | |
| 398 ASSERT_TRUE(index_->LookupMetadata(u, a[4], MetadataType_Instance_RemoteAet)); | |
| 399 ASSERT_EQ("PINNACLE", u); | |
| 400 ASSERT_FALSE(index_->LookupMetadata(u, a[4], MetadataType_Instance_IndexInSeries)); | |
| 181 | 401 |
| 738 | 402 ASSERT_TRUE(index_->LookupGlobalProperty(s, GlobalProperty_FlushSleep)); |
| 403 ASSERT_FALSE(index_->LookupGlobalProperty(s, static_cast<GlobalProperty>(42))); | |
| 181 | 404 ASSERT_EQ("World", s); |
| 405 | |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
406 FileInfo att; |
| 738 | 407 ASSERT_TRUE(index_->LookupAttachment(att, a[4], FileContentType_DicomAsJson)); |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
408 ASSERT_EQ("my json file", att.GetUuid()); |
|
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
409 ASSERT_EQ(21u, att.GetCompressedSize()); |
|
693
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
410 ASSERT_EQ("md5", att.GetUncompressedMD5()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
411 ASSERT_EQ("compressedMD5", att.GetCompressedMD5()); |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
412 ASSERT_EQ(42u, att.GetUncompressedSize()); |
|
1514
d73a2178b319
support of deflate and gzip content-types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1492
diff
changeset
|
413 ASSERT_EQ(CompressionType_ZlibWithSize, att.GetCompressionType()); |
| 181 | 414 |
| 738 | 415 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
|
416 ASSERT_EQ("world", att.GetUuid()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
417 ASSERT_EQ(44u, att.GetCompressedSize()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
418 ASSERT_EQ("md5", att.GetUncompressedMD5()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
419 ASSERT_EQ("md5", att.GetCompressedMD5()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
420 ASSERT_EQ(44u, att.GetUncompressedSize()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
421 ASSERT_EQ(CompressionType_None, att.GetCompressionType()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
422 |
| 738 | 423 ASSERT_EQ(0u, listener_->deletedFiles_.size()); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
424 ASSERT_EQ(0u, listener_->deletedResources_.size()); |
| 1286 | 425 |
| 426 CheckTableRecordCount(7, "Resources"); | |
| 427 CheckTableRecordCount(3, "AttachedFiles"); | |
| 428 CheckTableRecordCount(1, "Metadata"); | |
| 429 CheckTableRecordCount(1, "MainDicomTags"); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
430 |
| 738 | 431 index_->DeleteResource(a[0]); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
432 ASSERT_EQ(5u, listener_->deletedResources_.size()); |
| 738 | 433 ASSERT_EQ(2u, listener_->deletedFiles_.size()); |
| 434 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(), | |
| 435 listener_->deletedFiles_.end(), | |
| 436 "my json file") == listener_->deletedFiles_.end()); | |
| 437 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(), | |
| 438 listener_->deletedFiles_.end(), | |
| 439 "my dicom file") == listener_->deletedFiles_.end()); | |
| 183 | 440 |
| 1286 | 441 CheckTableRecordCount(2, "Resources"); |
| 442 CheckTableRecordCount(0, "Metadata"); | |
| 443 CheckTableRecordCount(1, "AttachedFiles"); | |
| 444 CheckTableRecordCount(0, "MainDicomTags"); | |
| 445 | |
| 738 | 446 index_->DeleteResource(a[5]); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
447 ASSERT_EQ(7u, listener_->deletedResources_.size()); |
| 1286 | 448 |
| 449 CheckTableRecordCount(0, "Resources"); | |
| 450 CheckTableRecordCount(0, "AttachedFiles"); | |
| 451 CheckTableRecordCount(2, "GlobalProperties"); | |
| 183 | 452 |
| 738 | 453 ASSERT_EQ(3u, listener_->deletedFiles_.size()); |
| 454 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(), | |
| 455 listener_->deletedFiles_.end(), | |
| 456 "world") == listener_->deletedFiles_.end()); | |
| 183 | 457 } |
| 458 | |
| 459 | |
| 460 | |
| 461 | |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
462 TEST_P(DatabaseWrapperTest, Upward) |
| 183 | 463 { |
| 464 int64_t a[] = { | |
| 738 | 465 index_->CreateResource("a", ResourceType_Patient), // 0 |
| 466 index_->CreateResource("b", ResourceType_Study), // 1 | |
| 467 index_->CreateResource("c", ResourceType_Series), // 2 | |
| 468 index_->CreateResource("d", ResourceType_Instance), // 3 | |
| 469 index_->CreateResource("e", ResourceType_Instance), // 4 | |
| 470 index_->CreateResource("f", ResourceType_Study), // 5 | |
| 471 index_->CreateResource("g", ResourceType_Series), // 6 | |
| 472 index_->CreateResource("h", ResourceType_Series) // 7 | |
| 183 | 473 }; |
| 474 | |
| 738 | 475 index_->AttachChild(a[0], a[1]); |
| 476 index_->AttachChild(a[1], a[2]); | |
| 477 index_->AttachChild(a[2], a[3]); | |
| 478 index_->AttachChild(a[2], a[4]); | |
| 479 index_->AttachChild(a[1], a[6]); | |
| 480 index_->AttachChild(a[0], a[5]); | |
| 481 index_->AttachChild(a[5], a[7]); | |
| 183 | 482 |
| 1287 | 483 CheckTwoChildren("b", "f", a[0]); |
| 484 CheckTwoChildren("c", "g", a[1]); | |
| 485 CheckTwoChildren("d", "e", a[2]); | |
| 486 CheckNoChild(a[3]); | |
| 487 CheckNoChild(a[4]); | |
| 488 CheckOneChild("h", a[5]); | |
| 489 CheckNoChild(a[6]); | |
| 490 CheckNoChild(a[7]); | |
|
193
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
190
diff
changeset
|
491 |
| 738 | 492 listener_->Reset(); |
| 493 index_->DeleteResource(a[3]); | |
| 494 ASSERT_EQ("c", listener_->ancestorId_); | |
| 495 ASSERT_EQ(ResourceType_Series, listener_->ancestorType_); | |
| 183 | 496 |
| 738 | 497 listener_->Reset(); |
| 498 index_->DeleteResource(a[4]); | |
| 499 ASSERT_EQ("b", listener_->ancestorId_); | |
| 500 ASSERT_EQ(ResourceType_Study, listener_->ancestorType_); | |
| 183 | 501 |
| 738 | 502 listener_->Reset(); |
| 503 index_->DeleteResource(a[7]); | |
| 504 ASSERT_EQ("a", listener_->ancestorId_); | |
| 505 ASSERT_EQ(ResourceType_Patient, listener_->ancestorType_); | |
| 183 | 506 |
| 738 | 507 listener_->Reset(); |
| 508 index_->DeleteResource(a[6]); | |
| 509 ASSERT_EQ("", listener_->ancestorId_); // No more ancestor | |
| 181 | 510 } |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
511 |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
512 |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
513 TEST_P(DatabaseWrapperTest, PatientRecycling) |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
514 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
515 std::vector<int64_t> patients; |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
516 for (int i = 0; i < 10; i++) |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
517 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
518 std::string p = "Patient " + boost::lexical_cast<std::string>(i); |
| 738 | 519 patients.push_back(index_->CreateResource(p, ResourceType_Patient)); |
| 520 index_->AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10, | |
| 1287 | 521 "md5-" + boost::lexical_cast<std::string>(i))); |
| 738 | 522 ASSERT_FALSE(index_->IsProtectedPatient(patients[i])); |
|
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 |
| 1286 | 525 CheckTableRecordCount(10u, "Resources"); |
| 526 CheckTableRecordCount(10u, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
527 |
| 738 | 528 listener_->Reset(); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
529 ASSERT_EQ(0u, listener_->deletedResources_.size()); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
530 |
| 738 | 531 index_->DeleteResource(patients[5]); |
| 532 index_->DeleteResource(patients[0]); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
533 ASSERT_EQ(2u, listener_->deletedResources_.size()); |
| 1286 | 534 |
| 535 CheckTableRecordCount(8u, "Resources"); | |
| 536 CheckTableRecordCount(8u, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
537 |
| 738 | 538 ASSERT_EQ(2u, listener_->deletedFiles_.size()); |
| 539 ASSERT_EQ("Patient 5", listener_->deletedFiles_[0]); | |
| 540 ASSERT_EQ("Patient 0", listener_->deletedFiles_[1]); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
541 |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
542 int64_t p; |
| 738 | 543 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[1]); |
| 544 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
545 ASSERT_EQ(3u, listener_->deletedResources_.size()); |
| 738 | 546 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[2]); |
| 547 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
548 ASSERT_EQ(4u, listener_->deletedResources_.size()); |
| 738 | 549 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[3]); |
| 550 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
551 ASSERT_EQ(5u, listener_->deletedResources_.size()); |
| 738 | 552 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[4]); |
| 553 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
554 ASSERT_EQ(6u, listener_->deletedResources_.size()); |
| 738 | 555 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[6]); |
| 556 index_->DeleteResource(p); | |
| 557 index_->DeleteResource(patients[8]); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
558 ASSERT_EQ(8u, listener_->deletedResources_.size()); |
| 738 | 559 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[7]); |
| 560 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
561 ASSERT_EQ(9u, listener_->deletedResources_.size()); |
| 738 | 562 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[9]); |
| 563 index_->DeleteResource(p); | |
| 564 ASSERT_FALSE(index_->SelectPatientToRecycle(p)); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
565 ASSERT_EQ(10u, listener_->deletedResources_.size()); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
566 |
| 738 | 567 ASSERT_EQ(10u, listener_->deletedFiles_.size()); |
| 1286 | 568 |
| 569 CheckTableRecordCount(0, "Resources"); | |
| 570 CheckTableRecordCount(0, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
571 } |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
572 |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
573 |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
574 TEST_P(DatabaseWrapperTest, PatientProtection) |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
575 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
576 std::vector<int64_t> patients; |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
577 for (int i = 0; i < 5; i++) |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
578 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
579 std::string p = "Patient " + boost::lexical_cast<std::string>(i); |
| 738 | 580 patients.push_back(index_->CreateResource(p, ResourceType_Patient)); |
| 581 index_->AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10, | |
| 1287 | 582 "md5-" + boost::lexical_cast<std::string>(i))); |
| 738 | 583 ASSERT_FALSE(index_->IsProtectedPatient(patients[i])); |
|
262
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 |
| 1286 | 586 CheckTableRecordCount(5, "Resources"); |
| 587 CheckTableRecordCount(5, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
588 |
| 738 | 589 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); |
| 590 index_->SetProtectedPatient(patients[2], true); | |
| 591 ASSERT_TRUE(index_->IsProtectedPatient(patients[2])); | |
| 1286 | 592 CheckTableRecordCount(5, "Resources"); |
| 593 CheckTableRecordCount(4, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
594 |
| 738 | 595 index_->SetProtectedPatient(patients[2], true); |
| 596 ASSERT_TRUE(index_->IsProtectedPatient(patients[2])); | |
| 1286 | 597 CheckTableRecordCount(4, "PatientRecyclingOrder"); |
| 738 | 598 index_->SetProtectedPatient(patients[2], false); |
| 599 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); | |
| 1286 | 600 CheckTableRecordCount(5, "PatientRecyclingOrder"); |
| 738 | 601 index_->SetProtectedPatient(patients[2], false); |
| 602 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); | |
| 1286 | 603 CheckTableRecordCount(5, "PatientRecyclingOrder"); |
| 604 CheckTableRecordCount(5, "Resources"); | |
| 738 | 605 index_->SetProtectedPatient(patients[2], true); |
| 606 ASSERT_TRUE(index_->IsProtectedPatient(patients[2])); | |
| 1286 | 607 CheckTableRecordCount(4, "PatientRecyclingOrder"); |
| 738 | 608 index_->SetProtectedPatient(patients[2], false); |
| 609 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); | |
| 1286 | 610 CheckTableRecordCount(5, "PatientRecyclingOrder"); |
| 738 | 611 index_->SetProtectedPatient(patients[3], true); |
| 612 ASSERT_TRUE(index_->IsProtectedPatient(patients[3])); | |
| 1286 | 613 CheckTableRecordCount(4, "PatientRecyclingOrder"); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
614 |
| 1286 | 615 CheckTableRecordCount(5, "Resources"); |
| 738 | 616 ASSERT_EQ(0u, listener_->deletedFiles_.size()); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
617 |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
618 // 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
|
619 int64_t p; |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
620 ASSERT_EQ(0u, listener_->deletedResources_.size()); |
| 738 | 621 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[0]); |
| 622 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
623 ASSERT_EQ(1u, listener_->deletedResources_.size()); |
| 738 | 624 ASSERT_TRUE(index_->SelectPatientToRecycle(p, patients[1])); ASSERT_EQ(p, patients[4]); |
| 625 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[1]); | |
| 626 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
627 ASSERT_EQ(2u, listener_->deletedResources_.size()); |
| 738 | 628 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[4]); |
| 629 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
630 ASSERT_EQ(3u, listener_->deletedResources_.size()); |
| 738 | 631 ASSERT_FALSE(index_->SelectPatientToRecycle(p, patients[2])); |
| 632 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[2]); | |
| 633 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
634 ASSERT_EQ(4u, listener_->deletedResources_.size()); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
635 // "patients[3]" is still protected |
| 738 | 636 ASSERT_FALSE(index_->SelectPatientToRecycle(p)); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
637 |
| 738 | 638 ASSERT_EQ(4u, listener_->deletedFiles_.size()); |
| 1286 | 639 CheckTableRecordCount(1, "Resources"); |
| 640 CheckTableRecordCount(0, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
641 |
| 738 | 642 index_->SetProtectedPatient(patients[3], false); |
| 1286 | 643 CheckTableRecordCount(1, "PatientRecyclingOrder"); |
| 738 | 644 ASSERT_FALSE(index_->SelectPatientToRecycle(p, patients[3])); |
| 645 ASSERT_TRUE(index_->SelectPatientToRecycle(p, patients[2])); | |
| 646 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[3]); | |
| 647 index_->DeleteResource(p); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
648 ASSERT_EQ(5u, listener_->deletedResources_.size()); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
649 |
| 738 | 650 ASSERT_EQ(5u, listener_->deletedFiles_.size()); |
| 1286 | 651 CheckTableRecordCount(0, "Resources"); |
| 652 CheckTableRecordCount(0, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
653 } |
| 310 | 654 |
| 655 | |
| 656 | |
| 1237 | 657 TEST(ServerIndex, Sequence) |
| 310 | 658 { |
| 1237 | 659 const std::string path = "UnitTestsStorage"; |
| 660 | |
| 661 Toolbox::RemoveFile(path + "/index"); | |
| 662 FilesystemStorage storage(path); | |
| 1247 | 663 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
|
664 db.Open(); |
|
1549
e5e975e9b738
refactoring and simplification of StorageAccessor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1514
diff
changeset
|
665 ServerContext context(db, storage); |
| 1237 | 666 ServerIndex& index = context.GetIndex(); |
| 667 | |
| 668 ASSERT_EQ(1u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
| 669 ASSERT_EQ(2u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
| 670 ASSERT_EQ(3u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
| 671 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
|
672 |
|
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1432
diff
changeset
|
673 context.Stop(); |
|
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
674 db.Close(); |
| 310 | 675 } |
| 521 | 676 |
| 677 | |
| 678 | |
| 1162 | 679 TEST_P(DatabaseWrapperTest, LookupIdentifier) |
| 521 | 680 { |
| 681 int64_t a[] = { | |
| 738 | 682 index_->CreateResource("a", ResourceType_Study), // 0 |
| 683 index_->CreateResource("b", ResourceType_Study), // 1 | |
| 684 index_->CreateResource("c", ResourceType_Study), // 2 | |
| 685 index_->CreateResource("d", ResourceType_Series) // 3 | |
| 521 | 686 }; |
| 687 | |
| 1713 | 688 index_->SetIdentifierTag(a[0], DICOM_TAG_STUDY_INSTANCE_UID, "0"); |
| 689 index_->SetIdentifierTag(a[1], DICOM_TAG_STUDY_INSTANCE_UID, "1"); | |
| 690 index_->SetIdentifierTag(a[2], DICOM_TAG_STUDY_INSTANCE_UID, "0"); | |
| 691 index_->SetIdentifierTag(a[3], DICOM_TAG_SERIES_INSTANCE_UID, "0"); | |
| 521 | 692 |
| 693 std::list<int64_t> s; | |
| 694 | |
|
1728
4941494b5dd8
rename LookupIdentifier as LookupIdentifierExact
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1727
diff
changeset
|
695 index_->LookupIdentifierExact(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, "0"); |
| 521 | 696 ASSERT_EQ(2u, s.size()); |
| 697 ASSERT_TRUE(std::find(s.begin(), s.end(), a[0]) != s.end()); | |
| 698 ASSERT_TRUE(std::find(s.begin(), s.end(), a[2]) != s.end()); | |
| 699 | |
|
1728
4941494b5dd8
rename LookupIdentifier as LookupIdentifierExact
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1727
diff
changeset
|
700 index_->LookupIdentifierExact(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
|
701 ASSERT_EQ(1u, s.size()); |
| 521 | 702 ASSERT_TRUE(std::find(s.begin(), s.end(), a[3]) != s.end()); |
| 703 | |
|
1728
4941494b5dd8
rename LookupIdentifier as LookupIdentifierExact
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1727
diff
changeset
|
704 index_->LookupIdentifierExact(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, "1"); |
| 521 | 705 ASSERT_EQ(1u, s.size()); |
| 706 ASSERT_TRUE(std::find(s.begin(), s.end(), a[1]) != s.end()); | |
| 707 | |
|
1728
4941494b5dd8
rename LookupIdentifier as LookupIdentifierExact
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1727
diff
changeset
|
708 index_->LookupIdentifierExact(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, "1"); |
| 521 | 709 ASSERT_EQ(1u, s.size()); |
| 710 ASSERT_TRUE(std::find(s.begin(), s.end(), a[1]) != s.end()); | |
| 711 | |
|
1728
4941494b5dd8
rename LookupIdentifier as LookupIdentifierExact
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1727
diff
changeset
|
712 index_->LookupIdentifierExact(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
|
713 ASSERT_EQ(0u, s.size()); |
| 521 | 714 |
| 715 /*{ | |
| 1287 | 716 std::list<std::string> s; |
|
1728
4941494b5dd8
rename LookupIdentifier as LookupIdentifierExact
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1727
diff
changeset
|
717 context.GetIndex().LookupIdentifierExact(s, DICOM_TAG_STUDY_INSTANCE_UID, "1.2.250.1.74.20130819132500.29000036381059"); |
| 1287 | 718 for (std::list<std::string>::iterator i = s.begin(); i != s.end(); i++) |
| 719 { | |
| 720 std::cout << "*** " << *i << std::endl;; | |
| 721 } | |
| 722 }*/ | |
|
562
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
723 } |
| 705 | 724 |
| 725 | |
| 726 | |
|
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
727 TEST(ServerIndex, AttachmentRecycling) |
| 705 | 728 { |
|
803
4689e400e0fa
directory to store the results of the unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
738
diff
changeset
|
729 const std::string path = "UnitTestsStorage"; |
|
1124
790ff7a5b3bf
IStorageArea abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1030
diff
changeset
|
730 |
| 705 | 731 Toolbox::RemoveFile(path + "/index"); |
|
1124
790ff7a5b3bf
IStorageArea abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1030
diff
changeset
|
732 FilesystemStorage storage(path); |
| 1247 | 733 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
|
734 db.Open(); |
|
1549
e5e975e9b738
refactoring and simplification of StorageAccessor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1514
diff
changeset
|
735 ServerContext context(db, storage); |
| 705 | 736 ServerIndex& index = context.GetIndex(); |
|
707
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
706
diff
changeset
|
737 |
| 706 | 738 index.SetMaximumStorageSize(10); |
| 739 | |
| 705 | 740 Json::Value tmp; |
| 741 index.ComputeStatistics(tmp); | |
|
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
742 ASSERT_EQ(0, tmp["CountPatients"].asInt()); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
743 ASSERT_EQ(0, boost::lexical_cast<int>(tmp["TotalDiskSize"].asString())); |
| 705 | 744 |
| 745 ServerIndex::Attachments attachments; | |
| 746 | |
|
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
747 std::vector<std::string> ids; |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
748 for (int i = 0; i < 10; i++) |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
749 { |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
750 std::string id = boost::lexical_cast<std::string>(i); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
751 DicomMap instance; |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
752 instance.SetValue(DICOM_TAG_PATIENT_ID, "patient-" + id); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
753 instance.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "study-" + id); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
754 instance.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, "series-" + id); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
755 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
|
756 |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
757 std::map<MetadataType, std::string> instanceMetadata; |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
758 ServerIndex::MetadataMap metadata; |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
759 ASSERT_EQ(StoreStatus_Success, index.Store(instanceMetadata, instance, attachments, "", metadata)); |
| 1492 | 760 ASSERT_EQ(2u, instanceMetadata.size()); |
| 1029 | 761 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_RemoteAet) != instanceMetadata.end()); |
| 762 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_ReceptionDate) != instanceMetadata.end()); | |
|
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
763 |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
764 DicomInstanceHasher hasher(instance); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
765 ids.push_back(hasher.HashPatient()); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
766 ids.push_back(hasher.HashStudy()); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
767 ids.push_back(hasher.HashSeries()); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
768 ids.push_back(hasher.HashInstance()); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
769 } |
|
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 index.ComputeStatistics(tmp); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
772 ASSERT_EQ(10, tmp["CountPatients"].asInt()); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
773 ASSERT_EQ(0, boost::lexical_cast<int>(tmp["TotalDiskSize"].asString())); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
774 |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
775 for (size_t i = 0; i < ids.size(); i++) |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
776 { |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
777 FileInfo info(Toolbox::GenerateUuid(), FileContentType_Dicom, 1, "md5"); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
778 index.AddAttachment(info, ids[i]); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
779 |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
780 index.ComputeStatistics(tmp); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
781 ASSERT_GE(10, boost::lexical_cast<int>(tmp["TotalDiskSize"].asString())); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
782 } |
|
707
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
706
diff
changeset
|
783 |
|
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
706
diff
changeset
|
784 // 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
|
785 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
|
786 |
|
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1432
diff
changeset
|
787 context.Stop(); |
|
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
788 db.Close(); |
| 705 | 789 } |