Mercurial > hg > orthanc
annotate OrthancServer/UnitTestsSources/ServerIndexTests.cpp @ 4551:350a22c094f2 db-changes
testing replay of transactions
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 02 Mar 2021 19:36:59 +0100 |
| parents | 5b929e6b3c36 |
| children | 9224e107d613 |
| 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 |
| 1900 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
|
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1287
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
|
4437
d9473bd5ed43
upgrade to year 2021
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4062
diff
changeset
|
5 * Copyright (C) 2017-2021 Osimis S.A., Belgium |
|
827
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
6 * |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
7 * 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
|
8 * 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
|
9 * 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
|
10 * License, or (at your option) any later version. |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
11 * |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
12 * 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
|
13 * 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
|
14 * 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
|
15 * 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
|
16 * 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
|
17 * 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
|
18 * 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
|
19 * 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
|
20 * 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
|
21 * 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
|
22 * in the program, then also delete it here. |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
23 * |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
24 * 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
|
25 * 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
|
26 * 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
|
27 * General Public License for more details. |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
28 * |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
29 * 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
|
30 * 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
|
31 **/ |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
32 |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
33 |
|
831
84513f2ee1f3
pch for unit tests and server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
827
diff
changeset
|
34 #include "PrecompiledHeadersUnitTests.h" |
| 4062 | 35 #include <gtest/gtest.h> |
| 181 | 36 |
| 4045 | 37 #include "../../OrthancFramework/Sources/Compatibility.h" |
| 38 #include "../../OrthancFramework/Sources/FileStorage/FilesystemStorage.h" | |
| 39 #include "../../OrthancFramework/Sources/FileStorage/MemoryStorageArea.h" | |
|
4514
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
40 #include "../../OrthancFramework/Sources/Images/Image.h" |
| 4045 | 41 #include "../../OrthancFramework/Sources/Logging.h" |
| 4062 | 42 |
| 4045 | 43 #include "../Sources/Database/SQLiteDatabaseWrapper.h" |
|
4505
97d103b57cd1
removed cached dicom summary from DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4499
diff
changeset
|
44 #include "../Sources/OrthancConfiguration.h" |
| 4045 | 45 #include "../Sources/Search/DatabaseLookup.h" |
| 46 #include "../Sources/ServerContext.h" | |
| 47 #include "../Sources/ServerToolbox.h" | |
| 183 | 48 |
| 181 | 49 #include <ctype.h> |
| 521 | 50 #include <algorithm> |
| 181 | 51 |
| 183 | 52 using namespace Orthanc; |
| 181 | 53 |
| 183 | 54 namespace |
| 55 { | |
|
1432
0ac74fa21db8
rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1294
diff
changeset
|
56 class TestDatabaseListener : public IDatabaseListener |
| 181 | 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_; |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
60 std::vector<std::string> deletedResources_; |
| 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, | |
|
2924
22524fd06225
macros ORTHANC_OVERRIDE and ORTHANC_FINAL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2898
diff
changeset
|
71 const std::string& publicId) |
|
22524fd06225
macros ORTHANC_OVERRIDE and ORTHANC_FINAL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2898
diff
changeset
|
72 ORTHANC_OVERRIDE |
| 183 | 73 { |
| 74 ancestorId_ = publicId; | |
| 75 ancestorType_ = type; | |
| 181 | 76 } |
| 77 | |
|
2924
22524fd06225
macros ORTHANC_OVERRIDE and ORTHANC_FINAL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2898
diff
changeset
|
78 virtual void SignalFileDeleted(const FileInfo& info) ORTHANC_OVERRIDE |
| 181 | 79 { |
|
273
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
80 const std::string fileUuid = info.GetUuid(); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
81 deletedFiles_.push_back(fileUuid); |
| 181 | 82 LOG(INFO) << "A file must be removed: " << fileUuid; |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
83 } |
|
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
84 |
|
2924
22524fd06225
macros ORTHANC_OVERRIDE and ORTHANC_FINAL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2898
diff
changeset
|
85 virtual void SignalChange(const ServerIndexChange& change) ORTHANC_OVERRIDE |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
86 { |
| 1198 | 87 if (change.GetChangeType() == ChangeType_Deleted) |
|
1177
5b2d8c280ac2
Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
88 { |
| 1198 | 89 deletedResources_.push_back(change.GetPublicId()); |
|
1177
5b2d8c280ac2
Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
90 } |
|
5b2d8c280ac2
Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
91 |
| 1198 | 92 LOG(INFO) << "Change related to resource " << change.GetPublicId() << " of type " |
| 93 << EnumerationToString(change.GetResourceType()) << ": " | |
| 94 << EnumerationToString(change.GetChangeType()); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
95 } |
| 181 | 96 }; |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
97 |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
98 |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
99 class DatabaseWrapperTest : public ::testing::Test |
|
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 protected: |
|
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
102 std::unique_ptr<TestDatabaseListener> listener_; |
|
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
103 std::unique_ptr<SQLiteDatabaseWrapper> index_; |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
104 |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
105 public: |
| 738 | 106 DatabaseWrapperTest() |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
107 { |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
108 } |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
109 |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
110 virtual void SetUp() ORTHANC_OVERRIDE |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
111 { |
|
1432
0ac74fa21db8
rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1294
diff
changeset
|
112 listener_.reset(new TestDatabaseListener); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
113 index_.reset(new SQLiteDatabaseWrapper); |
| 1247 | 114 index_->SetListener(*listener_); |
|
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
115 index_->Open(); |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
116 } |
|
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
117 |
|
2924
22524fd06225
macros ORTHANC_OVERRIDE and ORTHANC_FINAL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2898
diff
changeset
|
118 virtual void TearDown() ORTHANC_OVERRIDE |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
119 { |
|
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
120 index_->Close(); |
| 738 | 121 index_.reset(NULL); |
| 122 listener_.reset(NULL); | |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
123 } |
| 1286 | 124 |
| 125 void CheckTableRecordCount(uint32_t expected, const char* table) | |
| 126 { | |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
127 ASSERT_EQ(expected, index_->GetTableRecordCount(table)); |
| 1287 | 128 } |
| 129 | |
| 130 void CheckNoParent(int64_t id) | |
| 131 { | |
| 132 std::string s; | |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
133 ASSERT_FALSE(index_->GetParentPublicId(s, id)); |
| 1287 | 134 } |
| 135 | |
| 136 void CheckParentPublicId(const char* expected, int64_t id) | |
| 137 { | |
| 138 std::string s; | |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
139 ASSERT_TRUE(index_->GetParentPublicId(s, id)); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
140 ASSERT_EQ(expected, s); |
| 1286 | 141 } |
| 142 | |
| 1287 | 143 void CheckNoChild(int64_t id) |
| 144 { | |
| 145 std::list<std::string> j; | |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
146 index_->GetChildren(j, id); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
147 ASSERT_EQ(0u, j.size()); |
| 1287 | 148 } |
| 149 | |
| 150 void CheckOneChild(const char* expected, int64_t id) | |
| 151 { | |
| 152 std::list<std::string> j; | |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
153 index_->GetChildren(j, id); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
154 ASSERT_EQ(1u, j.size()); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
155 ASSERT_EQ(expected, j.front()); |
| 1287 | 156 } |
| 157 | |
| 158 void CheckTwoChildren(const char* expected1, | |
| 159 const char* expected2, | |
| 160 int64_t id) | |
| 161 { | |
| 162 std::list<std::string> j; | |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
163 index_->GetChildren(j, id); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
164 ASSERT_EQ(2u, j.size()); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
165 ASSERT_TRUE((expected1 == j.front() && expected2 == j.back()) || |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
166 (expected1 == j.back() && expected2 == j.front())); |
| 1287 | 167 } |
| 1746 | 168 |
|
3075
ead8576a02ef
IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3073
diff
changeset
|
169 void DoLookupIdentifier(std::list<std::string>& result, |
|
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
170 ResourceType level, |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
171 const DicomTag& tag, |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
172 ConstraintType type, |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
173 const std::string& value) |
| 1746 | 174 { |
|
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
175 assert(ServerToolbox::IsIdentifier(tag, level)); |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
176 |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
177 DicomTagConstraint c(tag, type, value, true, true); |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
178 |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
179 std::vector<DatabaseConstraint> lookup; |
|
3073
0e9d1731b1b0
refactoring to reuse DatabaseConstraint in separate projects
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3061
diff
changeset
|
180 lookup.push_back(c.ConvertToDatabaseConstraint(level, DicomTagType_Identifier)); |
|
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
181 |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
182 index_->ApplyLookupResources(result, NULL, lookup, level, 0 /* no limit */); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
183 } |
| 1746 | 184 |
|
3075
ead8576a02ef
IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3073
diff
changeset
|
185 void DoLookupIdentifier2(std::list<std::string>& result, |
|
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
186 ResourceType level, |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
187 const DicomTag& tag, |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
188 ConstraintType type1, |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
189 const std::string& value1, |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
190 ConstraintType type2, |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
191 const std::string& value2) |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
192 { |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
193 assert(ServerToolbox::IsIdentifier(tag, level)); |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
194 |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
195 DicomTagConstraint c1(tag, type1, value1, true, true); |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
196 DicomTagConstraint c2(tag, type2, value2, true, true); |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
197 |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
198 std::vector<DatabaseConstraint> lookup; |
|
3073
0e9d1731b1b0
refactoring to reuse DatabaseConstraint in separate projects
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3061
diff
changeset
|
199 lookup.push_back(c1.ConvertToDatabaseConstraint(level, DicomTagType_Identifier)); |
|
0e9d1731b1b0
refactoring to reuse DatabaseConstraint in separate projects
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3061
diff
changeset
|
200 lookup.push_back(c2.ConvertToDatabaseConstraint(level, DicomTagType_Identifier)); |
|
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
201 |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
202 index_->ApplyLookupResources(result, NULL, lookup, level, 0 /* no limit */); |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
203 } |
|
737
1dee6e9bdbf4
abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
204 }; |
| 181 | 205 } |
| 206 | |
| 207 | |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
208 TEST_F(DatabaseWrapperTest, Simple) |
| 181 | 209 { |
| 210 int64_t a[] = { | |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
211 index_->CreateResource("a", ResourceType_Patient), // 0 |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
212 index_->CreateResource("b", ResourceType_Study), // 1 |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
213 index_->CreateResource("c", ResourceType_Series), // 2 |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
214 index_->CreateResource("d", ResourceType_Instance), // 3 |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
215 index_->CreateResource("e", ResourceType_Instance), // 4 |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
216 index_->CreateResource("f", ResourceType_Instance), // 5 |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
217 index_->CreateResource("g", ResourceType_Study) // 6 |
| 181 | 218 }; |
| 219 | |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
220 ASSERT_EQ("a", index_->GetPublicId(a[0])); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
221 ASSERT_EQ("b", index_->GetPublicId(a[1])); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
222 ASSERT_EQ("c", index_->GetPublicId(a[2])); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
223 ASSERT_EQ("d", index_->GetPublicId(a[3])); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
224 ASSERT_EQ("e", index_->GetPublicId(a[4])); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
225 ASSERT_EQ("f", index_->GetPublicId(a[5])); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
226 ASSERT_EQ("g", index_->GetPublicId(a[6])); |
|
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
227 |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
228 ASSERT_EQ(ResourceType_Patient, index_->GetResourceType(a[0])); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
229 ASSERT_EQ(ResourceType_Study, index_->GetResourceType(a[1])); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
230 ASSERT_EQ(ResourceType_Series, index_->GetResourceType(a[2])); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
231 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[3])); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
232 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[4])); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
233 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[5])); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
234 ASSERT_EQ(ResourceType_Study, index_->GetResourceType(a[6])); |
| 304 | 235 |
| 190 | 236 { |
| 1241 | 237 std::list<std::string> t; |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
238 index_->GetAllPublicIds(t, ResourceType_Patient); |
| 190 | 239 |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
240 ASSERT_EQ(1u, t.size()); |
| 1241 | 241 ASSERT_EQ("a", t.front()); |
| 190 | 242 |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
243 index_->GetAllPublicIds(t, ResourceType_Series); |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
244 ASSERT_EQ(1u, t.size()); |
| 1241 | 245 ASSERT_EQ("c", t.front()); |
| 190 | 246 |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
247 index_->GetAllPublicIds(t, ResourceType_Study); |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
248 ASSERT_EQ(2u, t.size()); |
| 190 | 249 |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
250 index_->GetAllPublicIds(t, ResourceType_Instance); |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
251 ASSERT_EQ(3u, t.size()); |
| 190 | 252 } |
| 253 | |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
254 index_->SetGlobalProperty(GlobalProperty_FlushSleep, "World"); |
| 181 | 255 |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
256 index_->AttachChild(a[0], a[1]); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
257 index_->AttachChild(a[1], a[2]); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
258 index_->AttachChild(a[2], a[3]); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
259 index_->AttachChild(a[2], a[4]); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
260 index_->AttachChild(a[6], a[5]); |
| 182 | 261 |
|
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
262 int64_t parent; |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
263 ASSERT_FALSE(index_->LookupParent(parent, a[0])); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
264 ASSERT_TRUE(index_->LookupParent(parent, a[1])); ASSERT_EQ(a[0], parent); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
265 ASSERT_TRUE(index_->LookupParent(parent, a[2])); ASSERT_EQ(a[1], parent); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
266 ASSERT_TRUE(index_->LookupParent(parent, a[3])); ASSERT_EQ(a[2], parent); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
267 ASSERT_TRUE(index_->LookupParent(parent, a[4])); ASSERT_EQ(a[2], parent); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
268 ASSERT_TRUE(index_->LookupParent(parent, a[5])); ASSERT_EQ(a[6], parent); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
269 ASSERT_FALSE(index_->LookupParent(parent, a[6])); |
|
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
270 |
| 182 | 271 std::string s; |
| 1286 | 272 |
| 1287 | 273 CheckNoParent(a[0]); |
| 274 CheckNoParent(a[6]); | |
| 275 CheckParentPublicId("a", a[1]); | |
| 276 CheckParentPublicId("b", a[2]); | |
| 277 CheckParentPublicId("c", a[3]); | |
| 278 CheckParentPublicId("c", a[4]); | |
| 279 CheckParentPublicId("g", a[5]); | |
| 182 | 280 |
| 185 | 281 std::list<std::string> l; |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
282 index_->GetChildrenPublicId(l, a[0]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("b", l.front()); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
283 index_->GetChildrenPublicId(l, a[1]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("c", l.front()); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
284 index_->GetChildrenPublicId(l, a[3]); ASSERT_EQ(0u, l.size()); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
285 index_->GetChildrenPublicId(l, a[4]); ASSERT_EQ(0u, l.size()); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
286 index_->GetChildrenPublicId(l, a[5]); ASSERT_EQ(0u, l.size()); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
287 index_->GetChildrenPublicId(l, a[6]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("f", l.front()); |
| 182 | 288 |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
289 index_->GetChildrenPublicId(l, a[2]); ASSERT_EQ(2u, l.size()); |
| 182 | 290 if (l.front() == "d") |
| 291 { | |
| 292 ASSERT_EQ("e", l.back()); | |
| 293 } | |
| 294 else | |
| 295 { | |
| 296 ASSERT_EQ("d", l.back()); | |
| 297 ASSERT_EQ("e", l.front()); | |
| 298 } | |
| 299 | |
|
3187
4bbadcd03966
refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3179
diff
changeset
|
300 std::map<MetadataType, std::string> md; |
|
4bbadcd03966
refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3179
diff
changeset
|
301 index_->GetAllMetadata(md, a[4]); |
|
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
302 ASSERT_EQ(0u, md.size()); |
|
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
303 |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
304 index_->AddAttachment(a[4], FileInfo("my json file", FileContentType_DicomAsJson, 42, "md5", |
|
1514
d73a2178b319
support of deflate and gzip content-types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1492
diff
changeset
|
305 CompressionType_ZlibWithSize, 21, "compressedMD5")); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
306 index_->AddAttachment(a[4], FileInfo("my dicom file", FileContentType_Dicom, 42, "md5")); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
307 index_->AddAttachment(a[6], FileInfo("world", FileContentType_Dicom, 44, "md5")); |
|
4460
6831de40acd9
New metadata automatically computed at the series level: "RemoteAET"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
308 index_->SetMetadata(a[4], MetadataType_RemoteAet, "PINNACLE"); |
|
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
309 |
|
3187
4bbadcd03966
refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3179
diff
changeset
|
310 index_->GetAllMetadata(md, a[4]); |
|
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
310
diff
changeset
|
311 ASSERT_EQ(1u, md.size()); |
|
4460
6831de40acd9
New metadata automatically computed at the series level: "RemoteAET"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
312 ASSERT_EQ("PINNACLE", md[MetadataType_RemoteAet]); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
313 index_->SetMetadata(a[4], MetadataType_ModifiedFrom, "TUTU"); |
|
3187
4bbadcd03966
refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3179
diff
changeset
|
314 index_->GetAllMetadata(md, a[4]); |
| 438 | 315 ASSERT_EQ(2u, md.size()); |
| 1030 | 316 |
| 317 std::map<MetadataType, std::string> md2; | |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
318 index_->GetAllMetadata(md2, a[4]); |
| 1030 | 319 ASSERT_EQ(2u, md2.size()); |
| 320 ASSERT_EQ("TUTU", md2[MetadataType_ModifiedFrom]); | |
|
4460
6831de40acd9
New metadata automatically computed at the series level: "RemoteAET"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
321 ASSERT_EQ("PINNACLE", md2[MetadataType_RemoteAet]); |
| 1030 | 322 |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
323 index_->DeleteMetadata(a[4], MetadataType_ModifiedFrom); |
|
3187
4bbadcd03966
refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3179
diff
changeset
|
324 index_->GetAllMetadata(md, a[4]); |
| 438 | 325 ASSERT_EQ(1u, md.size()); |
|
4460
6831de40acd9
New metadata automatically computed at the series level: "RemoteAET"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
326 ASSERT_EQ("PINNACLE", md[MetadataType_RemoteAet]); |
| 182 | 327 |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
328 index_->GetAllMetadata(md2, a[4]); |
| 1030 | 329 ASSERT_EQ(1u, md2.size()); |
|
4460
6831de40acd9
New metadata automatically computed at the series level: "RemoteAET"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
330 ASSERT_EQ("PINNACLE", md2[MetadataType_RemoteAet]); |
| 1030 | 331 |
| 332 | |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
333 ASSERT_EQ(21u + 42u + 44u, index_->GetTotalCompressedSize()); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
334 ASSERT_EQ(42u + 42u + 44u, index_->GetTotalUncompressedSize()); |
| 181 | 335 |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
336 index_->SetMainDicomTag(a[3], DicomTag(0x0010, 0x0010), "PatientName"); |
| 181 | 337 |
| 338 int64_t b; | |
| 339 ResourceType t; | |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
340 ASSERT_TRUE(index_->LookupResource(b, t, "g")); |
| 181 | 341 ASSERT_EQ(7, b); |
| 342 ASSERT_EQ(ResourceType_Study, t); | |
| 343 | |
|
4460
6831de40acd9
New metadata automatically computed at the series level: "RemoteAET"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
344 ASSERT_TRUE(index_->LookupMetadata(s, a[4], MetadataType_RemoteAet)); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
345 ASSERT_FALSE(index_->LookupMetadata(s, a[4], MetadataType_Instance_IndexInSeries)); |
| 181 | 346 ASSERT_EQ("PINNACLE", s); |
| 1238 | 347 |
| 348 std::string u; | |
|
4460
6831de40acd9
New metadata automatically computed at the series level: "RemoteAET"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
349 ASSERT_TRUE(index_->LookupMetadata(u, a[4], MetadataType_RemoteAet)); |
| 1238 | 350 ASSERT_EQ("PINNACLE", u); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
351 ASSERT_FALSE(index_->LookupMetadata(u, a[4], MetadataType_Instance_IndexInSeries)); |
| 181 | 352 |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
353 ASSERT_TRUE(index_->LookupGlobalProperty(s, GlobalProperty_FlushSleep)); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
354 ASSERT_FALSE(index_->LookupGlobalProperty(s, static_cast<GlobalProperty>(42))); |
| 181 | 355 ASSERT_EQ("World", s); |
| 356 | |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
357 FileInfo att; |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
358 ASSERT_TRUE(index_->LookupAttachment(att, a[4], FileContentType_DicomAsJson)); |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
359 ASSERT_EQ("my json file", att.GetUuid()); |
|
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
360 ASSERT_EQ(21u, att.GetCompressedSize()); |
|
693
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
361 ASSERT_EQ("md5", att.GetUncompressedMD5()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
362 ASSERT_EQ("compressedMD5", att.GetCompressedMD5()); |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
363 ASSERT_EQ(42u, att.GetUncompressedSize()); |
|
1514
d73a2178b319
support of deflate and gzip content-types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1492
diff
changeset
|
364 ASSERT_EQ(CompressionType_ZlibWithSize, att.GetCompressionType()); |
| 181 | 365 |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
366 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
|
367 ASSERT_EQ("world", att.GetUuid()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
368 ASSERT_EQ(44u, att.GetCompressedSize()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
369 ASSERT_EQ("md5", att.GetUncompressedMD5()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
370 ASSERT_EQ("md5", att.GetCompressedMD5()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
371 ASSERT_EQ(44u, att.GetUncompressedSize()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
372 ASSERT_EQ(CompressionType_None, att.GetCompressionType()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
373 |
| 738 | 374 ASSERT_EQ(0u, listener_->deletedFiles_.size()); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
375 ASSERT_EQ(0u, listener_->deletedResources_.size()); |
| 1286 | 376 |
| 377 CheckTableRecordCount(7, "Resources"); | |
| 378 CheckTableRecordCount(3, "AttachedFiles"); | |
| 379 CheckTableRecordCount(1, "Metadata"); | |
| 380 CheckTableRecordCount(1, "MainDicomTags"); | |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
381 |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
382 index_->DeleteResource(a[0]); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
383 ASSERT_EQ(5u, listener_->deletedResources_.size()); |
| 738 | 384 ASSERT_EQ(2u, listener_->deletedFiles_.size()); |
| 385 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(), | |
| 386 listener_->deletedFiles_.end(), | |
| 387 "my json file") == listener_->deletedFiles_.end()); | |
| 388 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(), | |
| 389 listener_->deletedFiles_.end(), | |
| 390 "my dicom file") == listener_->deletedFiles_.end()); | |
| 183 | 391 |
| 1286 | 392 CheckTableRecordCount(2, "Resources"); |
| 393 CheckTableRecordCount(0, "Metadata"); | |
| 394 CheckTableRecordCount(1, "AttachedFiles"); | |
| 395 CheckTableRecordCount(0, "MainDicomTags"); | |
| 396 | |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
397 index_->DeleteResource(a[5]); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
398 ASSERT_EQ(7u, listener_->deletedResources_.size()); |
| 1286 | 399 |
| 400 CheckTableRecordCount(0, "Resources"); | |
| 401 CheckTableRecordCount(0, "AttachedFiles"); | |
| 3121 | 402 CheckTableRecordCount(3, "GlobalProperties"); |
|
3018
e3b5c07146a3
speeding up the computation of the size of the attachments in SQLite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3017
diff
changeset
|
403 |
|
e3b5c07146a3
speeding up the computation of the size of the attachments in SQLite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3017
diff
changeset
|
404 std::string tmp; |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
405 ASSERT_TRUE(index_->LookupGlobalProperty(tmp, GlobalProperty_DatabaseSchemaVersion)); |
|
3018
e3b5c07146a3
speeding up the computation of the size of the attachments in SQLite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3017
diff
changeset
|
406 ASSERT_EQ("6", tmp); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
407 ASSERT_TRUE(index_->LookupGlobalProperty(tmp, GlobalProperty_FlushSleep)); |
|
3018
e3b5c07146a3
speeding up the computation of the size of the attachments in SQLite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3017
diff
changeset
|
408 ASSERT_EQ("World", tmp); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
409 ASSERT_TRUE(index_->LookupGlobalProperty(tmp, GlobalProperty_GetTotalSizeIsFast)); |
|
3018
e3b5c07146a3
speeding up the computation of the size of the attachments in SQLite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3017
diff
changeset
|
410 ASSERT_EQ("1", tmp); |
| 183 | 411 |
| 738 | 412 ASSERT_EQ(3u, listener_->deletedFiles_.size()); |
| 413 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(), | |
| 414 listener_->deletedFiles_.end(), | |
| 415 "world") == listener_->deletedFiles_.end()); | |
| 183 | 416 } |
| 417 | |
| 418 | |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
419 TEST_F(DatabaseWrapperTest, Upward) |
| 183 | 420 { |
| 421 int64_t a[] = { | |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
422 index_->CreateResource("a", ResourceType_Patient), // 0 |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
423 index_->CreateResource("b", ResourceType_Study), // 1 |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
424 index_->CreateResource("c", ResourceType_Series), // 2 |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
425 index_->CreateResource("d", ResourceType_Instance), // 3 |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
426 index_->CreateResource("e", ResourceType_Instance), // 4 |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
427 index_->CreateResource("f", ResourceType_Study), // 5 |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
428 index_->CreateResource("g", ResourceType_Series), // 6 |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
429 index_->CreateResource("h", ResourceType_Series) // 7 |
| 183 | 430 }; |
| 431 | |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
432 index_->AttachChild(a[0], a[1]); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
433 index_->AttachChild(a[1], a[2]); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
434 index_->AttachChild(a[2], a[3]); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
435 index_->AttachChild(a[2], a[4]); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
436 index_->AttachChild(a[1], a[6]); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
437 index_->AttachChild(a[0], a[5]); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
438 index_->AttachChild(a[5], a[7]); |
| 183 | 439 |
| 1287 | 440 CheckTwoChildren("b", "f", a[0]); |
| 441 CheckTwoChildren("c", "g", a[1]); | |
| 442 CheckTwoChildren("d", "e", a[2]); | |
| 443 CheckNoChild(a[3]); | |
| 444 CheckNoChild(a[4]); | |
| 445 CheckOneChild("h", a[5]); | |
| 446 CheckNoChild(a[6]); | |
| 447 CheckNoChild(a[7]); | |
|
193
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
190
diff
changeset
|
448 |
| 738 | 449 listener_->Reset(); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
450 index_->DeleteResource(a[3]); |
| 738 | 451 ASSERT_EQ("c", listener_->ancestorId_); |
| 452 ASSERT_EQ(ResourceType_Series, listener_->ancestorType_); | |
| 183 | 453 |
| 738 | 454 listener_->Reset(); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
455 index_->DeleteResource(a[4]); |
| 738 | 456 ASSERT_EQ("b", listener_->ancestorId_); |
| 457 ASSERT_EQ(ResourceType_Study, listener_->ancestorType_); | |
| 183 | 458 |
| 738 | 459 listener_->Reset(); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
460 index_->DeleteResource(a[7]); |
| 738 | 461 ASSERT_EQ("a", listener_->ancestorId_); |
| 462 ASSERT_EQ(ResourceType_Patient, listener_->ancestorType_); | |
| 183 | 463 |
| 738 | 464 listener_->Reset(); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
465 index_->DeleteResource(a[6]); |
| 738 | 466 ASSERT_EQ("", listener_->ancestorId_); // No more ancestor |
| 181 | 467 } |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
468 |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
469 |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
470 TEST_F(DatabaseWrapperTest, PatientRecycling) |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
471 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
472 std::vector<int64_t> patients; |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
473 for (int i = 0; i < 10; i++) |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
474 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
475 std::string p = "Patient " + boost::lexical_cast<std::string>(i); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
476 patients.push_back(index_->CreateResource(p, ResourceType_Patient)); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
477 index_->AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10, |
| 1287 | 478 "md5-" + boost::lexical_cast<std::string>(i))); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
479 ASSERT_FALSE(index_->IsProtectedPatient(patients[i])); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
480 } |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
481 |
| 1286 | 482 CheckTableRecordCount(10u, "Resources"); |
| 483 CheckTableRecordCount(10u, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
484 |
| 738 | 485 listener_->Reset(); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
486 ASSERT_EQ(0u, listener_->deletedResources_.size()); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
487 |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
488 index_->DeleteResource(patients[5]); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
489 index_->DeleteResource(patients[0]); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
490 ASSERT_EQ(2u, listener_->deletedResources_.size()); |
| 1286 | 491 |
| 492 CheckTableRecordCount(8u, "Resources"); | |
| 493 CheckTableRecordCount(8u, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
494 |
| 738 | 495 ASSERT_EQ(2u, listener_->deletedFiles_.size()); |
| 496 ASSERT_EQ("Patient 5", listener_->deletedFiles_[0]); | |
| 497 ASSERT_EQ("Patient 0", listener_->deletedFiles_[1]); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
498 |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
499 int64_t p; |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
500 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[1]); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
501 index_->DeleteResource(p); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
502 ASSERT_EQ(3u, listener_->deletedResources_.size()); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
503 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[2]); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
504 index_->DeleteResource(p); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
505 ASSERT_EQ(4u, listener_->deletedResources_.size()); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
506 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[3]); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
507 index_->DeleteResource(p); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
508 ASSERT_EQ(5u, listener_->deletedResources_.size()); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
509 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[4]); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
510 index_->DeleteResource(p); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
511 ASSERT_EQ(6u, listener_->deletedResources_.size()); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
512 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[6]); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
513 index_->DeleteResource(p); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
514 index_->DeleteResource(patients[8]); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
515 ASSERT_EQ(8u, listener_->deletedResources_.size()); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
516 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[7]); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
517 index_->DeleteResource(p); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
518 ASSERT_EQ(9u, listener_->deletedResources_.size()); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
519 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[9]); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
520 index_->DeleteResource(p); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
521 ASSERT_FALSE(index_->SelectPatientToRecycle(p)); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
522 ASSERT_EQ(10u, listener_->deletedResources_.size()); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
523 |
| 738 | 524 ASSERT_EQ(10u, listener_->deletedFiles_.size()); |
| 1286 | 525 |
| 526 CheckTableRecordCount(0, "Resources"); | |
| 527 CheckTableRecordCount(0, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
528 } |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
529 |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
530 |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
531 TEST_F(DatabaseWrapperTest, PatientProtection) |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
532 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
533 std::vector<int64_t> patients; |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
534 for (int i = 0; i < 5; i++) |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
535 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
536 std::string p = "Patient " + boost::lexical_cast<std::string>(i); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
537 patients.push_back(index_->CreateResource(p, ResourceType_Patient)); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
538 index_->AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10, |
| 1287 | 539 "md5-" + boost::lexical_cast<std::string>(i))); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
540 ASSERT_FALSE(index_->IsProtectedPatient(patients[i])); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
541 } |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
542 |
| 1286 | 543 CheckTableRecordCount(5, "Resources"); |
| 544 CheckTableRecordCount(5, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
545 |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
546 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
547 index_->SetProtectedPatient(patients[2], true); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
548 ASSERT_TRUE(index_->IsProtectedPatient(patients[2])); |
| 1286 | 549 CheckTableRecordCount(5, "Resources"); |
| 550 CheckTableRecordCount(4, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
551 |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
552 index_->SetProtectedPatient(patients[2], true); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
553 ASSERT_TRUE(index_->IsProtectedPatient(patients[2])); |
| 1286 | 554 CheckTableRecordCount(4, "PatientRecyclingOrder"); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
555 index_->SetProtectedPatient(patients[2], false); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
556 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); |
| 1286 | 557 CheckTableRecordCount(5, "PatientRecyclingOrder"); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
558 index_->SetProtectedPatient(patients[2], false); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
559 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); |
| 1286 | 560 CheckTableRecordCount(5, "PatientRecyclingOrder"); |
| 561 CheckTableRecordCount(5, "Resources"); | |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
562 index_->SetProtectedPatient(patients[2], true); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
563 ASSERT_TRUE(index_->IsProtectedPatient(patients[2])); |
| 1286 | 564 CheckTableRecordCount(4, "PatientRecyclingOrder"); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
565 index_->SetProtectedPatient(patients[2], false); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
566 ASSERT_FALSE(index_->IsProtectedPatient(patients[2])); |
| 1286 | 567 CheckTableRecordCount(5, "PatientRecyclingOrder"); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
568 index_->SetProtectedPatient(patients[3], true); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
569 ASSERT_TRUE(index_->IsProtectedPatient(patients[3])); |
| 1286 | 570 CheckTableRecordCount(4, "PatientRecyclingOrder"); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
571 |
| 1286 | 572 CheckTableRecordCount(5, "Resources"); |
| 738 | 573 ASSERT_EQ(0u, listener_->deletedFiles_.size()); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
574 |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
575 // 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
|
576 int64_t p; |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
577 ASSERT_EQ(0u, listener_->deletedResources_.size()); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
578 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[0]); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
579 index_->DeleteResource(p); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
580 ASSERT_EQ(1u, listener_->deletedResources_.size()); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
581 ASSERT_TRUE(index_->SelectPatientToRecycle(p, patients[1])); ASSERT_EQ(p, patients[4]); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
582 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[1]); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
583 index_->DeleteResource(p); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
584 ASSERT_EQ(2u, listener_->deletedResources_.size()); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
585 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[4]); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
586 index_->DeleteResource(p); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
587 ASSERT_EQ(3u, listener_->deletedResources_.size()); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
588 ASSERT_FALSE(index_->SelectPatientToRecycle(p, patients[2])); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
589 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[2]); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
590 index_->DeleteResource(p); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
591 ASSERT_EQ(4u, listener_->deletedResources_.size()); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
592 // "patients[3]" is still protected |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
593 ASSERT_FALSE(index_->SelectPatientToRecycle(p)); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
594 |
| 738 | 595 ASSERT_EQ(4u, listener_->deletedFiles_.size()); |
| 1286 | 596 CheckTableRecordCount(1, "Resources"); |
| 597 CheckTableRecordCount(0, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
598 |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
599 index_->SetProtectedPatient(patients[3], false); |
| 1286 | 600 CheckTableRecordCount(1, "PatientRecyclingOrder"); |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
601 ASSERT_FALSE(index_->SelectPatientToRecycle(p, patients[3])); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
602 ASSERT_TRUE(index_->SelectPatientToRecycle(p, patients[2])); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
603 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[3]); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
604 index_->DeleteResource(p); |
|
1159
8f9d49192815
speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
605 ASSERT_EQ(5u, listener_->deletedResources_.size()); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
606 |
| 738 | 607 ASSERT_EQ(5u, listener_->deletedFiles_.size()); |
| 1286 | 608 CheckTableRecordCount(0, "Resources"); |
| 609 CheckTableRecordCount(0, "PatientRecyclingOrder"); | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
610 } |
| 310 | 611 |
| 612 | |
| 1237 | 613 TEST(ServerIndex, Sequence) |
| 310 | 614 { |
| 1237 | 615 const std::string path = "UnitTestsStorage"; |
| 616 | |
| 2140 | 617 SystemToolbox::RemoveFile(path + "/index"); |
| 1237 | 618 FilesystemStorage storage(path); |
|
3017
517fc4767ae0
renamed class DatabaseWrapper as SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3001
diff
changeset
|
619 SQLiteDatabaseWrapper db; // The SQLite DB is in memory |
|
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
620 db.Open(); |
|
2950
dc18d5804746
support of JobsHistorySize set to zero
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2924
diff
changeset
|
621 ServerContext context(db, storage, true /* running unit tests */, 10); |
|
2815
925d8dc03a23
unserialization of jobs from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2671
diff
changeset
|
622 context.SetupJobsEngine(true, false); |
|
925d8dc03a23
unserialization of jobs from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2671
diff
changeset
|
623 |
| 1237 | 624 ServerIndex& index = context.GetIndex(); |
| 625 | |
| 626 ASSERT_EQ(1u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
| 627 ASSERT_EQ(2u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
| 628 ASSERT_EQ(3u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
| 629 ASSERT_EQ(4u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence)); | |
|
1453
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1432
diff
changeset
|
630 |
|
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1432
diff
changeset
|
631 context.Stop(); |
|
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
632 db.Close(); |
| 310 | 633 } |
| 521 | 634 |
| 635 | |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
636 TEST_F(DatabaseWrapperTest, LookupIdentifier) |
| 521 | 637 { |
| 638 int64_t a[] = { | |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
639 index_->CreateResource("a", ResourceType_Study), // 0 |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
640 index_->CreateResource("b", ResourceType_Study), // 1 |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
641 index_->CreateResource("c", ResourceType_Study), // 2 |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
642 index_->CreateResource("d", ResourceType_Series) // 3 |
| 521 | 643 }; |
| 644 | |
|
3081
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
645 index_->SetIdentifierTag(a[0], DICOM_TAG_STUDY_INSTANCE_UID, "0"); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
646 index_->SetIdentifierTag(a[1], DICOM_TAG_STUDY_INSTANCE_UID, "1"); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
647 index_->SetIdentifierTag(a[2], DICOM_TAG_STUDY_INSTANCE_UID, "0"); |
|
2e5970ddcfeb
simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3080
diff
changeset
|
648 index_->SetIdentifierTag(a[3], DICOM_TAG_SERIES_INSTANCE_UID, "0"); |
| 521 | 649 |
|
3075
ead8576a02ef
IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3073
diff
changeset
|
650 std::list<std::string> s; |
| 521 | 651 |
|
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
652 DoLookupIdentifier(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, ConstraintType_Equal, "0"); |
| 521 | 653 ASSERT_EQ(2u, s.size()); |
| 1746 | 654 ASSERT_TRUE(std::find(s.begin(), s.end(), "a") != s.end()); |
| 655 ASSERT_TRUE(std::find(s.begin(), s.end(), "c") != s.end()); | |
| 521 | 656 |
|
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
657 DoLookupIdentifier(s, ResourceType_Series, DICOM_TAG_SERIES_INSTANCE_UID, ConstraintType_Equal, "0"); |
|
1718
2b812969e136
getting rid of an IDatabaseWrapper::LookupIdentifier flavor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
658 ASSERT_EQ(1u, s.size()); |
| 1746 | 659 ASSERT_TRUE(std::find(s.begin(), s.end(), "d") != s.end()); |
| 521 | 660 |
|
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
661 DoLookupIdentifier(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, ConstraintType_Equal, "1"); |
| 521 | 662 ASSERT_EQ(1u, s.size()); |
| 1746 | 663 ASSERT_TRUE(std::find(s.begin(), s.end(), "b") != s.end()); |
| 521 | 664 |
|
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
665 DoLookupIdentifier(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, ConstraintType_Equal, "1"); |
| 521 | 666 ASSERT_EQ(1u, s.size()); |
| 1746 | 667 ASSERT_TRUE(std::find(s.begin(), s.end(), "b") != s.end()); |
| 521 | 668 |
|
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
669 DoLookupIdentifier(s, ResourceType_Series, DICOM_TAG_SERIES_INSTANCE_UID, ConstraintType_Equal, "1"); |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
670 ASSERT_EQ(0u, s.size()); |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
671 |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
672 DoLookupIdentifier(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, ConstraintType_GreaterOrEqual, "0"); |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
673 ASSERT_EQ(3u, s.size()); |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
674 |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
675 DoLookupIdentifier(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, ConstraintType_GreaterOrEqual, "1"); |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
676 ASSERT_EQ(1u, s.size()); |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
677 |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
678 DoLookupIdentifier(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, ConstraintType_GreaterOrEqual, "2"); |
|
1718
2b812969e136
getting rid of an IDatabaseWrapper::LookupIdentifier flavor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
679 ASSERT_EQ(0u, s.size()); |
| 521 | 680 |
|
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
681 DoLookupIdentifier2(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
682 ConstraintType_GreaterOrEqual, "0", ConstraintType_SmallerOrEqual, "0"); |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
683 ASSERT_EQ(2u, s.size()); |
| 1746 | 684 |
|
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
685 DoLookupIdentifier2(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
686 ConstraintType_GreaterOrEqual, "1", ConstraintType_SmallerOrEqual, "1"); |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
687 ASSERT_EQ(1u, s.size()); |
| 1746 | 688 |
|
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
689 DoLookupIdentifier2(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
690 ConstraintType_GreaterOrEqual, "0", ConstraintType_SmallerOrEqual, "1"); |
|
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
691 ASSERT_EQ(3u, s.size()); |
|
562
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
692 } |
| 705 | 693 |
| 694 | |
|
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
695 TEST(ServerIndex, AttachmentRecycling) |
| 705 | 696 { |
|
803
4689e400e0fa
directory to store the results of the unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
738
diff
changeset
|
697 const std::string path = "UnitTestsStorage"; |
|
1124
790ff7a5b3bf
IStorageArea abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1030
diff
changeset
|
698 |
| 2140 | 699 SystemToolbox::RemoveFile(path + "/index"); |
|
1124
790ff7a5b3bf
IStorageArea abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1030
diff
changeset
|
700 FilesystemStorage storage(path); |
|
3017
517fc4767ae0
renamed class DatabaseWrapper as SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3001
diff
changeset
|
701 SQLiteDatabaseWrapper db; // The SQLite DB is in memory |
|
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
702 db.Open(); |
|
2950
dc18d5804746
support of JobsHistorySize set to zero
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2924
diff
changeset
|
703 ServerContext context(db, storage, true /* running unit tests */, 10); |
|
2815
925d8dc03a23
unserialization of jobs from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2671
diff
changeset
|
704 context.SetupJobsEngine(true, false); |
| 705 | 705 ServerIndex& index = context.GetIndex(); |
|
707
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
706
diff
changeset
|
706 |
| 706 | 707 index.SetMaximumStorageSize(10); |
| 708 | |
|
3174
8ea7c4546c3a
primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3121
diff
changeset
|
709 uint64_t diskSize, uncompressedSize, countPatients, countStudies, countSeries, countInstances; |
|
8ea7c4546c3a
primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3121
diff
changeset
|
710 index.GetGlobalStatistics(diskSize, uncompressedSize, countPatients, |
|
8ea7c4546c3a
primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3121
diff
changeset
|
711 countStudies, countSeries, countInstances); |
|
8ea7c4546c3a
primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3121
diff
changeset
|
712 |
|
8ea7c4546c3a
primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3121
diff
changeset
|
713 ASSERT_EQ(0u, countPatients); |
|
8ea7c4546c3a
primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3121
diff
changeset
|
714 ASSERT_EQ(0u, diskSize); |
| 705 | 715 |
| 716 ServerIndex::Attachments attachments; | |
| 717 | |
|
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
718 std::vector<std::string> ids; |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
719 for (int i = 0; i < 10; i++) |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
720 { |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
721 std::string id = boost::lexical_cast<std::string>(i); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
722 DicomMap instance; |
|
2007
655489d9165d
DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1971
diff
changeset
|
723 instance.SetValue(DICOM_TAG_PATIENT_ID, "patient-" + id, false); |
|
655489d9165d
DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1971
diff
changeset
|
724 instance.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "study-" + id, false); |
|
655489d9165d
DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1971
diff
changeset
|
725 instance.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, "series-" + id, false); |
|
655489d9165d
DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1971
diff
changeset
|
726 instance.SetValue(DICOM_TAG_SOP_INSTANCE_UID, "instance-" + id, false); |
|
2208
90ea60bee5ff
New metadata automatically computed at the instance level: "SopClassUid"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2190
diff
changeset
|
727 instance.SetValue(DICOM_TAG_SOP_CLASS_UID, "1.2.840.10008.5.1.4.1.1.1", false); // CR image |
|
1006
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
728 |
|
4505
97d103b57cd1
removed cached dicom summary from DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4499
diff
changeset
|
729 ParsedDicomFile dicom(instance, GetDefaultDicomEncoding(), false /* be strict */); |
|
97d103b57cd1
removed cached dicom summary from DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4499
diff
changeset
|
730 |
|
4508
8f9090b137f1
Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4507
diff
changeset
|
731 std::unique_ptr<DicomInstanceToStore> toStore(DicomInstanceToStore::CreateFromParsedDicomFile(dicom)); |
|
4505
97d103b57cd1
removed cached dicom summary from DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4499
diff
changeset
|
732 |
|
4506
ac69c9f76c71
refactoring ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4505
diff
changeset
|
733 std::map<MetadataType, std::string> instanceMetadata; |
|
ac69c9f76c71
refactoring ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4505
diff
changeset
|
734 |
|
4505
97d103b57cd1
removed cached dicom summary from DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4499
diff
changeset
|
735 { |
|
97d103b57cd1
removed cached dicom summary from DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4499
diff
changeset
|
736 DicomMap summary; |
|
4508
8f9090b137f1
Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4507
diff
changeset
|
737 OrthancConfiguration::DefaultExtractDicomSummary(summary, toStore->GetParsedDicomFile()); |
|
4514
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
738 toStore->SetOrigin(DicomInstanceOrigin::FromPlugins()); |
|
4505
97d103b57cd1
removed cached dicom summary from DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4499
diff
changeset
|
739 |
|
4507
b4c58795f3a8
widening the use of DicomTransferSyntax enum
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4506
diff
changeset
|
740 DicomTransferSyntax transferSyntax; |
|
4506
ac69c9f76c71
refactoring ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4505
diff
changeset
|
741 bool hasTransferSyntax = dicom.LookupTransferSyntax(transferSyntax); |
|
ac69c9f76c71
refactoring ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4505
diff
changeset
|
742 ASSERT_EQ(StoreStatus_Success, index.Store( |
|
4508
8f9090b137f1
Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4507
diff
changeset
|
743 instanceMetadata, summary, attachments, toStore->GetMetadata(), |
|
8f9090b137f1
Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4507
diff
changeset
|
744 toStore->GetOrigin(), false /* don't overwrite */, |
|
4506
ac69c9f76c71
refactoring ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4505
diff
changeset
|
745 hasTransferSyntax, transferSyntax, true /* pixel data offset */, 42)); |
|
4505
97d103b57cd1
removed cached dicom summary from DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4499
diff
changeset
|
746 } |
|
97d103b57cd1
removed cached dicom summary from DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4499
diff
changeset
|
747 |
|
4494
39192eb9b43d
New metadata automatically computed at the instance level: "PixelDataOffset"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4460
diff
changeset
|
748 ASSERT_EQ(6u, instanceMetadata.size()); |
|
4460
6831de40acd9
New metadata automatically computed at the series level: "RemoteAET"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
749 ASSERT_TRUE(instanceMetadata.find(MetadataType_RemoteAet) != instanceMetadata.end()); |
| 1029 | 750 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_ReceptionDate) != instanceMetadata.end()); |
| 2190 | 751 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_TransferSyntax) != instanceMetadata.end()); |
|
2208
90ea60bee5ff
New metadata automatically computed at the instance level: "SopClassUid"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2190
diff
changeset
|
752 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_SopClassUid) != instanceMetadata.end()); |
|
4494
39192eb9b43d
New metadata automatically computed at the instance level: "PixelDataOffset"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4460
diff
changeset
|
753 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_PixelDataOffset) != instanceMetadata.end()); |
| 2190 | 754 |
| 4499 | 755 ASSERT_EQ("42", instanceMetadata[MetadataType_Instance_PixelDataOffset]); |
| 756 | |
|
3974
bd0af2e11325
fix for big-endian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3814
diff
changeset
|
757 // The default transfer syntax depends on the OS endianness |
|
bd0af2e11325
fix for big-endian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3814
diff
changeset
|
758 std::string s = instanceMetadata[MetadataType_Instance_TransferSyntax]; |
|
bd0af2e11325
fix for big-endian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3814
diff
changeset
|
759 ASSERT_TRUE(s == "1.2.840.10008.1.2.1" || |
|
bd0af2e11325
fix for big-endian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3814
diff
changeset
|
760 s == "1.2.840.10008.1.2.2"); |
|
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
761 |
|
2208
90ea60bee5ff
New metadata automatically computed at the instance level: "SopClassUid"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2190
diff
changeset
|
762 ASSERT_EQ("1.2.840.10008.5.1.4.1.1.1", instanceMetadata[MetadataType_Instance_SopClassUid]); |
|
90ea60bee5ff
New metadata automatically computed at the instance level: "SopClassUid"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2190
diff
changeset
|
763 |
|
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
764 DicomInstanceHasher hasher(instance); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
765 ids.push_back(hasher.HashPatient()); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
766 ids.push_back(hasher.HashStudy()); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
767 ids.push_back(hasher.HashSeries()); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
768 ids.push_back(hasher.HashInstance()); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
769 } |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
770 |
|
3174
8ea7c4546c3a
primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3121
diff
changeset
|
771 index.GetGlobalStatistics(diskSize, uncompressedSize, countPatients, |
|
8ea7c4546c3a
primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3121
diff
changeset
|
772 countStudies, countSeries, countInstances); |
|
8ea7c4546c3a
primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3121
diff
changeset
|
773 ASSERT_EQ(10u, countPatients); |
|
8ea7c4546c3a
primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3121
diff
changeset
|
774 ASSERT_EQ(0u, diskSize); |
|
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
775 |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
776 for (size_t i = 0; i < ids.size(); i++) |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
777 { |
|
2512
4dcafa8d6633
SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
778 FileInfo info(Toolbox::GenerateUuid(), FileContentType_Dicom, 1, "md5"); |
|
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
779 index.AddAttachment(info, ids[i]); |
|
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
780 |
|
3174
8ea7c4546c3a
primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3121
diff
changeset
|
781 index.GetGlobalStatistics(diskSize, uncompressedSize, countPatients, |
|
8ea7c4546c3a
primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3121
diff
changeset
|
782 countStudies, countSeries, countInstances); |
|
8ea7c4546c3a
primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3121
diff
changeset
|
783 ASSERT_GE(10u, diskSize); |
|
713
9d1973813d8b
test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
784 } |
|
707
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
706
diff
changeset
|
785 |
|
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
706
diff
changeset
|
786 // Because the DB is in memory, the SQLite index must not have been created |
| 2140 | 787 ASSERT_FALSE(SystemToolbox::IsRegularFile(path + "/index")); |
|
1453
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1432
diff
changeset
|
788 |
|
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1432
diff
changeset
|
789 context.Stop(); |
|
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
790 db.Close(); |
| 705 | 791 } |
| 1764 | 792 |
| 793 | |
|
3036
8fd203510d8b
moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3019
diff
changeset
|
794 TEST(ServerIndex, NormalizeIdentifier) |
| 1764 | 795 { |
| 2121 | 796 ASSERT_EQ("H^L.LO", ServerToolbox::NormalizeIdentifier(" Hé^l.LO %_ ")); |
| 797 ASSERT_EQ("1.2.840.113619.2.176.2025", ServerToolbox::NormalizeIdentifier(" 1.2.840.113619.2.176.2025 ")); | |
| 1764 | 798 } |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
799 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
800 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
801 TEST(ServerIndex, Overwrite) |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
802 { |
|
4514
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
803 // Create a dummy 1x1 image |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
804 Image image(PixelFormat_Grayscale8, 1, 1, false); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
805 reinterpret_cast<uint8_t*>(image.GetBuffer()) [0] = 128; |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
806 |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
807 for (unsigned int i = 0; i < 2; i++) |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
808 { |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
809 bool overwrite = (i == 0); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
810 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
811 MemoryStorageArea storage; |
|
3017
517fc4767ae0
renamed class DatabaseWrapper as SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3001
diff
changeset
|
812 SQLiteDatabaseWrapper db; // The SQLite DB is in memory |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
813 db.Open(); |
|
2950
dc18d5804746
support of JobsHistorySize set to zero
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2924
diff
changeset
|
814 ServerContext context(db, storage, true /* running unit tests */, 10); |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
815 context.SetupJobsEngine(true, false); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
816 context.SetCompressionEnabled(true); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
817 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
818 DicomMap instance; |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
819 instance.SetValue(DICOM_TAG_PATIENT_ID, "patient", false); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
820 instance.SetValue(DICOM_TAG_PATIENT_NAME, "name", false); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
821 instance.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "study", false); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
822 instance.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, "series", false); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
823 instance.SetValue(DICOM_TAG_SOP_INSTANCE_UID, "sop", false); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
824 instance.SetValue(DICOM_TAG_SOP_CLASS_UID, "1.2.840.10008.5.1.4.1.1.1", false); // CR image |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
825 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
826 DicomInstanceHasher hasher(instance); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
827 std::string id = hasher.HashInstance(); |
|
3813
aaaa442bfe39
moving SetOverwriteInstances from ServerIndex to ServerContext
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3712
diff
changeset
|
828 context.SetOverwriteInstances(overwrite); |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
829 |
|
3174
8ea7c4546c3a
primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3121
diff
changeset
|
830 uint64_t diskSize, uncompressedSize, countPatients, countStudies, countSeries, countInstances; |
|
8ea7c4546c3a
primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3121
diff
changeset
|
831 context.GetIndex().GetGlobalStatistics(diskSize, uncompressedSize, countPatients, |
|
8ea7c4546c3a
primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3121
diff
changeset
|
832 countStudies, countSeries, countInstances); |
|
8ea7c4546c3a
primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3121
diff
changeset
|
833 |
|
3179
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
834 ASSERT_EQ(0u, countInstances); |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
835 ASSERT_EQ(0u, diskSize); |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
836 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
837 { |
|
4505
97d103b57cd1
removed cached dicom summary from DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4499
diff
changeset
|
838 ParsedDicomFile dicom(instance, GetDefaultDicomEncoding(), false /* be strict */); |
|
97d103b57cd1
removed cached dicom summary from DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4499
diff
changeset
|
839 |
|
4514
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
840 // Add a pixel data so as to have one "FileContentType_DicomUntilPixelData" |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
841 // (because of "context.SetCompressionEnabled(true)") |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
842 dicom.EmbedImage(image); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
843 |
|
4505
97d103b57cd1
removed cached dicom summary from DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4499
diff
changeset
|
844 DicomInstanceHasher hasher(instance); |
|
97d103b57cd1
removed cached dicom summary from DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4499
diff
changeset
|
845 |
|
4508
8f9090b137f1
Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4507
diff
changeset
|
846 std::unique_ptr<DicomInstanceToStore> toStore(DicomInstanceToStore::CreateFromParsedDicomFile(dicom)); |
|
8f9090b137f1
Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4507
diff
changeset
|
847 toStore->SetOrigin(DicomInstanceOrigin::FromPlugins()); |
|
4505
97d103b57cd1
removed cached dicom summary from DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4499
diff
changeset
|
848 ASSERT_EQ(id, hasher.HashInstance()); |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
849 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
850 std::string id2; |
|
4508
8f9090b137f1
Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4507
diff
changeset
|
851 ASSERT_EQ(StoreStatus_Success, context.Store(id2, *toStore, StoreInstanceMode_Default)); |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
852 ASSERT_EQ(id, id2); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
853 } |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
854 |
|
4514
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
855 { |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
856 FileInfo nope; |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
857 ASSERT_FALSE(context.GetIndex().LookupAttachment(nope, id, FileContentType_DicomAsJson)); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
858 } |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
859 |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
860 FileInfo dicom1, pixelData1; |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
861 ASSERT_TRUE(context.GetIndex().LookupAttachment(dicom1, id, FileContentType_Dicom)); |
|
4514
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
862 ASSERT_TRUE(context.GetIndex().LookupAttachment(pixelData1, id, FileContentType_DicomUntilPixelData)); |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
863 |
|
3174
8ea7c4546c3a
primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3121
diff
changeset
|
864 context.GetIndex().GetGlobalStatistics(diskSize, uncompressedSize, countPatients, |
|
8ea7c4546c3a
primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3121
diff
changeset
|
865 countStudies, countSeries, countInstances); |
|
8ea7c4546c3a
primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3121
diff
changeset
|
866 ASSERT_EQ(1u, countInstances); |
|
4514
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
867 ASSERT_EQ(dicom1.GetCompressedSize() + pixelData1.GetCompressedSize(), diskSize); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
868 ASSERT_EQ(dicom1.GetUncompressedSize() + pixelData1.GetUncompressedSize(), uncompressedSize); |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
869 |
|
3174
8ea7c4546c3a
primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3121
diff
changeset
|
870 Json::Value tmp; |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
871 context.ReadDicomAsJson(tmp, id); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
872 ASSERT_EQ("name", tmp["0010,0010"]["Value"].asString()); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
873 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
874 { |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
875 ServerContext::DicomCacheLocker locker(context, id); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
876 std::string tmp; |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
877 locker.GetDicom().GetTagValue(tmp, DICOM_TAG_PATIENT_NAME); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
878 ASSERT_EQ("name", tmp); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
879 } |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
880 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
881 { |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
882 DicomMap instance2; |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
883 instance2.Assign(instance); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
884 instance2.SetValue(DICOM_TAG_PATIENT_NAME, "overwritten", false); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
885 |
|
4505
97d103b57cd1
removed cached dicom summary from DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4499
diff
changeset
|
886 ParsedDicomFile dicom(instance2, GetDefaultDicomEncoding(), false /* be strict */); |
|
97d103b57cd1
removed cached dicom summary from DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4499
diff
changeset
|
887 |
|
4514
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
888 // Add a pixel data so as to have one "FileContentType_DicomUntilPixelData" |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
889 dicom.EmbedImage(image); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
890 |
|
4508
8f9090b137f1
Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4507
diff
changeset
|
891 std::unique_ptr<DicomInstanceToStore> toStore(DicomInstanceToStore::CreateFromParsedDicomFile(dicom)); |
|
8f9090b137f1
Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4507
diff
changeset
|
892 toStore->SetOrigin(DicomInstanceOrigin::FromPlugins()); |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
893 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
894 std::string id2; |
|
3814
023b2a9f3aa1
new enum: StoreInstanceMode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3813
diff
changeset
|
895 ASSERT_EQ(overwrite ? StoreStatus_Success : StoreStatus_AlreadyStored, |
|
4508
8f9090b137f1
Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4507
diff
changeset
|
896 context.Store(id2, *toStore, StoreInstanceMode_Default)); |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
897 ASSERT_EQ(id, id2); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
898 } |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
899 |
|
4514
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
900 { |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
901 FileInfo nope; |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
902 ASSERT_FALSE(context.GetIndex().LookupAttachment(nope, id, FileContentType_DicomAsJson)); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
903 } |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
904 |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
905 FileInfo dicom2, pixelData2; |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
906 ASSERT_TRUE(context.GetIndex().LookupAttachment(dicom2, id, FileContentType_Dicom)); |
|
4514
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
907 ASSERT_TRUE(context.GetIndex().LookupAttachment(pixelData2, id, FileContentType_DicomUntilPixelData)); |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
908 |
|
3174
8ea7c4546c3a
primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3121
diff
changeset
|
909 context.GetIndex().GetGlobalStatistics(diskSize, uncompressedSize, countPatients, |
|
8ea7c4546c3a
primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3121
diff
changeset
|
910 countStudies, countSeries, countInstances); |
|
3179
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
911 ASSERT_EQ(1u, countInstances); |
|
4514
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
912 ASSERT_EQ(dicom2.GetCompressedSize() + pixelData2.GetCompressedSize(), diskSize); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
913 ASSERT_EQ(dicom2.GetUncompressedSize() + pixelData2.GetUncompressedSize(), uncompressedSize); |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
914 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
915 if (overwrite) |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
916 { |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
917 ASSERT_NE(dicom1.GetUuid(), dicom2.GetUuid()); |
|
4514
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
918 ASSERT_NE(pixelData1.GetUuid(), pixelData2.GetUuid()); |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
919 ASSERT_NE(dicom1.GetUncompressedSize(), dicom2.GetUncompressedSize()); |
|
4514
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
920 ASSERT_NE(pixelData1.GetUncompressedSize(), pixelData2.GetUncompressedSize()); |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
921 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
922 context.ReadDicomAsJson(tmp, id); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
923 ASSERT_EQ("overwritten", tmp["0010,0010"]["Value"].asString()); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
924 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
925 { |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
926 ServerContext::DicomCacheLocker locker(context, id); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
927 std::string tmp; |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
928 locker.GetDicom().GetTagValue(tmp, DICOM_TAG_PATIENT_NAME); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
929 ASSERT_EQ("overwritten", tmp); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
930 } |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
931 } |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
932 else |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
933 { |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
934 ASSERT_EQ(dicom1.GetUuid(), dicom2.GetUuid()); |
|
4514
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
935 ASSERT_EQ(pixelData1.GetUuid(), pixelData2.GetUuid()); |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
936 ASSERT_EQ(dicom1.GetUncompressedSize(), dicom2.GetUncompressedSize()); |
|
4514
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
937 ASSERT_EQ(pixelData1.GetUncompressedSize(), pixelData2.GetUncompressedSize()); |
|
2826
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
938 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
939 context.ReadDicomAsJson(tmp, id); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
940 ASSERT_EQ("name", tmp["0010,0010"]["Value"].asString()); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
941 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
942 { |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
943 ServerContext::DicomCacheLocker locker(context, id); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
944 std::string tmp; |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
945 locker.GetDicom().GetTagValue(tmp, DICOM_TAG_PATIENT_NAME); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
946 ASSERT_EQ("name", tmp); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
947 } |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
948 } |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
949 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
950 context.Stop(); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
951 db.Close(); |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
952 } |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
953 } |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
954 |
|
c277e0421200
unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2815
diff
changeset
|
955 |
|
4514
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
956 TEST(ServerIndex, DicomUntilPixelData) |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
957 { |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
958 // Create a dummy 1x1 image |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
959 Image image(PixelFormat_Grayscale8, 1, 1, false); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
960 reinterpret_cast<uint8_t*>(image.GetBuffer()) [0] = 128; |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
961 |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
962 for (unsigned int i = 0; i < 2; i++) |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
963 { |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
964 const bool compression = (i == 0); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
965 |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
966 MemoryStorageArea storage; |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
967 SQLiteDatabaseWrapper db; // The SQLite DB is in memory |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
968 db.Open(); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
969 ServerContext context(db, storage, true /* running unit tests */, 10); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
970 context.SetupJobsEngine(true, false); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
971 context.SetCompressionEnabled(compression); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
972 |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
973 for (unsigned int j = 0; j < 2; j++) |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
974 { |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
975 const bool withPixelData = (j == 0); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
976 |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
977 ParsedDicomFile dicom(true); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
978 |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
979 if (withPixelData) |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
980 { |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
981 dicom.EmbedImage(image); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
982 } |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
983 |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
984 std::string id; |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
985 size_t dicomSize; |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
986 |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
987 { |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
988 std::unique_ptr<DicomInstanceToStore> toStore(DicomInstanceToStore::CreateFromParsedDicomFile(dicom)); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
989 dicomSize = toStore->GetBufferSize(); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
990 toStore->SetOrigin(DicomInstanceOrigin::FromPlugins()); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
991 ASSERT_EQ(StoreStatus_Success, context.Store(id, *toStore, StoreInstanceMode_Default)); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
992 } |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
993 |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
994 std::set<FileContentType> attachments; |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
995 context.GetIndex().ListAvailableAttachments(attachments, id, ResourceType_Instance); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
996 |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
997 ASSERT_TRUE(attachments.find(FileContentType_Dicom) != attachments.end()); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
998 |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
999 if (compression && |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1000 withPixelData) |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1001 { |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1002 ASSERT_EQ(2u, attachments.size()); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1003 ASSERT_TRUE(attachments.find(FileContentType_DicomUntilPixelData) != attachments.end()); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1004 } |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1005 else |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1006 { |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1007 ASSERT_EQ(1u, attachments.size()); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1008 } |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1009 |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1010 std::string s; |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1011 bool found = context.GetIndex().LookupMetadata(s, id, ResourceType_Instance, |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1012 MetadataType_Instance_PixelDataOffset); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1013 |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1014 if (withPixelData) |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1015 { |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1016 ASSERT_TRUE(found); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1017 ASSERT_GT(boost::lexical_cast<int>(s), 128 /* length of the DICOM preamble */); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1018 ASSERT_LT(boost::lexical_cast<size_t>(s), dicomSize); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1019 } |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1020 else |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1021 { |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1022 ASSERT_FALSE(found); |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1023 } |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1024 } |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1025 } |
|
5b929e6b3c36
removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4508
diff
changeset
|
1026 } |