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