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