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