Mercurial > hg > orthanc
annotate UnitTestsSources/ServerIndexTests.cpp @ 1234:a65ad39596cb
fix issue #25
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 05 Dec 2014 11:11:58 +0100 |
parents | efece308018e |
children | 21d84e3acc0d |
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 |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
3 * Copyright (C) 2012-2014 Medical Physics Department, CHU of Liege, |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
4 * Belgium |
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 | |
183 | 36 #include "../OrthancServer/DatabaseWrapper.h" |
705 | 37 #include "../OrthancServer/ServerContext.h" |
38 #include "../OrthancServer/ServerIndex.h" | |
273
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
39 #include "../Core/Uuid.h" |
711
8f62e8d5a384
test main dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
707
diff
changeset
|
40 #include "../Core/DicomFormat/DicomNullValue.h" |
1124
790ff7a5b3bf
IStorageArea abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1030
diff
changeset
|
41 #include "../Core/FileStorage/FilesystemStorage.h" |
183 | 42 |
181 | 43 #include <ctype.h> |
44 #include <glog/logging.h> | |
521 | 45 #include <algorithm> |
181 | 46 |
183 | 47 using namespace Orthanc; |
181 | 48 |
183 | 49 namespace |
50 { | |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
51 enum DatabaseWrapperClass |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
52 { |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
53 DatabaseWrapperClass_SQLite |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
54 }; |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
55 |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
56 |
181 | 57 class ServerIndexListener : public IServerIndexListener |
58 { | |
59 public: | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
60 std::vector<std::string> deletedFiles_; |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
61 std::vector<std::string> deletedResources_; |
183 | 62 std::string ancestorId_; |
63 ResourceType ancestorType_; | |
64 | |
65 void Reset() | |
181 | 66 { |
183 | 67 ancestorId_ = ""; |
68 deletedFiles_.clear(); | |
69 } | |
70 | |
71 virtual void SignalRemainingAncestor(ResourceType type, | |
72 const std::string& publicId) | |
73 { | |
74 ancestorId_ = publicId; | |
75 ancestorType_ = type; | |
181 | 76 } |
77 | |
273
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
78 virtual void SignalFileDeleted(const FileInfo& info) |
181 | 79 { |
273
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
80 const std::string fileUuid = info.GetUuid(); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
81 deletedFiles_.push_back(fileUuid); |
181 | 82 LOG(INFO) << "A file must be removed: " << fileUuid; |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
83 } |
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
84 |
1198 | 85 virtual void SignalChange(const ServerIndexChange& change) |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
86 { |
1198 | 87 if (change.GetChangeType() == ChangeType_Deleted) |
1177
5b2d8c280ac2
Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
88 { |
1198 | 89 deletedResources_.push_back(change.GetPublicId()); |
1177
5b2d8c280ac2
Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
90 } |
5b2d8c280ac2
Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
91 |
1198 | 92 LOG(INFO) << "Change related to resource " << change.GetPublicId() << " of type " |
93 << EnumerationToString(change.GetResourceType()) << ": " | |
94 << EnumerationToString(change.GetChangeType()); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
95 } |
1177
5b2d8c280ac2
Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
96 |
181 | 97 }; |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
98 |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
99 |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
100 class DatabaseWrapperTest : public ::testing::TestWithParam<DatabaseWrapperClass> |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
101 { |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
102 protected: |
738 | 103 std::auto_ptr<ServerIndexListener> listener_; |
104 std::auto_ptr<DatabaseWrapper> index_; | |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
105 |
738 | 106 DatabaseWrapperTest() |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
107 { |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
108 } |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
109 |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
110 virtual void SetUp() |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
111 { |
738 | 112 listener_.reset(new ServerIndexListener); |
113 index_.reset(new DatabaseWrapper(*listener_)); | |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
114 } |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
115 |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
116 virtual void TearDown() |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
117 { |
738 | 118 index_.reset(NULL); |
119 listener_.reset(NULL); | |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
120 } |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
121 }; |
181 | 122 } |
123 | |
124 | |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
125 INSTANTIATE_TEST_CASE_P(DatabaseWrapperName, |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
126 DatabaseWrapperTest, |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
127 ::testing::Values(DatabaseWrapperClass_SQLite)); |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
128 |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
129 |
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
130 TEST_P(DatabaseWrapperTest, Simple) |
181 | 131 { |
132 int64_t a[] = { | |
738 | 133 index_->CreateResource("a", ResourceType_Patient), // 0 |
134 index_->CreateResource("b", ResourceType_Study), // 1 | |
135 index_->CreateResource("c", ResourceType_Series), // 2 | |
136 index_->CreateResource("d", ResourceType_Instance), // 3 | |
137 index_->CreateResource("e", ResourceType_Instance), // 4 | |
138 index_->CreateResource("f", ResourceType_Instance), // 5 | |
139 index_->CreateResource("g", ResourceType_Study) // 6 | |
181 | 140 }; |
141 | |
738 | 142 ASSERT_EQ("a", index_->GetPublicId(a[0])); |
143 ASSERT_EQ("b", index_->GetPublicId(a[1])); | |
144 ASSERT_EQ("c", index_->GetPublicId(a[2])); | |
145 ASSERT_EQ("d", index_->GetPublicId(a[3])); | |
146 ASSERT_EQ("e", index_->GetPublicId(a[4])); | |
147 ASSERT_EQ("f", index_->GetPublicId(a[5])); | |
148 ASSERT_EQ("g", index_->GetPublicId(a[6])); | |
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
149 |
738 | 150 ASSERT_EQ(ResourceType_Patient, index_->GetResourceType(a[0])); |
151 ASSERT_EQ(ResourceType_Study, index_->GetResourceType(a[1])); | |
152 ASSERT_EQ(ResourceType_Series, index_->GetResourceType(a[2])); | |
153 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[3])); | |
154 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[4])); | |
155 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[5])); | |
156 ASSERT_EQ(ResourceType_Study, index_->GetResourceType(a[6])); | |
304 | 157 |
190 | 158 { |
159 Json::Value t; | |
738 | 160 index_->GetAllPublicIds(t, ResourceType_Patient); |
190 | 161 |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
162 ASSERT_EQ(1u, t.size()); |
190 | 163 ASSERT_EQ("a", t[0u].asString()); |
164 | |
738 | 165 index_->GetAllPublicIds(t, ResourceType_Series); |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
166 ASSERT_EQ(1u, t.size()); |
190 | 167 ASSERT_EQ("c", t[0u].asString()); |
168 | |
738 | 169 index_->GetAllPublicIds(t, ResourceType_Study); |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
170 ASSERT_EQ(2u, t.size()); |
190 | 171 |
738 | 172 index_->GetAllPublicIds(t, ResourceType_Instance); |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
173 ASSERT_EQ(3u, t.size()); |
190 | 174 } |
175 | |
738 | 176 index_->SetGlobalProperty(GlobalProperty_FlushSleep, "World"); |
181 | 177 |
738 | 178 index_->AttachChild(a[0], a[1]); |
179 index_->AttachChild(a[1], a[2]); | |
180 index_->AttachChild(a[2], a[3]); | |
181 index_->AttachChild(a[2], a[4]); | |
182 index_->AttachChild(a[6], a[5]); | |
182 | 183 |
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
184 int64_t parent; |
738 | 185 ASSERT_FALSE(index_->LookupParent(parent, a[0])); |
186 ASSERT_TRUE(index_->LookupParent(parent, a[1])); ASSERT_EQ(a[0], parent); | |
187 ASSERT_TRUE(index_->LookupParent(parent, a[2])); ASSERT_EQ(a[1], parent); | |
188 ASSERT_TRUE(index_->LookupParent(parent, a[3])); ASSERT_EQ(a[2], parent); | |
189 ASSERT_TRUE(index_->LookupParent(parent, a[4])); ASSERT_EQ(a[2], parent); | |
190 ASSERT_TRUE(index_->LookupParent(parent, a[5])); ASSERT_EQ(a[6], parent); | |
191 ASSERT_FALSE(index_->LookupParent(parent, a[6])); | |
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
192 |
182 | 193 std::string s; |
194 | |
738 | 195 ASSERT_FALSE(index_->GetParentPublicId(s, a[0])); |
196 ASSERT_FALSE(index_->GetParentPublicId(s, a[6])); | |
197 ASSERT_TRUE(index_->GetParentPublicId(s, a[1])); ASSERT_EQ("a", s); | |
198 ASSERT_TRUE(index_->GetParentPublicId(s, a[2])); ASSERT_EQ("b", s); | |
199 ASSERT_TRUE(index_->GetParentPublicId(s, a[3])); ASSERT_EQ("c", s); | |
200 ASSERT_TRUE(index_->GetParentPublicId(s, a[4])); ASSERT_EQ("c", s); | |
201 ASSERT_TRUE(index_->GetParentPublicId(s, a[5])); ASSERT_EQ("g", s); | |
182 | 202 |
185 | 203 std::list<std::string> l; |
738 | 204 index_->GetChildrenPublicId(l, a[0]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("b", l.front()); |
205 index_->GetChildrenPublicId(l, a[1]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("c", l.front()); | |
206 index_->GetChildrenPublicId(l, a[3]); ASSERT_EQ(0u, l.size()); | |
207 index_->GetChildrenPublicId(l, a[4]); ASSERT_EQ(0u, l.size()); | |
208 index_->GetChildrenPublicId(l, a[5]); ASSERT_EQ(0u, l.size()); | |
209 index_->GetChildrenPublicId(l, a[6]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("f", l.front()); | |
182 | 210 |
738 | 211 index_->GetChildrenPublicId(l, a[2]); ASSERT_EQ(2u, l.size()); |
182 | 212 if (l.front() == "d") |
213 { | |
214 ASSERT_EQ("e", l.back()); | |
215 } | |
216 else | |
217 { | |
218 ASSERT_EQ("d", l.back()); | |
219 ASSERT_EQ("e", l.front()); | |
220 } | |
221 | |
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
222 std::list<MetadataType> md; |
738 | 223 index_->ListAvailableMetadata(md, a[4]); |
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
224 ASSERT_EQ(0u, md.size()); |
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
225 |
738 | 226 index_->AddAttachment(a[4], FileInfo("my json file", FileContentType_DicomAsJson, 42, "md5", |
693
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
227 CompressionType_Zlib, 21, "compressedMD5")); |
738 | 228 index_->AddAttachment(a[4], FileInfo("my dicom file", FileContentType_Dicom, 42, "md5")); |
229 index_->AddAttachment(a[6], FileInfo("world", FileContentType_Dicom, 44, "md5")); | |
230 index_->SetMetadata(a[4], MetadataType_Instance_RemoteAet, "PINNACLE"); | |
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
231 |
738 | 232 index_->ListAvailableMetadata(md, a[4]); |
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
233 ASSERT_EQ(1u, md.size()); |
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
234 ASSERT_EQ(MetadataType_Instance_RemoteAet, md.front()); |
738 | 235 index_->SetMetadata(a[4], MetadataType_ModifiedFrom, "TUTU"); |
236 index_->ListAvailableMetadata(md, a[4]); | |
438 | 237 ASSERT_EQ(2u, md.size()); |
1030 | 238 |
239 std::map<MetadataType, std::string> md2; | |
240 index_->GetAllMetadata(md2, a[4]); | |
241 ASSERT_EQ(2u, md2.size()); | |
242 ASSERT_EQ("TUTU", md2[MetadataType_ModifiedFrom]); | |
243 ASSERT_EQ("PINNACLE", md2[MetadataType_Instance_RemoteAet]); | |
244 | |
738 | 245 index_->DeleteMetadata(a[4], MetadataType_ModifiedFrom); |
246 index_->ListAvailableMetadata(md, a[4]); | |
438 | 247 ASSERT_EQ(1u, md.size()); |
248 ASSERT_EQ(MetadataType_Instance_RemoteAet, md.front()); | |
182 | 249 |
1030 | 250 index_->GetAllMetadata(md2, a[4]); |
251 ASSERT_EQ(1u, md2.size()); | |
252 ASSERT_EQ("PINNACLE", md2[MetadataType_Instance_RemoteAet]); | |
253 | |
254 | |
738 | 255 ASSERT_EQ(21u + 42u + 44u, index_->GetTotalCompressedSize()); |
256 ASSERT_EQ(42u + 42u + 44u, index_->GetTotalUncompressedSize()); | |
181 | 257 |
258 DicomMap m; | |
259 m.SetValue(0x0010, 0x0010, "PatientName"); | |
738 | 260 index_->SetMainDicomTags(a[3], m); |
181 | 261 |
262 int64_t b; | |
263 ResourceType t; | |
738 | 264 ASSERT_TRUE(index_->LookupResource("g", b, t)); |
181 | 265 ASSERT_EQ(7, b); |
266 ASSERT_EQ(ResourceType_Study, t); | |
267 | |
738 | 268 ASSERT_TRUE(index_->LookupMetadata(s, a[4], MetadataType_Instance_RemoteAet)); |
269 ASSERT_FALSE(index_->LookupMetadata(s, a[4], MetadataType_Instance_IndexInSeries)); | |
181 | 270 ASSERT_EQ("PINNACLE", s); |
738 | 271 ASSERT_EQ("PINNACLE", index_->GetMetadata(a[4], MetadataType_Instance_RemoteAet)); |
272 ASSERT_EQ("None", index_->GetMetadata(a[4], MetadataType_Instance_IndexInSeries, "None")); | |
181 | 273 |
738 | 274 ASSERT_TRUE(index_->LookupGlobalProperty(s, GlobalProperty_FlushSleep)); |
275 ASSERT_FALSE(index_->LookupGlobalProperty(s, static_cast<GlobalProperty>(42))); | |
181 | 276 ASSERT_EQ("World", s); |
1218
efece308018e
report database version in /system
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1198
diff
changeset
|
277 ASSERT_EQ("World", index_->GetGlobalProperty(GlobalProperty_FlushSleep, "")); |
738 | 278 ASSERT_EQ("None", index_->GetGlobalProperty(static_cast<GlobalProperty>(42), "None")); |
181 | 279 |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
280 FileInfo att; |
738 | 281 ASSERT_TRUE(index_->LookupAttachment(att, a[4], FileContentType_DicomAsJson)); |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
282 ASSERT_EQ("my json file", att.GetUuid()); |
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
283 ASSERT_EQ(21u, att.GetCompressedSize()); |
693
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
284 ASSERT_EQ("md5", att.GetUncompressedMD5()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
285 ASSERT_EQ("compressedMD5", att.GetCompressedMD5()); |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
286 ASSERT_EQ(42u, att.GetUncompressedSize()); |
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
287 ASSERT_EQ(CompressionType_Zlib, att.GetCompressionType()); |
181 | 288 |
738 | 289 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
|
290 ASSERT_EQ("world", att.GetUuid()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
291 ASSERT_EQ(44u, att.GetCompressedSize()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
292 ASSERT_EQ("md5", att.GetUncompressedMD5()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
293 ASSERT_EQ("md5", att.GetCompressedMD5()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
294 ASSERT_EQ(44u, att.GetUncompressedSize()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
295 ASSERT_EQ(CompressionType_None, att.GetCompressionType()); |
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
296 |
738 | 297 ASSERT_EQ(0u, listener_->deletedFiles_.size()); |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
298 ASSERT_EQ(0u, listener_->deletedResources_.size()); |
738 | 299 ASSERT_EQ(7u, index_->GetTableRecordCount("Resources")); |
300 ASSERT_EQ(3u, index_->GetTableRecordCount("AttachedFiles")); | |
301 ASSERT_EQ(1u, index_->GetTableRecordCount("Metadata")); | |
302 ASSERT_EQ(1u, index_->GetTableRecordCount("MainDicomTags")); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
303 |
738 | 304 index_->DeleteResource(a[0]); |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
305 ASSERT_EQ(5u, listener_->deletedResources_.size()); |
738 | 306 ASSERT_EQ(2u, listener_->deletedFiles_.size()); |
307 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(), | |
308 listener_->deletedFiles_.end(), | |
309 "my json file") == listener_->deletedFiles_.end()); | |
310 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(), | |
311 listener_->deletedFiles_.end(), | |
312 "my dicom file") == listener_->deletedFiles_.end()); | |
183 | 313 |
738 | 314 ASSERT_EQ(2u, index_->GetTableRecordCount("Resources")); |
315 ASSERT_EQ(0u, index_->GetTableRecordCount("Metadata")); | |
316 ASSERT_EQ(1u, index_->GetTableRecordCount("AttachedFiles")); | |
317 ASSERT_EQ(0u, index_->GetTableRecordCount("MainDicomTags")); | |
318 index_->DeleteResource(a[5]); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
319 ASSERT_EQ(7u, listener_->deletedResources_.size()); |
738 | 320 ASSERT_EQ(0u, index_->GetTableRecordCount("Resources")); |
321 ASSERT_EQ(0u, index_->GetTableRecordCount("AttachedFiles")); | |
322 ASSERT_EQ(2u, index_->GetTableRecordCount("GlobalProperties")); | |
183 | 323 |
738 | 324 ASSERT_EQ(3u, listener_->deletedFiles_.size()); |
325 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(), | |
326 listener_->deletedFiles_.end(), | |
327 "world") == listener_->deletedFiles_.end()); | |
183 | 328 } |
329 | |
330 | |
331 | |
332 | |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
333 TEST_P(DatabaseWrapperTest, Upward) |
183 | 334 { |
335 int64_t a[] = { | |
738 | 336 index_->CreateResource("a", ResourceType_Patient), // 0 |
337 index_->CreateResource("b", ResourceType_Study), // 1 | |
338 index_->CreateResource("c", ResourceType_Series), // 2 | |
339 index_->CreateResource("d", ResourceType_Instance), // 3 | |
340 index_->CreateResource("e", ResourceType_Instance), // 4 | |
341 index_->CreateResource("f", ResourceType_Study), // 5 | |
342 index_->CreateResource("g", ResourceType_Series), // 6 | |
343 index_->CreateResource("h", ResourceType_Series) // 7 | |
183 | 344 }; |
345 | |
738 | 346 index_->AttachChild(a[0], a[1]); |
347 index_->AttachChild(a[1], a[2]); | |
348 index_->AttachChild(a[2], a[3]); | |
349 index_->AttachChild(a[2], a[4]); | |
350 index_->AttachChild(a[1], a[6]); | |
351 index_->AttachChild(a[0], a[5]); | |
352 index_->AttachChild(a[5], a[7]); | |
183 | 353 |
193
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
190
diff
changeset
|
354 { |
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
190
diff
changeset
|
355 Json::Value j; |
738 | 356 index_->GetChildren(j, a[0]); |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
357 ASSERT_EQ(2u, j.size()); |
193
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
190
diff
changeset
|
358 ASSERT_TRUE((j[0u] == "b" && j[1u] == "f") || |
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
190
diff
changeset
|
359 (j[1u] == "b" && j[0u] == "f")); |
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
190
diff
changeset
|
360 |
738 | 361 index_->GetChildren(j, a[1]); |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
362 ASSERT_EQ(2u, j.size()); |
193
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
190
diff
changeset
|
363 ASSERT_TRUE((j[0u] == "c" && j[1u] == "g") || |
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
190
diff
changeset
|
364 (j[1u] == "c" && j[0u] == "g")); |
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
190
diff
changeset
|
365 |
738 | 366 index_->GetChildren(j, a[2]); |
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
367 ASSERT_EQ(2u, j.size()); |
193
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
190
diff
changeset
|
368 ASSERT_TRUE((j[0u] == "d" && j[1u] == "e") || |
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
190
diff
changeset
|
369 (j[1u] == "d" && j[0u] == "e")); |
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
190
diff
changeset
|
370 |
738 | 371 index_->GetChildren(j, a[3]); ASSERT_EQ(0u, j.size()); |
372 index_->GetChildren(j, a[4]); ASSERT_EQ(0u, j.size()); | |
373 index_->GetChildren(j, a[5]); ASSERT_EQ(1u, j.size()); ASSERT_EQ("h", j[0u].asString()); | |
374 index_->GetChildren(j, a[6]); ASSERT_EQ(0u, j.size()); | |
375 index_->GetChildren(j, a[7]); ASSERT_EQ(0u, j.size()); | |
193
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
190
diff
changeset
|
376 } |
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
190
diff
changeset
|
377 |
738 | 378 listener_->Reset(); |
379 index_->DeleteResource(a[3]); | |
380 ASSERT_EQ("c", listener_->ancestorId_); | |
381 ASSERT_EQ(ResourceType_Series, listener_->ancestorType_); | |
183 | 382 |
738 | 383 listener_->Reset(); |
384 index_->DeleteResource(a[4]); | |
385 ASSERT_EQ("b", listener_->ancestorId_); | |
386 ASSERT_EQ(ResourceType_Study, listener_->ancestorType_); | |
183 | 387 |
738 | 388 listener_->Reset(); |
389 index_->DeleteResource(a[7]); | |
390 ASSERT_EQ("a", listener_->ancestorId_); | |
391 ASSERT_EQ(ResourceType_Patient, listener_->ancestorType_); | |
183 | 392 |
738 | 393 listener_->Reset(); |
394 index_->DeleteResource(a[6]); | |
395 ASSERT_EQ("", listener_->ancestorId_); // No more ancestor | |
181 | 396 } |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
397 |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
398 |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
399 TEST_P(DatabaseWrapperTest, PatientRecycling) |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
400 { |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
401 std::vector<int64_t> patients; |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
402 for (int i = 0; i < 10; i++) |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
403 { |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
404 std::string p = "Patient " + boost::lexical_cast<std::string>(i); |
738 | 405 patients.push_back(index_->CreateResource(p, ResourceType_Patient)); |
406 index_->AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10, | |
693
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
407 "md5-" + boost::lexical_cast<std::string>(i))); |
738 | 408 ASSERT_FALSE(index_->IsProtectedPatient(patients[i])); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
409 } |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
410 |
738 | 411 ASSERT_EQ(10u, index_->GetTableRecordCount("Resources")); |
412 ASSERT_EQ(10u, index_->GetTableRecordCount("PatientRecyclingOrder")); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
413 |
738 | 414 listener_->Reset(); |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
415 ASSERT_EQ(0u, listener_->deletedResources_.size()); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
416 |
738 | 417 index_->DeleteResource(patients[5]); |
418 index_->DeleteResource(patients[0]); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
419 ASSERT_EQ(2u, listener_->deletedResources_.size()); |
738 | 420 ASSERT_EQ(8u, index_->GetTableRecordCount("Resources")); |
421 ASSERT_EQ(8u, index_->GetTableRecordCount("PatientRecyclingOrder")); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
422 |
738 | 423 ASSERT_EQ(2u, listener_->deletedFiles_.size()); |
424 ASSERT_EQ("Patient 5", listener_->deletedFiles_[0]); | |
425 ASSERT_EQ("Patient 0", listener_->deletedFiles_[1]); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
426 |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
427 int64_t p; |
738 | 428 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[1]); |
429 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
430 ASSERT_EQ(3u, listener_->deletedResources_.size()); |
738 | 431 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[2]); |
432 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
433 ASSERT_EQ(4u, listener_->deletedResources_.size()); |
738 | 434 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[3]); |
435 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
436 ASSERT_EQ(5u, listener_->deletedResources_.size()); |
738 | 437 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[4]); |
438 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
439 ASSERT_EQ(6u, listener_->deletedResources_.size()); |
738 | 440 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[6]); |
441 index_->DeleteResource(p); | |
442 index_->DeleteResource(patients[8]); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
443 ASSERT_EQ(8u, listener_->deletedResources_.size()); |
738 | 444 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[7]); |
445 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
446 ASSERT_EQ(9u, listener_->deletedResources_.size()); |
738 | 447 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[9]); |
448 index_->DeleteResource(p); | |
449 ASSERT_FALSE(index_->SelectPatientToRecycle(p)); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
450 ASSERT_EQ(10u, listener_->deletedResources_.size()); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
451 |
738 | 452 ASSERT_EQ(10u, listener_->deletedFiles_.size()); |
453 ASSERT_EQ(0u, index_->GetTableRecordCount("Resources")); | |
454 ASSERT_EQ(0u, index_->GetTableRecordCount("PatientRecyclingOrder")); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
455 } |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
456 |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
457 |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
458 TEST_P(DatabaseWrapperTest, PatientProtection) |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
459 { |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
460 std::vector<int64_t> patients; |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
461 for (int i = 0; i < 5; i++) |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
462 { |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
463 std::string p = "Patient " + boost::lexical_cast<std::string>(i); |
738 | 464 patients.push_back(index_->CreateResource(p, ResourceType_Patient)); |
465 index_->AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10, | |
693
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
466 "md5-" + boost::lexical_cast<std::string>(i))); |
738 | 467 ASSERT_FALSE(index_->IsProtectedPatient(patients[i])); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
468 } |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
469 |
738 | 470 ASSERT_EQ(5u, index_->GetTableRecordCount("Resources")); |
471 ASSERT_EQ(5u, index_->GetTableRecordCount("PatientRecyclingOrder")); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
472 |
738 | 473 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); |
474 index_->SetProtectedPatient(patients[2], true); | |
475 ASSERT_TRUE(index_->IsProtectedPatient(patients[2])); | |
476 ASSERT_EQ(4u, index_->GetTableRecordCount("PatientRecyclingOrder")); | |
477 ASSERT_EQ(5u, index_->GetTableRecordCount("Resources")); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
478 |
738 | 479 index_->SetProtectedPatient(patients[2], true); |
480 ASSERT_TRUE(index_->IsProtectedPatient(patients[2])); | |
481 ASSERT_EQ(4u, index_->GetTableRecordCount("PatientRecyclingOrder")); | |
482 index_->SetProtectedPatient(patients[2], false); | |
483 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); | |
484 ASSERT_EQ(5u, index_->GetTableRecordCount("PatientRecyclingOrder")); | |
485 index_->SetProtectedPatient(patients[2], false); | |
486 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); | |
487 ASSERT_EQ(5u, index_->GetTableRecordCount("PatientRecyclingOrder")); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
488 |
738 | 489 ASSERT_EQ(5u, index_->GetTableRecordCount("Resources")); |
490 ASSERT_EQ(5u, index_->GetTableRecordCount("PatientRecyclingOrder")); | |
491 index_->SetProtectedPatient(patients[2], true); | |
492 ASSERT_TRUE(index_->IsProtectedPatient(patients[2])); | |
493 ASSERT_EQ(4u, index_->GetTableRecordCount("PatientRecyclingOrder")); | |
494 index_->SetProtectedPatient(patients[2], false); | |
495 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); | |
496 ASSERT_EQ(5u, index_->GetTableRecordCount("PatientRecyclingOrder")); | |
497 index_->SetProtectedPatient(patients[3], true); | |
498 ASSERT_TRUE(index_->IsProtectedPatient(patients[3])); | |
499 ASSERT_EQ(4u, index_->GetTableRecordCount("PatientRecyclingOrder")); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
500 |
738 | 501 ASSERT_EQ(5u, index_->GetTableRecordCount("Resources")); |
502 ASSERT_EQ(0u, listener_->deletedFiles_.size()); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
503 |
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
504 // 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
|
505 int64_t p; |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
506 ASSERT_EQ(0u, listener_->deletedResources_.size()); |
738 | 507 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[0]); |
508 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
509 ASSERT_EQ(1u, listener_->deletedResources_.size()); |
738 | 510 ASSERT_TRUE(index_->SelectPatientToRecycle(p, patients[1])); ASSERT_EQ(p, patients[4]); |
511 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[1]); | |
512 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
513 ASSERT_EQ(2u, listener_->deletedResources_.size()); |
738 | 514 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[4]); |
515 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
516 ASSERT_EQ(3u, listener_->deletedResources_.size()); |
738 | 517 ASSERT_FALSE(index_->SelectPatientToRecycle(p, patients[2])); |
518 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[2]); | |
519 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
520 ASSERT_EQ(4u, listener_->deletedResources_.size()); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
521 // "patients[3]" is still protected |
738 | 522 ASSERT_FALSE(index_->SelectPatientToRecycle(p)); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
523 |
738 | 524 ASSERT_EQ(4u, listener_->deletedFiles_.size()); |
525 ASSERT_EQ(1u, index_->GetTableRecordCount("Resources")); | |
526 ASSERT_EQ(0u, index_->GetTableRecordCount("PatientRecyclingOrder")); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
527 |
738 | 528 index_->SetProtectedPatient(patients[3], false); |
529 ASSERT_EQ(1u, index_->GetTableRecordCount("PatientRecyclingOrder")); | |
530 ASSERT_FALSE(index_->SelectPatientToRecycle(p, patients[3])); | |
531 ASSERT_TRUE(index_->SelectPatientToRecycle(p, patients[2])); | |
532 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[3]); | |
533 index_->DeleteResource(p); | |
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
534 ASSERT_EQ(5u, listener_->deletedResources_.size()); |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
535 |
738 | 536 ASSERT_EQ(5u, listener_->deletedFiles_.size()); |
537 ASSERT_EQ(0u, index_->GetTableRecordCount("Resources")); | |
538 ASSERT_EQ(0u, index_->GetTableRecordCount("PatientRecyclingOrder")); | |
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
539 } |
310 | 540 |
541 | |
542 | |
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
543 TEST_P(DatabaseWrapperTest, Sequence) |
310 | 544 { |
738 | 545 ASSERT_EQ(1u, index_->IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); |
546 ASSERT_EQ(2u, index_->IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
547 ASSERT_EQ(3u, index_->IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
548 ASSERT_EQ(4u, index_->IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
310 | 549 } |
521 | 550 |
551 | |
552 | |
1162 | 553 TEST_P(DatabaseWrapperTest, LookupIdentifier) |
521 | 554 { |
555 int64_t a[] = { | |
738 | 556 index_->CreateResource("a", ResourceType_Study), // 0 |
557 index_->CreateResource("b", ResourceType_Study), // 1 | |
558 index_->CreateResource("c", ResourceType_Study), // 2 | |
559 index_->CreateResource("d", ResourceType_Series) // 3 | |
521 | 560 }; |
561 | |
562 DicomMap m; | |
738 | 563 m.Clear(); m.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "0"); index_->SetMainDicomTags(a[0], m); |
564 m.Clear(); m.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "1"); index_->SetMainDicomTags(a[1], m); | |
565 m.Clear(); m.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "0"); index_->SetMainDicomTags(a[2], m); | |
566 m.Clear(); m.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, "0"); index_->SetMainDicomTags(a[3], m); | |
521 | 567 |
568 std::list<int64_t> s; | |
569 | |
1162 | 570 index_->LookupIdentifier(s, DICOM_TAG_STUDY_INSTANCE_UID, "0"); |
521 | 571 ASSERT_EQ(2u, s.size()); |
572 ASSERT_TRUE(std::find(s.begin(), s.end(), a[0]) != s.end()); | |
573 ASSERT_TRUE(std::find(s.begin(), s.end(), a[2]) != s.end()); | |
574 | |
1162 | 575 index_->LookupIdentifier(s, "0"); |
521 | 576 ASSERT_EQ(3u, s.size()); |
577 ASSERT_TRUE(std::find(s.begin(), s.end(), a[0]) != s.end()); | |
578 ASSERT_TRUE(std::find(s.begin(), s.end(), a[2]) != s.end()); | |
579 ASSERT_TRUE(std::find(s.begin(), s.end(), a[3]) != s.end()); | |
580 | |
1162 | 581 index_->LookupIdentifier(s, DICOM_TAG_STUDY_INSTANCE_UID, "1"); |
521 | 582 ASSERT_EQ(1u, s.size()); |
583 ASSERT_TRUE(std::find(s.begin(), s.end(), a[1]) != s.end()); | |
584 | |
1162 | 585 index_->LookupIdentifier(s, "1"); |
521 | 586 ASSERT_EQ(1u, s.size()); |
587 ASSERT_TRUE(std::find(s.begin(), s.end(), a[1]) != s.end()); | |
588 | |
589 | |
590 /*{ | |
591 std::list<std::string> s; | |
1162 | 592 context.GetIndex().LookupIdentifier(s, DICOM_TAG_STUDY_INSTANCE_UID, "1.2.250.1.74.20130819132500.29000036381059"); |
521 | 593 for (std::list<std::string>::iterator i = s.begin(); i != s.end(); i++) |
594 { | |
595 std::cout << "*** " << *i << std::endl;; | |
596 } | |
597 }*/ | |
562
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
598 } |
705 | 599 |
600 | |
601 | |
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
602 TEST(ServerIndex, AttachmentRecycling) |
705 | 603 { |
803
4689e400e0fa
directory to store the results of the unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
738
diff
changeset
|
604 const std::string path = "UnitTestsStorage"; |
1124
790ff7a5b3bf
IStorageArea abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1030
diff
changeset
|
605 |
705 | 606 Toolbox::RemoveFile(path + "/index"); |
1124
790ff7a5b3bf
IStorageArea abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1030
diff
changeset
|
607 FilesystemStorage storage(path); |
1134
ba9fd42284d0
preparing storage plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1124
diff
changeset
|
608 ServerContext context(":memory:"); // The SQLite DB is in memory |
ba9fd42284d0
preparing storage plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1124
diff
changeset
|
609 context.SetStorageArea(storage); |
705 | 610 ServerIndex& index = context.GetIndex(); |
707
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
706
diff
changeset
|
611 |
706 | 612 index.SetMaximumStorageSize(10); |
613 | |
705 | 614 Json::Value tmp; |
615 index.ComputeStatistics(tmp); | |
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
616 ASSERT_EQ(0, tmp["CountPatients"].asInt()); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
617 ASSERT_EQ(0, boost::lexical_cast<int>(tmp["TotalDiskSize"].asString())); |
705 | 618 |
619 ServerIndex::Attachments attachments; | |
620 | |
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
621 std::vector<std::string> ids; |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
622 for (int i = 0; i < 10; i++) |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
623 { |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
624 std::string id = boost::lexical_cast<std::string>(i); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
625 DicomMap instance; |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
626 instance.SetValue(DICOM_TAG_PATIENT_ID, "patient-" + id); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
627 instance.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "study-" + id); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
628 instance.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, "series-" + id); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
629 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
|
630 |
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
631 std::map<MetadataType, std::string> instanceMetadata; |
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
632 ServerIndex::MetadataMap metadata; |
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
633 ASSERT_EQ(StoreStatus_Success, index.Store(instanceMetadata, instance, attachments, "", metadata)); |
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
634 ASSERT_EQ(2, instanceMetadata.size()); |
1029 | 635 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_RemoteAet) != instanceMetadata.end()); |
636 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_ReceptionDate) != instanceMetadata.end()); | |
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
637 |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
638 DicomInstanceHasher hasher(instance); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
639 ids.push_back(hasher.HashPatient()); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
640 ids.push_back(hasher.HashStudy()); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
641 ids.push_back(hasher.HashSeries()); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
642 ids.push_back(hasher.HashInstance()); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
643 } |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
644 |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
645 index.ComputeStatistics(tmp); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
646 ASSERT_EQ(10, tmp["CountPatients"].asInt()); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
647 ASSERT_EQ(0, boost::lexical_cast<int>(tmp["TotalDiskSize"].asString())); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
648 |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
649 for (size_t i = 0; i < ids.size(); i++) |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
650 { |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
651 FileInfo info(Toolbox::GenerateUuid(), FileContentType_Dicom, 1, "md5"); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
652 index.AddAttachment(info, ids[i]); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
653 |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
654 index.ComputeStatistics(tmp); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
655 ASSERT_GE(10, boost::lexical_cast<int>(tmp["TotalDiskSize"].asString())); |
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
656 } |
707
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
706
diff
changeset
|
657 |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
706
diff
changeset
|
658 // 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
|
659 ASSERT_THROW(Toolbox::GetFileSize(path + "/index"), OrthancException); |
705 | 660 } |