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