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