Mercurial > hg > orthanc-databases
annotate Framework/Plugins/IndexUnitTests.h @ 332:2592c0e9b724
fix link on windows
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 11 Aug 2021 07:45:54 +0200 |
parents | eb0b04c10bc4 |
children | 7ec461718edb |
rev | line source |
---|---|
0 | 1 /** |
2 * Orthanc - A Lightweight, RESTful DICOM Store | |
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
4 * Department, University Hospital of Liege, Belgium | |
193
3236894320d6
upgrade to year 2021
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
5 * Copyright (C) 2017-2021 Osimis S.A., Belgium |
0 | 6 * |
7 * This program is free software: you can redistribute it and/or | |
8 * modify it under the terms of the GNU Affero General Public License | |
9 * as published by the Free Software Foundation, either version 3 of | |
10 * the License, or (at your option) any later version. | |
11 * | |
12 * This program is distributed in the hope that it will be useful, but | |
13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Affero General Public License for more details. | |
16 * | |
17 * You should have received a copy of the GNU Affero General Public License | |
18 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
19 **/ | |
20 | |
21 | |
22 #pragma once | |
23 | |
28
c0cb5d2cd696
checks depending on Orthanc version
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
27
diff
changeset
|
24 #include "../Common/ImplicitTransaction.h" |
213
c2e4a909de0e
added IndexBackend::Register() to be used in all the index plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
209
diff
changeset
|
25 #include "DatabaseBackendAdapterV2.h" |
152 | 26 #include "GlobalProperties.h" |
28
c0cb5d2cd696
checks depending on Orthanc version
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
27
diff
changeset
|
27 |
157
275e14f57f1e
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
152
diff
changeset
|
28 #include <Compatibility.h> // For std::unique_ptr<> |
275e14f57f1e
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
152
diff
changeset
|
29 |
0 | 30 #include <orthanc/OrthancCDatabasePlugin.h> |
31 | |
32 #include <gtest/gtest.h> | |
33 #include <list> | |
34 | |
273
07881ac5404b
fix build against system-wide orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
35 #if !defined(ORTHANC_DATABASE_VERSION) |
07881ac5404b
fix build against system-wide orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
36 // This happens if using the Orthanc framework system-wide library |
07881ac5404b
fix build against system-wide orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
37 # define ORTHANC_DATABASE_VERSION 6 |
07881ac5404b
fix build against system-wide orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
38 #endif |
07881ac5404b
fix build against system-wide orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
39 |
0 | 40 |
266
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
41 #if ORTHANC_ENABLE_POSTGRESQL == 1 |
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
42 # define HAS_REVISIONS 1 |
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
43 #elif ORTHANC_ENABLE_MYSQL == 1 |
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
44 # define HAS_REVISIONS 0 |
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
45 #elif ORTHANC_ENABLE_SQLITE == 1 |
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
46 # define HAS_REVISIONS 1 |
309
d192bfd0e752
tagging globalParameters_ as static in MySQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
307
diff
changeset
|
47 #elif ORTHANC_ENABLE_ODBC == 1 |
d192bfd0e752
tagging globalParameters_ as static in MySQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
307
diff
changeset
|
48 # define HAS_REVISIONS 1 |
266
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
49 #else |
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
50 # error Unknown database backend |
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
51 #endif |
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
52 |
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
53 |
152 | 54 namespace Orthanc |
55 { | |
56 /** | |
57 * Mock enumeration inspired from the source code of Orthanc... only | |
58 * for use in the unit tests! | |
59 * https://hg.orthanc-server.com/orthanc/file/default/OrthancServer/Sources/ServerEnumerations.h | |
60 **/ | |
61 enum MetadataType | |
62 { | |
63 MetadataType_ModifiedFrom, | |
64 MetadataType_LastUpdate | |
65 }; | |
66 } | |
67 | |
68 | |
157
275e14f57f1e
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
152
diff
changeset
|
69 static std::unique_ptr<OrthancPluginAttachment> expectedAttachment; |
0 | 70 static std::list<OrthancPluginDicomTag> expectedDicomTags; |
157
275e14f57f1e
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
152
diff
changeset
|
71 static std::unique_ptr<OrthancPluginExportedResource> expectedExported; |
0 | 72 |
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
73 static std::map<std::string, OrthancPluginResourceType> deletedResources; |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
74 static std::unique_ptr< std::pair<std::string, OrthancPluginResourceType> > remainingAncestor; |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
75 static std::set<std::string> deletedAttachments; |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
76 |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
77 |
0 | 78 static void CheckAttachment(const OrthancPluginAttachment& attachment) |
79 { | |
80 ASSERT_STREQ(expectedAttachment->uuid, attachment.uuid); | |
81 ASSERT_EQ(expectedAttachment->contentType, attachment.contentType); | |
82 ASSERT_EQ(expectedAttachment->uncompressedSize, attachment.uncompressedSize); | |
83 ASSERT_STREQ(expectedAttachment->uncompressedHash, attachment.uncompressedHash); | |
84 ASSERT_EQ(expectedAttachment->compressionType, attachment.compressionType); | |
85 ASSERT_EQ(expectedAttachment->compressedSize, attachment.compressedSize); | |
86 ASSERT_STREQ(expectedAttachment->compressedHash, attachment.compressedHash); | |
87 } | |
88 | |
89 static void CheckExportedResource(const OrthancPluginExportedResource& exported) | |
90 { | |
311
5f0d5f849944
fix unit tests if resuning the same database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
309
diff
changeset
|
91 // ASSERT_EQ(expectedExported->seq, exported.seq); |
0 | 92 ASSERT_EQ(expectedExported->resourceType, exported.resourceType); |
93 ASSERT_STREQ(expectedExported->publicId, exported.publicId); | |
94 ASSERT_STREQ(expectedExported->modality, exported.modality); | |
95 ASSERT_STREQ(expectedExported->date, exported.date); | |
96 ASSERT_STREQ(expectedExported->patientId, exported.patientId); | |
97 ASSERT_STREQ(expectedExported->studyInstanceUid, exported.studyInstanceUid); | |
98 ASSERT_STREQ(expectedExported->seriesInstanceUid, exported.seriesInstanceUid); | |
99 ASSERT_STREQ(expectedExported->sopInstanceUid, exported.sopInstanceUid); | |
100 } | |
101 | |
102 static void CheckDicomTag(const OrthancPluginDicomTag& tag) | |
103 { | |
104 for (std::list<OrthancPluginDicomTag>::const_iterator | |
105 it = expectedDicomTags.begin(); it != expectedDicomTags.end(); ++it) | |
106 { | |
107 if (it->group == tag.group && | |
108 it->element == tag.element && | |
109 !strcmp(it->value, tag.value)) | |
110 { | |
111 // OK, match | |
112 return; | |
113 } | |
114 } | |
115 | |
116 ASSERT_TRUE(0); // Error | |
117 } | |
118 | |
119 | |
120 | |
121 static OrthancPluginErrorCode InvokeService(struct _OrthancPluginContext_t* context, | |
122 _OrthancPluginService service, | |
123 const void* params) | |
124 { | |
199 | 125 switch (service) |
0 | 126 { |
199 | 127 case _OrthancPluginService_DatabaseAnswer: |
0 | 128 { |
199 | 129 const _OrthancPluginDatabaseAnswer& answer = |
130 *reinterpret_cast<const _OrthancPluginDatabaseAnswer*>(params); | |
131 | |
132 switch (answer.type) | |
0 | 133 { |
199 | 134 case _OrthancPluginDatabaseAnswerType_Attachment: |
135 { | |
136 const OrthancPluginAttachment& attachment = | |
137 *reinterpret_cast<const OrthancPluginAttachment*>(answer.valueGeneric); | |
138 CheckAttachment(attachment); | |
139 break; | |
140 } | |
141 | |
142 case _OrthancPluginDatabaseAnswerType_ExportedResource: | |
143 { | |
144 const OrthancPluginExportedResource& attachment = | |
145 *reinterpret_cast<const OrthancPluginExportedResource*>(answer.valueGeneric); | |
146 CheckExportedResource(attachment); | |
147 break; | |
148 } | |
149 | |
150 case _OrthancPluginDatabaseAnswerType_DicomTag: | |
151 { | |
152 const OrthancPluginDicomTag& tag = | |
153 *reinterpret_cast<const OrthancPluginDicomTag*>(answer.valueGeneric); | |
154 CheckDicomTag(tag); | |
155 break; | |
156 } | |
157 | |
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
158 case _OrthancPluginDatabaseAnswerType_DeletedResource: |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
159 deletedResources[answer.valueString] = static_cast<OrthancPluginResourceType>(answer.valueInt32); |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
160 break; |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
161 |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
162 case _OrthancPluginDatabaseAnswerType_RemainingAncestor: |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
163 remainingAncestor.reset(new std::pair<std::string, OrthancPluginResourceType>()); |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
164 *remainingAncestor = std::make_pair(answer.valueString, static_cast<OrthancPluginResourceType>(answer.valueInt32)); |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
165 break; |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
166 |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
167 case _OrthancPluginDatabaseAnswerType_DeletedAttachment: |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
168 deletedAttachments.insert(reinterpret_cast<const OrthancPluginAttachment*>(answer.valueGeneric)->uuid); |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
169 break; |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
170 |
199 | 171 default: |
172 printf("Unhandled message: %d\n", answer.type); | |
173 break; | |
0 | 174 } |
175 | |
199 | 176 return OrthancPluginErrorCode_Success; |
177 } | |
0 | 178 |
199 | 179 case _OrthancPluginService_GetExpectedDatabaseVersion: |
180 { | |
181 const _OrthancPluginReturnSingleValue& p = | |
182 *reinterpret_cast<const _OrthancPluginReturnSingleValue*>(params); | |
183 *(p.resultUint32) = ORTHANC_DATABASE_VERSION; | |
184 return OrthancPluginErrorCode_Success; | |
185 } | |
0 | 186 |
199 | 187 default: |
188 assert(0); | |
189 printf("Service not emulated: %d\n", service); | |
190 return OrthancPluginErrorCode_NotImplemented; | |
0 | 191 } |
192 } | |
193 | |
194 | |
195 TEST(IndexBackend, Basic) | |
196 { | |
197 using namespace OrthancDatabases; | |
198 | |
199 OrthancPluginContext context; | |
200 context.pluginsManager = NULL; | |
201 context.orthancVersion = "mainline"; | |
202 context.Free = ::free; | |
203 context.InvokeService = InvokeService; | |
204 | |
28
c0cb5d2cd696
checks depending on Orthanc version
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
27
diff
changeset
|
205 ImplicitTransaction::SetErrorOnDoubleExecution(true); |
c0cb5d2cd696
checks depending on Orthanc version
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
27
diff
changeset
|
206 |
0 | 207 #if ORTHANC_ENABLE_POSTGRESQL == 1 |
201
42990b2dd51b
create IDatabaseBackendOutput only if needed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
200
diff
changeset
|
208 PostgreSQLIndex db(&context, globalParameters_); |
0 | 209 db.SetClearAll(true); |
210 #elif ORTHANC_ENABLE_MYSQL == 1 | |
201
42990b2dd51b
create IDatabaseBackendOutput only if needed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
200
diff
changeset
|
211 MySQLIndex db(&context, globalParameters_); |
0 | 212 db.SetClearAll(true); |
309
d192bfd0e752
tagging globalParameters_ as static in MySQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
307
diff
changeset
|
213 #elif ORTHANC_ENABLE_ODBC == 1 |
d192bfd0e752
tagging globalParameters_ as static in MySQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
307
diff
changeset
|
214 OdbcIndex db(&context, connectionString_); |
319 | 215 #elif ORTHANC_ENABLE_SQLITE == 1 // Must be the last one |
216 SQLiteIndex db(&context); // Open in memory | |
0 | 217 #else |
218 # error Unsupported database backend | |
219 #endif | |
220 | |
204 | 221 db.SetOutputFactory(new DatabaseBackendAdapterV2::Factory(&context, NULL)); |
201
42990b2dd51b
create IDatabaseBackendOutput only if needed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
200
diff
changeset
|
222 |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
223 std::unique_ptr<DatabaseManager> manager(IndexBackend::CreateSingleDatabaseManager(db)); |
225
94c9908e6aca
removed DatabaseManager member out of class IndexBackend
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
221
diff
changeset
|
224 |
203
2089d4071408
moving classes out of OrthancPlugins namespace, to OrthancDatabases
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
201
diff
changeset
|
225 std::unique_ptr<IDatabaseBackendOutput> output(db.CreateOutput()); |
0 | 226 |
227 std::string s; | |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
228 ASSERT_TRUE(db.LookupGlobalProperty(s, *manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabaseSchemaVersion)); |
0 | 229 ASSERT_EQ("6", s); |
230 | |
239
e9ba888f371b
fix IndexBackend::SetGlobalProperty(), lighten GlobalProperty enum
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
231 db.SetGlobalProperty(*manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabaseInternal9, "Hello"); |
e9ba888f371b
fix IndexBackend::SetGlobalProperty(), lighten GlobalProperty enum
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
232 ASSERT_TRUE(db.LookupGlobalProperty(s, *manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabaseInternal9)); |
0 | 233 ASSERT_EQ("Hello", s); |
239
e9ba888f371b
fix IndexBackend::SetGlobalProperty(), lighten GlobalProperty enum
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
234 db.SetGlobalProperty(*manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabaseInternal9, "HelloWorld"); |
e9ba888f371b
fix IndexBackend::SetGlobalProperty(), lighten GlobalProperty enum
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
235 ASSERT_TRUE(db.LookupGlobalProperty(s, *manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabaseInternal9)); |
0 | 236 ASSERT_EQ("HelloWorld", s); |
237 | |
301 | 238 ASSERT_EQ(0u, db.GetAllResourcesCount(*manager)); |
239 ASSERT_EQ(0u, db.GetResourcesCount(*manager, OrthancPluginResourceType_Patient)); | |
240 ASSERT_EQ(0u, db.GetResourcesCount(*manager, OrthancPluginResourceType_Study)); | |
241 ASSERT_EQ(0u, db.GetResourcesCount(*manager, OrthancPluginResourceType_Series)); | |
242 | |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
243 int64_t a = db.CreateResource(*manager, "study", OrthancPluginResourceType_Study); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
244 ASSERT_TRUE(db.IsExistingResource(*manager, a)); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
245 ASSERT_FALSE(db.IsExistingResource(*manager, a + 1)); |
0 | 246 |
247 int64_t b; | |
248 OrthancPluginResourceType t; | |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
249 ASSERT_FALSE(db.LookupResource(b, t, *manager, "world")); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
250 ASSERT_TRUE(db.LookupResource(b, t, *manager, "study")); |
0 | 251 ASSERT_EQ(a, b); |
252 ASSERT_EQ(OrthancPluginResourceType_Study, t); | |
253 | |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
254 b = db.CreateResource(*manager, "series", OrthancPluginResourceType_Series); |
0 | 255 ASSERT_NE(a, b); |
256 | |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
257 ASSERT_EQ("study", db.GetPublicId(*manager, a)); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
258 ASSERT_EQ("series", db.GetPublicId(*manager, b)); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
259 ASSERT_EQ(OrthancPluginResourceType_Study, db.GetResourceType(*manager, a)); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
260 ASSERT_EQ(OrthancPluginResourceType_Series, db.GetResourceType(*manager, b)); |
0 | 261 |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
262 db.AttachChild(*manager, a, b); |
0 | 263 |
264 int64_t c; | |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
265 ASSERT_FALSE(db.LookupParent(c, *manager, a)); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
266 ASSERT_TRUE(db.LookupParent(c, *manager, b)); |
0 | 267 ASSERT_EQ(a, c); |
268 | |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
269 c = db.CreateResource(*manager, "series2", OrthancPluginResourceType_Series); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
270 db.AttachChild(*manager, a, c); |
0 | 271 |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
272 ASSERT_EQ(3u, db.GetAllResourcesCount(*manager)); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
273 ASSERT_EQ(0u, db.GetResourcesCount(*manager, OrthancPluginResourceType_Patient)); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
274 ASSERT_EQ(1u, db.GetResourcesCount(*manager, OrthancPluginResourceType_Study)); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
275 ASSERT_EQ(2u, db.GetResourcesCount(*manager, OrthancPluginResourceType_Series)); |
0 | 276 |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
277 ASSERT_FALSE(db.GetParentPublicId(s, *manager, a)); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
278 ASSERT_TRUE(db.GetParentPublicId(s, *manager, b)); ASSERT_EQ("study", s); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
279 ASSERT_TRUE(db.GetParentPublicId(s, *manager, c)); ASSERT_EQ("study", s); |
0 | 280 |
281 std::list<std::string> children; | |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
282 db.GetChildren(children, *manager, a); |
0 | 283 ASSERT_EQ(2u, children.size()); |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
284 db.GetChildren(children, *manager, b); |
0 | 285 ASSERT_EQ(0u, children.size()); |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
286 db.GetChildren(children, *manager, c); |
0 | 287 ASSERT_EQ(0u, children.size()); |
288 | |
289 std::list<std::string> cp; | |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
290 db.GetChildrenPublicId(cp, *manager, a); |
0 | 291 ASSERT_EQ(2u, cp.size()); |
292 ASSERT_TRUE(cp.front() == "series" || cp.front() == "series2"); | |
293 ASSERT_TRUE(cp.back() == "series" || cp.back() == "series2"); | |
294 ASSERT_NE(cp.front(), cp.back()); | |
295 | |
296 std::list<std::string> pub; | |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
297 db.GetAllPublicIds(pub, *manager, OrthancPluginResourceType_Patient); |
0 | 298 ASSERT_EQ(0u, pub.size()); |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
299 db.GetAllPublicIds(pub, *manager, OrthancPluginResourceType_Study); |
0 | 300 ASSERT_EQ(1u, pub.size()); |
301 ASSERT_EQ("study", pub.front()); | |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
302 db.GetAllPublicIds(pub, *manager, OrthancPluginResourceType_Series); |
0 | 303 ASSERT_EQ(2u, pub.size()); |
304 ASSERT_TRUE(pub.front() == "series" || pub.front() == "series2"); | |
305 ASSERT_TRUE(pub.back() == "series" || pub.back() == "series2"); | |
306 ASSERT_NE(pub.front(), pub.back()); | |
307 | |
308 std::list<int64_t> ci; | |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
309 db.GetChildrenInternalId(ci, *manager, a); |
0 | 310 ASSERT_EQ(2u, ci.size()); |
311 ASSERT_TRUE(ci.front() == b || ci.front() == c); | |
312 ASSERT_TRUE(ci.back() == b || ci.back() == c); | |
313 ASSERT_NE(ci.front(), ci.back()); | |
314 | |
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
315 db.SetMetadata(*manager, a, Orthanc::MetadataType_ModifiedFrom, "modified", 42); |
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
316 db.SetMetadata(*manager, a, Orthanc::MetadataType_LastUpdate, "update2", 43); |
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
317 int64_t revision = -1; |
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
318 ASSERT_FALSE(db.LookupMetadata(s, revision, *manager, b, Orthanc::MetadataType_LastUpdate)); |
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
319 ASSERT_TRUE(db.LookupMetadata(s, revision, *manager, a, Orthanc::MetadataType_LastUpdate)); |
0 | 320 ASSERT_EQ("update2", s); |
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
321 |
266
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
322 #if HAS_REVISIONS == 1 |
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
323 ASSERT_EQ(43, revision); |
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
324 #else |
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
325 ASSERT_EQ(0, revision); |
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
326 #endif |
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
327 |
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
328 db.SetMetadata(*manager, a, Orthanc::MetadataType_LastUpdate, "update", 44); |
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
329 ASSERT_TRUE(db.LookupMetadata(s, revision, *manager, a, Orthanc::MetadataType_LastUpdate)); |
0 | 330 ASSERT_EQ("update", s); |
331 | |
266
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
332 #if HAS_REVISIONS == 1 |
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
333 ASSERT_EQ(44, revision); |
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
334 #else |
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
335 ASSERT_EQ(0, revision); |
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
336 #endif |
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
337 |
0 | 338 std::list<int32_t> md; |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
339 db.ListAvailableMetadata(md, *manager, a); |
0 | 340 ASSERT_EQ(2u, md.size()); |
341 ASSERT_TRUE(md.front() == Orthanc::MetadataType_ModifiedFrom || md.back() == Orthanc::MetadataType_ModifiedFrom); | |
342 ASSERT_TRUE(md.front() == Orthanc::MetadataType_LastUpdate || md.back() == Orthanc::MetadataType_LastUpdate); | |
343 std::string mdd; | |
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
344 ASSERT_TRUE(db.LookupMetadata(mdd, revision, *manager, a, Orthanc::MetadataType_ModifiedFrom)); |
0 | 345 ASSERT_EQ("modified", mdd); |
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
346 |
266
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
347 #if HAS_REVISIONS == 1 |
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
348 ASSERT_EQ(42, revision); |
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
349 #else |
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
350 ASSERT_EQ(0, revision); |
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
351 #endif |
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
352 |
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
353 ASSERT_TRUE(db.LookupMetadata(mdd, revision, *manager, a, Orthanc::MetadataType_LastUpdate)); |
0 | 354 ASSERT_EQ("update", mdd); |
355 | |
266
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
356 #if HAS_REVISIONS == 1 |
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
357 ASSERT_EQ(44, revision); |
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
358 #else |
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
359 ASSERT_EQ(0, revision); |
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
360 #endif |
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
361 |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
362 db.ListAvailableMetadata(md, *manager, b); |
0 | 363 ASSERT_EQ(0u, md.size()); |
364 | |
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
365 ASSERT_TRUE(db.LookupMetadata(s, revision, *manager, a, Orthanc::MetadataType_LastUpdate)); |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
366 db.DeleteMetadata(*manager, a, Orthanc::MetadataType_LastUpdate); |
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
367 ASSERT_FALSE(db.LookupMetadata(s, revision, *manager, a, Orthanc::MetadataType_LastUpdate)); |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
368 db.DeleteMetadata(*manager, b, Orthanc::MetadataType_LastUpdate); |
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
369 ASSERT_FALSE(db.LookupMetadata(s, revision, *manager, a, Orthanc::MetadataType_LastUpdate)); |
0 | 370 |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
371 db.ListAvailableMetadata(md, *manager, a); |
0 | 372 ASSERT_EQ(1u, md.size()); |
373 ASSERT_EQ(Orthanc::MetadataType_ModifiedFrom, md.front()); | |
374 | |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
375 ASSERT_EQ(0u, db.GetTotalCompressedSize(*manager)); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
376 ASSERT_EQ(0u, db.GetTotalUncompressedSize(*manager)); |
0 | 377 |
378 | |
379 std::list<int32_t> fc; | |
380 | |
381 OrthancPluginAttachment a1; | |
382 a1.uuid = "uuid1"; | |
383 a1.contentType = Orthanc::FileContentType_Dicom; | |
384 a1.uncompressedSize = 42; | |
385 a1.uncompressedHash = "md5_1"; | |
386 a1.compressionType = Orthanc::CompressionType_None; | |
387 a1.compressedSize = 42; | |
388 a1.compressedHash = "md5_1"; | |
389 | |
390 OrthancPluginAttachment a2; | |
391 a2.uuid = "uuid2"; | |
392 a2.contentType = Orthanc::FileContentType_DicomAsJson; | |
393 a2.uncompressedSize = 4242; | |
394 a2.uncompressedHash = "md5_2"; | |
395 a2.compressionType = Orthanc::CompressionType_None; | |
396 a2.compressedSize = 4242; | |
397 a2.compressedHash = "md5_2"; | |
398 | |
261
34e2b93a7ac1
implementing interface for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
256
diff
changeset
|
399 db.AddAttachment(*manager, a, a1, 42); |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
400 db.ListAvailableAttachments(fc, *manager, a); |
0 | 401 ASSERT_EQ(1u, fc.size()); |
402 ASSERT_EQ(Orthanc::FileContentType_Dicom, fc.front()); | |
261
34e2b93a7ac1
implementing interface for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
256
diff
changeset
|
403 db.AddAttachment(*manager, a, a2, 43); |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
404 db.ListAvailableAttachments(fc, *manager, a); |
0 | 405 ASSERT_EQ(2u, fc.size()); |
261
34e2b93a7ac1
implementing interface for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
256
diff
changeset
|
406 ASSERT_FALSE(db.LookupAttachment(*output, revision, *manager, b, Orthanc::FileContentType_Dicom)); |
0 | 407 |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
408 ASSERT_EQ(4284u, db.GetTotalCompressedSize(*manager)); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
409 ASSERT_EQ(4284u, db.GetTotalUncompressedSize(*manager)); |
0 | 410 |
411 expectedAttachment.reset(new OrthancPluginAttachment); | |
412 expectedAttachment->uuid = "uuid1"; | |
413 expectedAttachment->contentType = Orthanc::FileContentType_Dicom; | |
414 expectedAttachment->uncompressedSize = 42; | |
415 expectedAttachment->uncompressedHash = "md5_1"; | |
416 expectedAttachment->compressionType = Orthanc::CompressionType_None; | |
417 expectedAttachment->compressedSize = 42; | |
418 expectedAttachment->compressedHash = "md5_1"; | |
261
34e2b93a7ac1
implementing interface for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
256
diff
changeset
|
419 ASSERT_TRUE(db.LookupAttachment(*output, revision, *manager, a, Orthanc::FileContentType_Dicom)); |
262
b0c65094b299
adding support for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
420 |
266
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
421 #if HAS_REVISIONS == 1 |
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
422 ASSERT_EQ(42, revision); |
262
b0c65094b299
adding support for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
423 #else |
b0c65094b299
adding support for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
424 ASSERT_EQ(0, revision); |
b0c65094b299
adding support for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
425 #endif |
0 | 426 |
427 expectedAttachment.reset(new OrthancPluginAttachment); | |
428 expectedAttachment->uuid = "uuid2"; | |
429 expectedAttachment->contentType = Orthanc::FileContentType_DicomAsJson; | |
430 expectedAttachment->uncompressedSize = 4242; | |
431 expectedAttachment->uncompressedHash = "md5_2"; | |
432 expectedAttachment->compressionType = Orthanc::CompressionType_None; | |
433 expectedAttachment->compressedSize = 4242; | |
434 expectedAttachment->compressedHash = "md5_2"; | |
261
34e2b93a7ac1
implementing interface for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
256
diff
changeset
|
435 revision = -1; |
34e2b93a7ac1
implementing interface for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
256
diff
changeset
|
436 ASSERT_TRUE(db.LookupAttachment(*output, revision, *manager, a, Orthanc::FileContentType_DicomAsJson)); |
262
b0c65094b299
adding support for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
437 |
266
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
438 #if HAS_REVISIONS == 1 |
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
439 ASSERT_EQ(43, revision); |
262
b0c65094b299
adding support for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
440 #else |
b0c65094b299
adding support for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
441 ASSERT_EQ(0, revision); |
b0c65094b299
adding support for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
442 #endif |
0 | 443 |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
444 db.ListAvailableAttachments(fc, *manager, b); |
0 | 445 ASSERT_EQ(0u, fc.size()); |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
446 db.DeleteAttachment(*output, *manager, a, Orthanc::FileContentType_Dicom); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
447 db.ListAvailableAttachments(fc, *manager, a); |
0 | 448 ASSERT_EQ(1u, fc.size()); |
449 ASSERT_EQ(Orthanc::FileContentType_DicomAsJson, fc.front()); | |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
450 db.DeleteAttachment(*output, *manager, a, Orthanc::FileContentType_DicomAsJson); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
451 db.ListAvailableAttachments(fc, *manager, a); |
0 | 452 ASSERT_EQ(0u, fc.size()); |
453 | |
454 | |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
455 db.SetIdentifierTag(*manager, a, 0x0010, 0x0020, "patient"); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
456 db.SetIdentifierTag(*manager, a, 0x0020, 0x000d, "study"); |
0 | 457 |
458 expectedDicomTags.clear(); | |
459 expectedDicomTags.push_back(OrthancPluginDicomTag()); | |
460 expectedDicomTags.push_back(OrthancPluginDicomTag()); | |
461 expectedDicomTags.front().group = 0x0010; | |
462 expectedDicomTags.front().element = 0x0020; | |
463 expectedDicomTags.front().value = "patient"; | |
464 expectedDicomTags.back().group = 0x0020; | |
465 expectedDicomTags.back().element = 0x000d; | |
466 expectedDicomTags.back().value = "study"; | |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
467 db.GetMainDicomTags(*output, *manager, a); |
0 | 468 |
469 | |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
470 db.LookupIdentifier(ci, *manager, OrthancPluginResourceType_Study, 0x0010, 0x0020, |
0 | 471 OrthancPluginIdentifierConstraint_Equal, "patient"); |
472 ASSERT_EQ(1u, ci.size()); | |
473 ASSERT_EQ(a, ci.front()); | |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
474 db.LookupIdentifier(ci, *manager, OrthancPluginResourceType_Study, 0x0010, 0x0020, |
0 | 475 OrthancPluginIdentifierConstraint_Equal, "study"); |
476 ASSERT_EQ(0u, ci.size()); | |
477 | |
478 | |
479 OrthancPluginExportedResource exp; | |
480 exp.seq = -1; | |
481 exp.resourceType = OrthancPluginResourceType_Study; | |
482 exp.publicId = "id"; | |
483 exp.modality = "remote"; | |
484 exp.date = "date"; | |
485 exp.patientId = "patient"; | |
486 exp.studyInstanceUid = "study"; | |
487 exp.seriesInstanceUid = "series"; | |
488 exp.sopInstanceUid = "instance"; | |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
489 db.LogExportedResource(*manager, exp); |
0 | 490 |
491 expectedExported.reset(new OrthancPluginExportedResource()); | |
492 *expectedExported = exp; | |
493 | |
494 bool done; | |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
495 db.GetExportedResources(*output, done, *manager, 0, 10); |
0 | 496 |
497 | |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
498 db.GetAllPublicIds(pub, *manager, OrthancPluginResourceType_Patient); ASSERT_EQ(0u, pub.size()); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
499 db.GetAllPublicIds(pub, *manager, OrthancPluginResourceType_Study); ASSERT_EQ(1u, pub.size()); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
500 db.GetAllPublicIds(pub, *manager, OrthancPluginResourceType_Series); ASSERT_EQ(2u, pub.size()); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
501 db.GetAllPublicIds(pub, *manager, OrthancPluginResourceType_Instance); ASSERT_EQ(0u, pub.size()); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
502 ASSERT_EQ(3u, db.GetAllResourcesCount(*manager)); |
0 | 503 |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
504 ASSERT_EQ(0u, db.GetUnprotectedPatientsCount(*manager)); // No patient was inserted |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
505 ASSERT_TRUE(db.IsExistingResource(*manager, c)); |
27
173176f8cef2
jobs branch has disappeared in orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
26
diff
changeset
|
506 |
173176f8cef2
jobs branch has disappeared in orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
26
diff
changeset
|
507 { |
173176f8cef2
jobs branch has disappeared in orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
26
diff
changeset
|
508 // A transaction is needed here for MySQL, as it was not possible |
173176f8cef2
jobs branch has disappeared in orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
26
diff
changeset
|
509 // to implement recursive deletion of resources using pure SQL |
173176f8cef2
jobs branch has disappeared in orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
26
diff
changeset
|
510 // statements |
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
511 manager->StartTransaction(TransactionType_ReadWrite); |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
512 |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
513 deletedAttachments.clear(); |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
514 deletedResources.clear(); |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
515 remainingAncestor.reset(); |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
516 |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
517 db.DeleteResource(*output, *manager, c); |
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
518 |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
519 ASSERT_EQ(0u, deletedAttachments.size()); |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
520 ASSERT_EQ(1u, deletedResources.size()); |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
521 ASSERT_EQ(OrthancPluginResourceType_Series, deletedResources["series2"]); |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
522 ASSERT_TRUE(remainingAncestor.get() != NULL); |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
523 ASSERT_EQ("study", remainingAncestor->first); |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
524 ASSERT_EQ(OrthancPluginResourceType_Study, remainingAncestor->second); |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
525 |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
526 manager->CommitTransaction(); |
27
173176f8cef2
jobs branch has disappeared in orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
26
diff
changeset
|
527 } |
173176f8cef2
jobs branch has disappeared in orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
26
diff
changeset
|
528 |
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
529 deletedAttachments.clear(); |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
530 deletedResources.clear(); |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
531 remainingAncestor.reset(); |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
532 |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
533 ASSERT_FALSE(db.IsExistingResource(*manager, c)); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
534 ASSERT_TRUE(db.IsExistingResource(*manager, a)); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
535 ASSERT_TRUE(db.IsExistingResource(*manager, b)); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
536 ASSERT_EQ(2u, db.GetAllResourcesCount(*manager)); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
537 db.DeleteResource(*output, *manager, a); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
538 ASSERT_EQ(0u, db.GetAllResourcesCount(*manager)); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
539 ASSERT_FALSE(db.IsExistingResource(*manager, a)); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
540 ASSERT_FALSE(db.IsExistingResource(*manager, b)); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
541 ASSERT_FALSE(db.IsExistingResource(*manager, c)); |
0 | 542 |
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
543 ASSERT_EQ(0u, deletedAttachments.size()); |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
544 ASSERT_EQ(2u, deletedResources.size()); |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
545 ASSERT_EQ(OrthancPluginResourceType_Series, deletedResources["series"]); |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
546 ASSERT_EQ(OrthancPluginResourceType_Study, deletedResources["study"]); |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
547 ASSERT_FALSE(remainingAncestor.get() != NULL); |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
548 |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
549 ASSERT_EQ(0u, db.GetAllResourcesCount(*manager)); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
550 ASSERT_EQ(0u, db.GetUnprotectedPatientsCount(*manager)); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
551 int64_t p1 = db.CreateResource(*manager, "patient1", OrthancPluginResourceType_Patient); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
552 int64_t p2 = db.CreateResource(*manager, "patient2", OrthancPluginResourceType_Patient); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
553 int64_t p3 = db.CreateResource(*manager, "patient3", OrthancPluginResourceType_Patient); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
554 ASSERT_EQ(3u, db.GetUnprotectedPatientsCount(*manager)); |
0 | 555 int64_t r; |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
556 ASSERT_TRUE(db.SelectPatientToRecycle(r, *manager)); |
0 | 557 ASSERT_EQ(p1, r); |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
558 ASSERT_TRUE(db.SelectPatientToRecycle(r, *manager, p1)); |
0 | 559 ASSERT_EQ(p2, r); |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
560 ASSERT_FALSE(db.IsProtectedPatient(*manager, p1)); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
561 db.SetProtectedPatient(*manager, p1, true); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
562 ASSERT_TRUE(db.IsProtectedPatient(*manager, p1)); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
563 ASSERT_TRUE(db.SelectPatientToRecycle(r, *manager)); |
0 | 564 ASSERT_EQ(p2, r); |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
565 db.SetProtectedPatient(*manager, p1, false); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
566 ASSERT_FALSE(db.IsProtectedPatient(*manager, p1)); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
567 ASSERT_TRUE(db.SelectPatientToRecycle(r, *manager)); |
0 | 568 ASSERT_EQ(p2, r); |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
569 db.DeleteResource(*output, *manager, p2); |
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
570 ASSERT_TRUE(db.SelectPatientToRecycle(r, *manager, p3)); |
0 | 571 ASSERT_EQ(p1, r); |
225
94c9908e6aca
removed DatabaseManager member out of class IndexBackend
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
221
diff
changeset
|
572 |
288
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
573 { |
289
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
574 // Test creating a large property of 16MB (large properties are |
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
575 // notably necessary to serialize jobs) |
288
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
576 // https://groups.google.com/g/orthanc-users/c/1Y3nTBdr0uE/m/K7PA5pboAgAJ |
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
577 std::string longProperty; |
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
578 longProperty.resize(16 * 1024 * 1024); |
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
579 for (size_t i = 0; i < longProperty.size(); i++) |
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
580 { |
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
581 longProperty[i] = 'A' + (i % 26); |
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
582 } |
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
583 |
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
584 db.SetGlobalProperty(*manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabaseInternal8, longProperty.c_str()); |
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
585 |
289
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
586 // The following line fails on MySQL 4.0 because the "value" |
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
587 // column in "ServerProperties" is "TEXT" instead of "LONGTEXT" |
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
588 db.SetGlobalProperty(*manager, "some-server", Orthanc::GlobalProperty_DatabaseInternal8, longProperty.c_str()); |
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
589 |
288
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
590 std::string tmp; |
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
591 ASSERT_TRUE(db.LookupGlobalProperty(tmp, *manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabaseInternal8)); |
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
592 ASSERT_EQ(longProperty, tmp); |
289
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
593 |
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
594 tmp.clear(); |
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
595 ASSERT_TRUE(db.LookupGlobalProperty(tmp, *manager, "some-server", Orthanc::GlobalProperty_DatabaseInternal8)); |
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
596 ASSERT_EQ(longProperty, tmp); |
288
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
597 } |
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
598 |
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
599 db.DeleteResource(*output, *manager, p1); |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
600 db.DeleteResource(*output, *manager, p3); |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
601 |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
602 for (size_t level = 0; level < 4; level++) |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
603 { |
312 | 604 for (size_t attachmentLevel = 0; attachmentLevel < 4; attachmentLevel++) |
605 { | |
606 // Test cascade up to the "patient" level | |
607 ASSERT_EQ(0u, db.GetAllResourcesCount(*manager)); | |
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
608 |
312 | 609 std::vector<int64_t> resources; |
610 resources.push_back(db.CreateResource(*manager, "patient", OrthancPluginResourceType_Patient)); | |
611 resources.push_back(db.CreateResource(*manager, "study", OrthancPluginResourceType_Study)); | |
612 resources.push_back(db.CreateResource(*manager, "series", OrthancPluginResourceType_Series)); | |
613 resources.push_back(db.CreateResource(*manager, "instance", OrthancPluginResourceType_Instance)); | |
614 | |
321 | 615 OrthancPluginAttachment d; |
616 d.uuid = "attachment"; | |
617 d.contentType = Orthanc::FileContentType_DicomAsJson; | |
618 d.uncompressedSize = 4242; | |
619 d.uncompressedHash = "md5"; | |
620 d.compressionType = Orthanc::CompressionType_None; | |
621 d.compressedSize = 4242; | |
622 d.compressedHash = "md5"; | |
623 db.AddAttachment(*manager, resources[attachmentLevel], d, 42); | |
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
624 |
312 | 625 db.AttachChild(*manager, resources[0], resources[1]); |
626 db.AttachChild(*manager, resources[1], resources[2]); | |
627 db.AttachChild(*manager, resources[2], resources[3]); | |
628 ASSERT_EQ(4u, db.GetAllResourcesCount(*manager)); | |
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
629 |
312 | 630 deletedAttachments.clear(); |
631 deletedResources.clear(); | |
632 remainingAncestor.reset(); | |
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
633 |
312 | 634 db.DeleteResource(*output, *manager, resources[level]); |
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
635 |
312 | 636 ASSERT_EQ(1u, deletedAttachments.size()); |
637 ASSERT_EQ("attachment", *deletedAttachments.begin()); | |
638 ASSERT_EQ(4u, deletedResources.size()); | |
639 ASSERT_EQ(OrthancPluginResourceType_Patient, deletedResources["patient"]); | |
640 ASSERT_EQ(OrthancPluginResourceType_Study, deletedResources["study"]); | |
641 ASSERT_EQ(OrthancPluginResourceType_Series, deletedResources["series"]); | |
642 ASSERT_EQ(OrthancPluginResourceType_Instance, deletedResources["instance"]); | |
643 ASSERT_TRUE(remainingAncestor.get() == NULL); | |
644 } | |
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
645 } |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
646 |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
647 for (size_t level = 1; level < 4; level++) |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
648 { |
312 | 649 for (size_t attachmentLevel = 0; attachmentLevel < 4; attachmentLevel++) |
650 { | |
651 // Test remaining ancestor | |
652 ASSERT_EQ(0u, db.GetAllResourcesCount(*manager)); | |
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
653 |
312 | 654 std::vector<int64_t> resources; |
655 resources.push_back(db.CreateResource(*manager, "patient", OrthancPluginResourceType_Patient)); | |
656 resources.push_back(db.CreateResource(*manager, "study", OrthancPluginResourceType_Study)); | |
657 resources.push_back(db.CreateResource(*manager, "series", OrthancPluginResourceType_Series)); | |
658 resources.push_back(db.CreateResource(*manager, "instance", OrthancPluginResourceType_Instance)); | |
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
659 |
312 | 660 int64_t unrelated = db.CreateResource(*manager, "unrelated", OrthancPluginResourceType_Patient); |
661 int64_t remaining = db.CreateResource(*manager, "remaining", static_cast<OrthancPluginResourceType>(level)); | |
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
662 |
312 | 663 db.AttachChild(*manager, resources[0], resources[1]); |
664 db.AttachChild(*manager, resources[1], resources[2]); | |
665 db.AttachChild(*manager, resources[2], resources[3]); | |
666 db.AttachChild(*manager, resources[level - 1], remaining); | |
667 ASSERT_EQ(6u, db.GetAllResourcesCount(*manager)); | |
668 | |
321 | 669 OrthancPluginAttachment d; |
670 d.uuid = "attachment"; | |
671 d.contentType = Orthanc::FileContentType_DicomAsJson; | |
672 d.uncompressedSize = 4242; | |
673 d.uncompressedHash = "md5"; | |
674 d.compressionType = Orthanc::CompressionType_None; | |
675 d.compressedSize = 4242; | |
676 d.compressedHash = "md5"; | |
677 db.AddAttachment(*manager, resources[attachmentLevel], d, 42); | |
314
64763998cdff
clarification in IndexBackend::SignalDeletedFiles()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
313
diff
changeset
|
678 |
313 | 679 deletedAttachments.clear(); |
321 | 680 d.uuid = "attachment2"; |
313 | 681 db.DeleteAttachment(*output, *manager, resources[attachmentLevel], Orthanc::FileContentType_DicomAsJson); |
682 ASSERT_EQ(1u, deletedAttachments.size()); | |
683 ASSERT_EQ("attachment", *deletedAttachments.begin()); | |
684 | |
321 | 685 db.AddAttachment(*manager, resources[attachmentLevel], d, 43); |
313 | 686 |
312 | 687 deletedAttachments.clear(); |
688 deletedResources.clear(); | |
689 remainingAncestor.reset(); | |
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
690 |
312 | 691 db.DeleteResource(*output, *manager, resources[3]); // delete instance |
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
692 |
312 | 693 if (attachmentLevel < level) |
694 { | |
695 ASSERT_EQ(0u, deletedAttachments.size()); | |
696 } | |
697 else | |
698 { | |
699 ASSERT_EQ(1u, deletedAttachments.size()); | |
313 | 700 ASSERT_EQ("attachment2", *deletedAttachments.begin()); |
312 | 701 } |
702 | |
703 ASSERT_EQ(OrthancPluginResourceType_Instance, deletedResources["instance"]); | |
704 | |
705 ASSERT_TRUE(remainingAncestor.get() != NULL); | |
706 | |
707 switch (level) | |
708 { | |
709 case 1: | |
710 ASSERT_EQ(3u, deletedResources.size()); | |
711 ASSERT_EQ(OrthancPluginResourceType_Study, deletedResources["study"]); | |
712 ASSERT_EQ(OrthancPluginResourceType_Series, deletedResources["series"]); | |
713 ASSERT_EQ("patient", remainingAncestor->first); | |
714 ASSERT_EQ(OrthancPluginResourceType_Patient, remainingAncestor->second); | |
715 break; | |
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
716 |
312 | 717 case 2: |
718 ASSERT_EQ(2u, deletedResources.size()); | |
719 ASSERT_EQ(OrthancPluginResourceType_Series, deletedResources["series"]); | |
720 ASSERT_EQ("study", remainingAncestor->first); | |
721 ASSERT_EQ(OrthancPluginResourceType_Study, remainingAncestor->second); | |
722 break; | |
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
723 |
312 | 724 case 3: |
725 ASSERT_EQ(1u, deletedResources.size()); | |
726 ASSERT_EQ("series", remainingAncestor->first); | |
727 ASSERT_EQ(OrthancPluginResourceType_Series, remainingAncestor->second); | |
728 break; | |
729 | |
730 default: | |
731 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
732 } | |
733 | |
734 db.DeleteResource(*output, *manager, resources[0]); | |
735 db.DeleteResource(*output, *manager, unrelated); | |
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
736 } |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
737 } |
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
738 |
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
739 manager->Close(); |
0 | 740 } |