Mercurial > hg > orthanc-databases
annotate Framework/Plugins/IndexUnitTests.h @ 289:0868500060f3
Fix serialization of large jobs
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 30 Jun 2021 08:19:52 +0200 |
| parents | 6d4d413a8797 |
| children | 2447c290fc73 |
| 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 |
| 71 static void CheckAttachment(const OrthancPluginAttachment& attachment) | |
| 72 { | |
| 73 ASSERT_STREQ(expectedAttachment->uuid, attachment.uuid); | |
| 74 ASSERT_EQ(expectedAttachment->contentType, attachment.contentType); | |
| 75 ASSERT_EQ(expectedAttachment->uncompressedSize, attachment.uncompressedSize); | |
| 76 ASSERT_STREQ(expectedAttachment->uncompressedHash, attachment.uncompressedHash); | |
| 77 ASSERT_EQ(expectedAttachment->compressionType, attachment.compressionType); | |
| 78 ASSERT_EQ(expectedAttachment->compressedSize, attachment.compressedSize); | |
| 79 ASSERT_STREQ(expectedAttachment->compressedHash, attachment.compressedHash); | |
| 80 } | |
| 81 | |
| 82 static void CheckExportedResource(const OrthancPluginExportedResource& exported) | |
| 83 { | |
| 84 ASSERT_EQ(expectedExported->seq, exported.seq); | |
| 85 ASSERT_EQ(expectedExported->resourceType, exported.resourceType); | |
| 86 ASSERT_STREQ(expectedExported->publicId, exported.publicId); | |
| 87 ASSERT_STREQ(expectedExported->modality, exported.modality); | |
| 88 ASSERT_STREQ(expectedExported->date, exported.date); | |
| 89 ASSERT_STREQ(expectedExported->patientId, exported.patientId); | |
| 90 ASSERT_STREQ(expectedExported->studyInstanceUid, exported.studyInstanceUid); | |
| 91 ASSERT_STREQ(expectedExported->seriesInstanceUid, exported.seriesInstanceUid); | |
| 92 ASSERT_STREQ(expectedExported->sopInstanceUid, exported.sopInstanceUid); | |
| 93 } | |
| 94 | |
| 95 static void CheckDicomTag(const OrthancPluginDicomTag& tag) | |
| 96 { | |
| 97 for (std::list<OrthancPluginDicomTag>::const_iterator | |
| 98 it = expectedDicomTags.begin(); it != expectedDicomTags.end(); ++it) | |
| 99 { | |
| 100 if (it->group == tag.group && | |
| 101 it->element == tag.element && | |
| 102 !strcmp(it->value, tag.value)) | |
| 103 { | |
| 104 // OK, match | |
| 105 return; | |
| 106 } | |
| 107 } | |
| 108 | |
| 109 ASSERT_TRUE(0); // Error | |
| 110 } | |
| 111 | |
| 112 | |
| 113 | |
| 114 static OrthancPluginErrorCode InvokeService(struct _OrthancPluginContext_t* context, | |
| 115 _OrthancPluginService service, | |
| 116 const void* params) | |
| 117 { | |
| 199 | 118 switch (service) |
| 0 | 119 { |
| 199 | 120 case _OrthancPluginService_DatabaseAnswer: |
| 0 | 121 { |
| 199 | 122 const _OrthancPluginDatabaseAnswer& answer = |
| 123 *reinterpret_cast<const _OrthancPluginDatabaseAnswer*>(params); | |
| 124 | |
| 125 switch (answer.type) | |
| 0 | 126 { |
| 199 | 127 case _OrthancPluginDatabaseAnswerType_Attachment: |
| 128 { | |
| 129 const OrthancPluginAttachment& attachment = | |
| 130 *reinterpret_cast<const OrthancPluginAttachment*>(answer.valueGeneric); | |
| 131 CheckAttachment(attachment); | |
| 132 break; | |
| 133 } | |
| 134 | |
| 135 case _OrthancPluginDatabaseAnswerType_ExportedResource: | |
| 136 { | |
| 137 const OrthancPluginExportedResource& attachment = | |
| 138 *reinterpret_cast<const OrthancPluginExportedResource*>(answer.valueGeneric); | |
| 139 CheckExportedResource(attachment); | |
| 140 break; | |
| 141 } | |
| 142 | |
| 143 case _OrthancPluginDatabaseAnswerType_DicomTag: | |
| 144 { | |
| 145 const OrthancPluginDicomTag& tag = | |
| 146 *reinterpret_cast<const OrthancPluginDicomTag*>(answer.valueGeneric); | |
| 147 CheckDicomTag(tag); | |
| 148 break; | |
| 149 } | |
| 150 | |
| 151 default: | |
| 152 printf("Unhandled message: %d\n", answer.type); | |
| 153 break; | |
| 0 | 154 } |
| 155 | |
| 199 | 156 return OrthancPluginErrorCode_Success; |
| 157 } | |
| 0 | 158 |
| 199 | 159 case _OrthancPluginService_GetExpectedDatabaseVersion: |
| 160 { | |
| 161 const _OrthancPluginReturnSingleValue& p = | |
| 162 *reinterpret_cast<const _OrthancPluginReturnSingleValue*>(params); | |
| 163 *(p.resultUint32) = ORTHANC_DATABASE_VERSION; | |
| 164 return OrthancPluginErrorCode_Success; | |
| 165 } | |
| 0 | 166 |
| 199 | 167 default: |
| 168 assert(0); | |
| 169 printf("Service not emulated: %d\n", service); | |
| 170 return OrthancPluginErrorCode_NotImplemented; | |
| 0 | 171 } |
| 172 } | |
| 173 | |
| 174 | |
| 175 TEST(IndexBackend, Basic) | |
| 176 { | |
| 177 using namespace OrthancDatabases; | |
| 178 | |
| 179 OrthancPluginContext context; | |
| 180 context.pluginsManager = NULL; | |
| 181 context.orthancVersion = "mainline"; | |
| 182 context.Free = ::free; | |
| 183 context.InvokeService = InvokeService; | |
| 184 | |
|
28
c0cb5d2cd696
checks depending on Orthanc version
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
27
diff
changeset
|
185 ImplicitTransaction::SetErrorOnDoubleExecution(true); |
|
c0cb5d2cd696
checks depending on Orthanc version
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
27
diff
changeset
|
186 |
| 0 | 187 #if ORTHANC_ENABLE_POSTGRESQL == 1 |
|
201
42990b2dd51b
create IDatabaseBackendOutput only if needed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
200
diff
changeset
|
188 PostgreSQLIndex db(&context, globalParameters_); |
| 0 | 189 db.SetClearAll(true); |
| 190 #elif ORTHANC_ENABLE_MYSQL == 1 | |
|
201
42990b2dd51b
create IDatabaseBackendOutput only if needed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
200
diff
changeset
|
191 MySQLIndex db(&context, globalParameters_); |
| 0 | 192 db.SetClearAll(true); |
| 193 #elif ORTHANC_ENABLE_SQLITE == 1 | |
|
201
42990b2dd51b
create IDatabaseBackendOutput only if needed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
200
diff
changeset
|
194 SQLiteIndex db(&context); // Open in memory |
| 0 | 195 #else |
| 196 # error Unsupported database backend | |
| 197 #endif | |
| 198 | |
| 204 | 199 db.SetOutputFactory(new DatabaseBackendAdapterV2::Factory(&context, NULL)); |
|
201
42990b2dd51b
create IDatabaseBackendOutput only if needed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
200
diff
changeset
|
200 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
201 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
|
202 |
|
203
2089d4071408
moving classes out of OrthancPlugins namespace, to OrthancDatabases
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
201
diff
changeset
|
203 std::unique_ptr<IDatabaseBackendOutput> output(db.CreateOutput()); |
| 0 | 204 |
| 205 std::string s; | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
206 ASSERT_TRUE(db.LookupGlobalProperty(s, *manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabaseSchemaVersion)); |
| 0 | 207 ASSERT_EQ("6", s); |
| 208 | |
|
239
e9ba888f371b
fix IndexBackend::SetGlobalProperty(), lighten GlobalProperty enum
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
209 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
|
210 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
|
211 ASSERT_TRUE(db.LookupGlobalProperty(s, *manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabaseInternal9)); |
| 0 | 212 ASSERT_EQ("Hello", s); |
|
239
e9ba888f371b
fix IndexBackend::SetGlobalProperty(), lighten GlobalProperty enum
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
213 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
|
214 ASSERT_TRUE(db.LookupGlobalProperty(s, *manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabaseInternal9)); |
| 0 | 215 ASSERT_EQ("HelloWorld", s); |
| 216 | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
217 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
|
218 ASSERT_TRUE(db.IsExistingResource(*manager, a)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
219 ASSERT_FALSE(db.IsExistingResource(*manager, a + 1)); |
| 0 | 220 |
| 221 int64_t b; | |
| 222 OrthancPluginResourceType t; | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
223 ASSERT_FALSE(db.LookupResource(b, t, *manager, "world")); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
224 ASSERT_TRUE(db.LookupResource(b, t, *manager, "study")); |
| 0 | 225 ASSERT_EQ(a, b); |
| 226 ASSERT_EQ(OrthancPluginResourceType_Study, t); | |
| 227 | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
228 b = db.CreateResource(*manager, "series", OrthancPluginResourceType_Series); |
| 0 | 229 ASSERT_NE(a, b); |
| 230 | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
231 ASSERT_EQ("study", db.GetPublicId(*manager, a)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
232 ASSERT_EQ("series", db.GetPublicId(*manager, b)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
233 ASSERT_EQ(OrthancPluginResourceType_Study, db.GetResourceType(*manager, a)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
234 ASSERT_EQ(OrthancPluginResourceType_Series, db.GetResourceType(*manager, b)); |
| 0 | 235 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
236 db.AttachChild(*manager, a, b); |
| 0 | 237 |
| 238 int64_t c; | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
239 ASSERT_FALSE(db.LookupParent(c, *manager, a)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
240 ASSERT_TRUE(db.LookupParent(c, *manager, b)); |
| 0 | 241 ASSERT_EQ(a, c); |
| 242 | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
243 c = db.CreateResource(*manager, "series2", OrthancPluginResourceType_Series); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
244 db.AttachChild(*manager, a, c); |
| 0 | 245 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
246 ASSERT_EQ(3u, db.GetAllResourcesCount(*manager)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
247 ASSERT_EQ(0u, db.GetResourcesCount(*manager, OrthancPluginResourceType_Patient)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
248 ASSERT_EQ(1u, db.GetResourcesCount(*manager, OrthancPluginResourceType_Study)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
249 ASSERT_EQ(2u, db.GetResourcesCount(*manager, OrthancPluginResourceType_Series)); |
| 0 | 250 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
251 ASSERT_FALSE(db.GetParentPublicId(s, *manager, a)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
252 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
|
253 ASSERT_TRUE(db.GetParentPublicId(s, *manager, c)); ASSERT_EQ("study", s); |
| 0 | 254 |
| 255 std::list<std::string> children; | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
256 db.GetChildren(children, *manager, a); |
| 0 | 257 ASSERT_EQ(2u, children.size()); |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
258 db.GetChildren(children, *manager, b); |
| 0 | 259 ASSERT_EQ(0u, children.size()); |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
260 db.GetChildren(children, *manager, c); |
| 0 | 261 ASSERT_EQ(0u, children.size()); |
| 262 | |
| 263 std::list<std::string> cp; | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
264 db.GetChildrenPublicId(cp, *manager, a); |
| 0 | 265 ASSERT_EQ(2u, cp.size()); |
| 266 ASSERT_TRUE(cp.front() == "series" || cp.front() == "series2"); | |
| 267 ASSERT_TRUE(cp.back() == "series" || cp.back() == "series2"); | |
| 268 ASSERT_NE(cp.front(), cp.back()); | |
| 269 | |
| 270 std::list<std::string> pub; | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
271 db.GetAllPublicIds(pub, *manager, OrthancPluginResourceType_Patient); |
| 0 | 272 ASSERT_EQ(0u, pub.size()); |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
273 db.GetAllPublicIds(pub, *manager, OrthancPluginResourceType_Study); |
| 0 | 274 ASSERT_EQ(1u, pub.size()); |
| 275 ASSERT_EQ("study", pub.front()); | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
276 db.GetAllPublicIds(pub, *manager, OrthancPluginResourceType_Series); |
| 0 | 277 ASSERT_EQ(2u, pub.size()); |
| 278 ASSERT_TRUE(pub.front() == "series" || pub.front() == "series2"); | |
| 279 ASSERT_TRUE(pub.back() == "series" || pub.back() == "series2"); | |
| 280 ASSERT_NE(pub.front(), pub.back()); | |
| 281 | |
| 282 std::list<int64_t> ci; | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
283 db.GetChildrenInternalId(ci, *manager, a); |
| 0 | 284 ASSERT_EQ(2u, ci.size()); |
| 285 ASSERT_TRUE(ci.front() == b || ci.front() == c); | |
| 286 ASSERT_TRUE(ci.back() == b || ci.back() == c); | |
| 287 ASSERT_NE(ci.front(), ci.back()); | |
| 288 | |
|
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
289 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
|
290 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
|
291 int64_t revision = -1; |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
292 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
|
293 ASSERT_TRUE(db.LookupMetadata(s, revision, *manager, a, Orthanc::MetadataType_LastUpdate)); |
| 0 | 294 ASSERT_EQ("update2", s); |
|
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
295 |
|
266
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
296 #if HAS_REVISIONS == 1 |
|
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
297 ASSERT_EQ(43, revision); |
|
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
298 #else |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
299 ASSERT_EQ(0, revision); |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
300 #endif |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
301 |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
302 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
|
303 ASSERT_TRUE(db.LookupMetadata(s, revision, *manager, a, Orthanc::MetadataType_LastUpdate)); |
| 0 | 304 ASSERT_EQ("update", s); |
| 305 | |
|
266
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
306 #if HAS_REVISIONS == 1 |
|
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
307 ASSERT_EQ(44, revision); |
|
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
308 #else |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
309 ASSERT_EQ(0, revision); |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
310 #endif |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
311 |
| 0 | 312 std::list<int32_t> md; |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
313 db.ListAvailableMetadata(md, *manager, a); |
| 0 | 314 ASSERT_EQ(2u, md.size()); |
| 315 ASSERT_TRUE(md.front() == Orthanc::MetadataType_ModifiedFrom || md.back() == Orthanc::MetadataType_ModifiedFrom); | |
| 316 ASSERT_TRUE(md.front() == Orthanc::MetadataType_LastUpdate || md.back() == Orthanc::MetadataType_LastUpdate); | |
| 317 std::string mdd; | |
|
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
318 ASSERT_TRUE(db.LookupMetadata(mdd, revision, *manager, a, Orthanc::MetadataType_ModifiedFrom)); |
| 0 | 319 ASSERT_EQ("modified", mdd); |
|
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
320 |
|
266
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
321 #if HAS_REVISIONS == 1 |
|
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
322 ASSERT_EQ(42, revision); |
|
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
323 #else |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
324 ASSERT_EQ(0, revision); |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
325 #endif |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
326 |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
327 ASSERT_TRUE(db.LookupMetadata(mdd, revision, *manager, a, Orthanc::MetadataType_LastUpdate)); |
| 0 | 328 ASSERT_EQ("update", mdd); |
| 329 | |
|
266
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
330 #if HAS_REVISIONS == 1 |
|
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
331 ASSERT_EQ(44, revision); |
|
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
332 #else |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
333 ASSERT_EQ(0, revision); |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
334 #endif |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
335 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
336 db.ListAvailableMetadata(md, *manager, b); |
| 0 | 337 ASSERT_EQ(0u, md.size()); |
| 338 | |
|
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
339 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
|
340 db.DeleteMetadata(*manager, a, Orthanc::MetadataType_LastUpdate); |
|
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
341 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
|
342 db.DeleteMetadata(*manager, b, Orthanc::MetadataType_LastUpdate); |
|
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
343 ASSERT_FALSE(db.LookupMetadata(s, revision, *manager, a, Orthanc::MetadataType_LastUpdate)); |
| 0 | 344 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
345 db.ListAvailableMetadata(md, *manager, a); |
| 0 | 346 ASSERT_EQ(1u, md.size()); |
| 347 ASSERT_EQ(Orthanc::MetadataType_ModifiedFrom, md.front()); | |
| 348 | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
349 ASSERT_EQ(0u, db.GetTotalCompressedSize(*manager)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
350 ASSERT_EQ(0u, db.GetTotalUncompressedSize(*manager)); |
| 0 | 351 |
| 352 | |
| 353 std::list<int32_t> fc; | |
| 354 | |
| 355 OrthancPluginAttachment a1; | |
| 356 a1.uuid = "uuid1"; | |
| 357 a1.contentType = Orthanc::FileContentType_Dicom; | |
| 358 a1.uncompressedSize = 42; | |
| 359 a1.uncompressedHash = "md5_1"; | |
| 360 a1.compressionType = Orthanc::CompressionType_None; | |
| 361 a1.compressedSize = 42; | |
| 362 a1.compressedHash = "md5_1"; | |
| 363 | |
| 364 OrthancPluginAttachment a2; | |
| 365 a2.uuid = "uuid2"; | |
| 366 a2.contentType = Orthanc::FileContentType_DicomAsJson; | |
| 367 a2.uncompressedSize = 4242; | |
| 368 a2.uncompressedHash = "md5_2"; | |
| 369 a2.compressionType = Orthanc::CompressionType_None; | |
| 370 a2.compressedSize = 4242; | |
| 371 a2.compressedHash = "md5_2"; | |
| 372 | |
|
261
34e2b93a7ac1
implementing interface for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
256
diff
changeset
|
373 db.AddAttachment(*manager, a, a1, 42); |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
374 db.ListAvailableAttachments(fc, *manager, a); |
| 0 | 375 ASSERT_EQ(1u, fc.size()); |
| 376 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
|
377 db.AddAttachment(*manager, a, a2, 43); |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
378 db.ListAvailableAttachments(fc, *manager, a); |
| 0 | 379 ASSERT_EQ(2u, fc.size()); |
|
261
34e2b93a7ac1
implementing interface for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
256
diff
changeset
|
380 ASSERT_FALSE(db.LookupAttachment(*output, revision, *manager, b, Orthanc::FileContentType_Dicom)); |
| 0 | 381 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
382 ASSERT_EQ(4284u, db.GetTotalCompressedSize(*manager)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
383 ASSERT_EQ(4284u, db.GetTotalUncompressedSize(*manager)); |
| 0 | 384 |
| 385 expectedAttachment.reset(new OrthancPluginAttachment); | |
| 386 expectedAttachment->uuid = "uuid1"; | |
| 387 expectedAttachment->contentType = Orthanc::FileContentType_Dicom; | |
| 388 expectedAttachment->uncompressedSize = 42; | |
| 389 expectedAttachment->uncompressedHash = "md5_1"; | |
| 390 expectedAttachment->compressionType = Orthanc::CompressionType_None; | |
| 391 expectedAttachment->compressedSize = 42; | |
| 392 expectedAttachment->compressedHash = "md5_1"; | |
|
261
34e2b93a7ac1
implementing interface for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
256
diff
changeset
|
393 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
|
394 |
|
266
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
395 #if HAS_REVISIONS == 1 |
|
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
396 ASSERT_EQ(42, revision); |
|
262
b0c65094b299
adding support for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
397 #else |
|
b0c65094b299
adding support for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
398 ASSERT_EQ(0, revision); |
|
b0c65094b299
adding support for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
399 #endif |
| 0 | 400 |
| 401 expectedAttachment.reset(new OrthancPluginAttachment); | |
| 402 expectedAttachment->uuid = "uuid2"; | |
| 403 expectedAttachment->contentType = Orthanc::FileContentType_DicomAsJson; | |
| 404 expectedAttachment->uncompressedSize = 4242; | |
| 405 expectedAttachment->uncompressedHash = "md5_2"; | |
| 406 expectedAttachment->compressionType = Orthanc::CompressionType_None; | |
| 407 expectedAttachment->compressedSize = 4242; | |
| 408 expectedAttachment->compressedHash = "md5_2"; | |
|
261
34e2b93a7ac1
implementing interface for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
256
diff
changeset
|
409 revision = -1; |
|
34e2b93a7ac1
implementing interface for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
256
diff
changeset
|
410 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
|
411 |
|
266
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
412 #if HAS_REVISIONS == 1 |
|
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
413 ASSERT_EQ(43, revision); |
|
262
b0c65094b299
adding support for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
414 #else |
|
b0c65094b299
adding support for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
415 ASSERT_EQ(0, revision); |
|
b0c65094b299
adding support for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
416 #endif |
| 0 | 417 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
418 db.ListAvailableAttachments(fc, *manager, b); |
| 0 | 419 ASSERT_EQ(0u, fc.size()); |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
420 db.DeleteAttachment(*output, *manager, a, Orthanc::FileContentType_Dicom); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
421 db.ListAvailableAttachments(fc, *manager, a); |
| 0 | 422 ASSERT_EQ(1u, fc.size()); |
| 423 ASSERT_EQ(Orthanc::FileContentType_DicomAsJson, fc.front()); | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
424 db.DeleteAttachment(*output, *manager, a, Orthanc::FileContentType_DicomAsJson); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
425 db.ListAvailableAttachments(fc, *manager, a); |
| 0 | 426 ASSERT_EQ(0u, fc.size()); |
| 427 | |
| 428 | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
429 db.SetIdentifierTag(*manager, a, 0x0010, 0x0020, "patient"); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
430 db.SetIdentifierTag(*manager, a, 0x0020, 0x000d, "study"); |
| 0 | 431 |
| 432 expectedDicomTags.clear(); | |
| 433 expectedDicomTags.push_back(OrthancPluginDicomTag()); | |
| 434 expectedDicomTags.push_back(OrthancPluginDicomTag()); | |
| 435 expectedDicomTags.front().group = 0x0010; | |
| 436 expectedDicomTags.front().element = 0x0020; | |
| 437 expectedDicomTags.front().value = "patient"; | |
| 438 expectedDicomTags.back().group = 0x0020; | |
| 439 expectedDicomTags.back().element = 0x000d; | |
| 440 expectedDicomTags.back().value = "study"; | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
441 db.GetMainDicomTags(*output, *manager, a); |
| 0 | 442 |
| 443 | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
444 db.LookupIdentifier(ci, *manager, OrthancPluginResourceType_Study, 0x0010, 0x0020, |
| 0 | 445 OrthancPluginIdentifierConstraint_Equal, "patient"); |
| 446 ASSERT_EQ(1u, ci.size()); | |
| 447 ASSERT_EQ(a, ci.front()); | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
448 db.LookupIdentifier(ci, *manager, OrthancPluginResourceType_Study, 0x0010, 0x0020, |
| 0 | 449 OrthancPluginIdentifierConstraint_Equal, "study"); |
| 450 ASSERT_EQ(0u, ci.size()); | |
| 451 | |
| 452 | |
| 453 OrthancPluginExportedResource exp; | |
| 454 exp.seq = -1; | |
| 455 exp.resourceType = OrthancPluginResourceType_Study; | |
| 456 exp.publicId = "id"; | |
| 457 exp.modality = "remote"; | |
| 458 exp.date = "date"; | |
| 459 exp.patientId = "patient"; | |
| 460 exp.studyInstanceUid = "study"; | |
| 461 exp.seriesInstanceUid = "series"; | |
| 462 exp.sopInstanceUid = "instance"; | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
463 db.LogExportedResource(*manager, exp); |
| 0 | 464 |
| 465 expectedExported.reset(new OrthancPluginExportedResource()); | |
| 466 *expectedExported = exp; | |
| 467 expectedExported->seq = 1; | |
| 468 | |
| 469 bool done; | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
470 db.GetExportedResources(*output, done, *manager, 0, 10); |
| 0 | 471 |
| 472 | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
473 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
|
474 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
|
475 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
|
476 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
|
477 ASSERT_EQ(3u, db.GetAllResourcesCount(*manager)); |
| 0 | 478 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
479 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
|
480 ASSERT_TRUE(db.IsExistingResource(*manager, c)); |
|
27
173176f8cef2
jobs branch has disappeared in orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
26
diff
changeset
|
481 |
|
173176f8cef2
jobs branch has disappeared in orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
26
diff
changeset
|
482 { |
|
173176f8cef2
jobs branch has disappeared in orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
26
diff
changeset
|
483 // 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
|
484 // 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
|
485 // statements |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
486 manager->StartTransaction(TransactionType_ReadWrite); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
487 db.DeleteResource(*output, *manager, c); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
488 manager->CommitTransaction(); |
|
27
173176f8cef2
jobs branch has disappeared in orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
26
diff
changeset
|
489 } |
|
173176f8cef2
jobs branch has disappeared in orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
26
diff
changeset
|
490 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
491 ASSERT_FALSE(db.IsExistingResource(*manager, c)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
492 ASSERT_TRUE(db.IsExistingResource(*manager, a)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
493 ASSERT_TRUE(db.IsExistingResource(*manager, b)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
494 ASSERT_EQ(2u, db.GetAllResourcesCount(*manager)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
495 db.DeleteResource(*output, *manager, a); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
496 ASSERT_EQ(0u, db.GetAllResourcesCount(*manager)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
497 ASSERT_FALSE(db.IsExistingResource(*manager, a)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
498 ASSERT_FALSE(db.IsExistingResource(*manager, b)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
499 ASSERT_FALSE(db.IsExistingResource(*manager, c)); |
| 0 | 500 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
501 ASSERT_EQ(0u, db.GetAllResourcesCount(*manager)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
502 ASSERT_EQ(0u, db.GetUnprotectedPatientsCount(*manager)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
503 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
|
504 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
|
505 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
|
506 ASSERT_EQ(3u, db.GetUnprotectedPatientsCount(*manager)); |
| 0 | 507 int64_t r; |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
508 ASSERT_TRUE(db.SelectPatientToRecycle(r, *manager)); |
| 0 | 509 ASSERT_EQ(p1, r); |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
510 ASSERT_TRUE(db.SelectPatientToRecycle(r, *manager, p1)); |
| 0 | 511 ASSERT_EQ(p2, r); |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
512 ASSERT_FALSE(db.IsProtectedPatient(*manager, p1)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
513 db.SetProtectedPatient(*manager, p1, true); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
514 ASSERT_TRUE(db.IsProtectedPatient(*manager, p1)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
515 ASSERT_TRUE(db.SelectPatientToRecycle(r, *manager)); |
| 0 | 516 ASSERT_EQ(p2, r); |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
517 db.SetProtectedPatient(*manager, p1, false); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
518 ASSERT_FALSE(db.IsProtectedPatient(*manager, p1)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
519 ASSERT_TRUE(db.SelectPatientToRecycle(r, *manager)); |
| 0 | 520 ASSERT_EQ(p2, r); |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
521 db.DeleteResource(*output, *manager, p2); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
522 ASSERT_TRUE(db.SelectPatientToRecycle(r, *manager, p3)); |
| 0 | 523 ASSERT_EQ(p1, r); |
|
225
94c9908e6aca
removed DatabaseManager member out of class IndexBackend
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
221
diff
changeset
|
524 |
|
288
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
525 { |
|
289
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
526 // 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
|
527 // notably necessary to serialize jobs) |
|
288
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
528 // 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
|
529 std::string longProperty; |
|
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
530 longProperty.resize(16 * 1024 * 1024); |
|
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
531 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
|
532 { |
|
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
533 longProperty[i] = 'A' + (i % 26); |
|
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
534 } |
|
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
535 |
|
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
536 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
|
537 |
|
289
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
538 // 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
|
539 // column in "ServerProperties" is "TEXT" instead of "LONGTEXT" |
|
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
540 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
|
541 |
|
288
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
542 std::string tmp; |
|
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
543 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
|
544 ASSERT_EQ(longProperty, tmp); |
|
289
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
545 |
|
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
546 tmp.clear(); |
|
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
547 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
|
548 ASSERT_EQ(longProperty, tmp); |
|
288
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
549 } |
|
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
550 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
551 manager->Close(); |
| 0 | 552 } |