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