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