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