orthanc: OrthancServer/UnitTestsSources/ServerIndexTests.cpp annotate

annotate OrthancServer/UnitTestsSources/ServerIndexTests.cpp @ 5044:6fed78e13233

Refactored DicomMap to handle sequences when needed

author	Alain Mazy <am@osimis.io>
date	Tue, 28 Jun 2022 17:45:09 +0200
parents	28db9663fc2d
children	d7274e43ea7c 0ea402b4d901

rev	line source
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	1 /**
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1287 diff changeset	4 * Department, University Hospital of Liege, Belgium
4870 43e613a7756b upgrade to year 2022 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	5 * Copyright (C) 2017-2022 Osimis S.A., Belgium
43e613a7756b upgrade to year 2022 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	6 * Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	7 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	8 * This program is free software: you can redistribute it and/or
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	9 * modify it under the terms of the GNU General Public License as
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	10 * published by the Free Software Foundation, either version 3 of the
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	11 * License, or (at your option) any later version.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	12 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	13 * This program is distributed in the hope that it will be useful, but
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	14 * WITHOUT ANY WARRANTY; without even the implied warranty of
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	16 * General Public License for more details.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	17 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	18 * You should have received a copy of the GNU General Public License
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	20 **/
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	21
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	22
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 827 diff changeset	23 #include "PrecompiledHeadersUnitTests.h"
4062 0953b3dc3261 pretty-printing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	24 #include <gtest/gtest.h>
181 2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25
4045 05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	26 #include "../../OrthancFramework/Sources/Compatibility.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	27 #include "../../OrthancFramework/Sources/FileStorage/FilesystemStorage.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	28 #include "../../OrthancFramework/Sources/FileStorage/MemoryStorageArea.h"
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	29 #include "../../OrthancFramework/Sources/Images/Image.h"
4045 05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	30 #include "../../OrthancFramework/Sources/Logging.h"
4062 0953b3dc3261 pretty-printing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	31
4045 05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	32 #include "../Sources/Database/SQLiteDatabaseWrapper.h"
4505 97d103b57cd1 removed cached dicom summary from DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 4499 diff changeset	33 #include "../Sources/OrthancConfiguration.h"
4045 05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	34 #include "../Sources/Search/DatabaseLookup.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	35 #include "../Sources/ServerContext.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	36 #include "../Sources/ServerToolbox.h"
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	37
181 2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	38 #include <ctype.h>
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	39 #include <algorithm>
181 2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	40
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	41 using namespace Orthanc;
181 2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	42
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	43 namespace
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	44 {
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	45 class TestDatabaseListener : public IDatabaseListener
181 2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46 {
2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47 public:
262 2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	48 std::vector<std::string> deletedFiles_;
1159 8f9d49192815 speeding up db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	49 std::vector<std::string> deletedResources_;
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	50 std::string ancestorId_;
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	51 ResourceType ancestorType_;
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	52
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	53 void Reset()
181 2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	54 {
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	55 ancestorId_ = "";
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	56 deletedFiles_.clear();
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	57 }
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	58
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	59 virtual void SignalRemainingAncestor(ResourceType type,
2924 22524fd06225 macros ORTHANC_OVERRIDE and ORTHANC_FINAL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2898 diff changeset	60 const std::string& publicId)
22524fd06225 macros ORTHANC_OVERRIDE and ORTHANC_FINAL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2898 diff changeset	61 ORTHANC_OVERRIDE
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	62 {
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	63 ancestorId_ = publicId;
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	64 ancestorType_ = type;
181 2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	65 }
2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	66
4571 9224e107d613 simplifying IDatabaseListener::SignalChange() as IDatabaseListener::SignalResourceDeleted() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	67 virtual void SignalAttachmentDeleted(const FileInfo& info) ORTHANC_OVERRIDE
181 2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	68 {
273 d384af918264 more detailed signal about deleted file Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	69 const std::string fileUuid = info.GetUuid();
262 2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	70 deletedFiles_.push_back(fileUuid);
181 2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	71 LOG(INFO) << "A file must be removed: " << fileUuid;
1159 8f9d49192815 speeding up db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	72 }
8f9d49192815 speeding up db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	73
4571 9224e107d613 simplifying IDatabaseListener::SignalChange() as IDatabaseListener::SignalResourceDeleted() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	74 virtual void SignalResourceDeleted(ResourceType type,
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	75 const std::string& publicId) ORTHANC_OVERRIDE
1159 8f9d49192815 speeding up db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	76 {
4571 9224e107d613 simplifying IDatabaseListener::SignalChange() as IDatabaseListener::SignalResourceDeleted() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	77 LOG(INFO) << "Deleted resource " << publicId << " of type " << EnumerationToString(type);
9224e107d613 simplifying IDatabaseListener::SignalChange() as IDatabaseListener::SignalResourceDeleted() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	78 deletedResources_.push_back(publicId);
1159 8f9d49192815 speeding up db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	79 }
181 2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	80 };
737 1dee6e9bdbf4 abstraction of databasewrapper tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 726 diff changeset	81
1dee6e9bdbf4 abstraction of databasewrapper tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 726 diff changeset	82
3081 2e5970ddcfeb simplification of unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	83 class DatabaseWrapperTest : public ::testing::Test
737 1dee6e9bdbf4 abstraction of databasewrapper tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 726 diff changeset	84 {
1dee6e9bdbf4 abstraction of databasewrapper tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 726 diff changeset	85 protected:
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	86 std::unique_ptr<TestDatabaseListener> listener_;
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	87 std::unique_ptr<SQLiteDatabaseWrapper> index_;
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	88 std::unique_ptr<SQLiteDatabaseWrapper::UnitTestsTransaction> transaction_;
737 1dee6e9bdbf4 abstraction of databasewrapper tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 726 diff changeset	89
3081 2e5970ddcfeb simplification of unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	90 public:
738 c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	91 DatabaseWrapperTest()
737 1dee6e9bdbf4 abstraction of databasewrapper tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 726 diff changeset	92 {
1dee6e9bdbf4 abstraction of databasewrapper tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 726 diff changeset	93 }
1dee6e9bdbf4 abstraction of databasewrapper tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 726 diff changeset	94
3081 2e5970ddcfeb simplification of unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	95 virtual void SetUp() ORTHANC_OVERRIDE
737 1dee6e9bdbf4 abstraction of databasewrapper tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 726 diff changeset	96 {
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	97 listener_.reset(new TestDatabaseListener);
3081 2e5970ddcfeb simplification of unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	98 index_.reset(new SQLiteDatabaseWrapper);
1672 4c5a85c3ff43 sample database plugin now working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1549 diff changeset	99 index_->Open();
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	100 transaction_.reset(dynamic_cast<SQLiteDatabaseWrapper::UnitTestsTransaction*>(
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	101 index_->StartTransaction(TransactionType_ReadWrite, *listener_)));
737 1dee6e9bdbf4 abstraction of databasewrapper tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 726 diff changeset	102 }
1dee6e9bdbf4 abstraction of databasewrapper tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 726 diff changeset	103
2924 22524fd06225 macros ORTHANC_OVERRIDE and ORTHANC_FINAL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2898 diff changeset	104 virtual void TearDown() ORTHANC_OVERRIDE
737 1dee6e9bdbf4 abstraction of databasewrapper tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 726 diff changeset	105 {
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	106 transaction_->Commit(0);
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	107 transaction_.reset();
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	108
1672 4c5a85c3ff43 sample database plugin now working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1549 diff changeset	109 index_->Close();
738 c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	110 index_.reset(NULL);
c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	111 listener_.reset(NULL);
737 1dee6e9bdbf4 abstraction of databasewrapper tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 726 diff changeset	112 }
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	113
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	114 void CheckTableRecordCount(uint32_t expected, const char* table)
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	115 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	116 ASSERT_EQ(expected, transaction_->GetTableRecordCount(table));
1287 63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	117 }
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	118
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	119 void CheckNoParent(int64_t id)
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	120 {
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	121 std::string s;
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	122 ASSERT_FALSE(transaction_->GetParentPublicId(s, id));
1287 63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	123 }
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	124
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	125 void CheckParentPublicId(const char* expected, int64_t id)
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	126 {
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	127 std::string s;
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	128 ASSERT_TRUE(transaction_->GetParentPublicId(s, id));
3081 2e5970ddcfeb simplification of unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	129 ASSERT_EQ(expected, s);
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	130 }
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	131
1287 63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	132 void CheckNoChild(int64_t id)
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	133 {
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	134 std::list<std::string> j;
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	135 transaction_->GetChildren(j, id);
3081 2e5970ddcfeb simplification of unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	136 ASSERT_EQ(0u, j.size());
1287 63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	137 }
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	138
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	139 void CheckOneChild(const char* expected, int64_t id)
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	140 {
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	141 std::list<std::string> j;
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	142 transaction_->GetChildren(j, id);
3081 2e5970ddcfeb simplification of unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	143 ASSERT_EQ(1u, j.size());
2e5970ddcfeb simplification of unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	144 ASSERT_EQ(expected, j.front());
1287 63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	145 }
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	146
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	147 void CheckTwoChildren(const char* expected1,
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	148 const char* expected2,
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	149 int64_t id)
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	150 {
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	151 std::list<std::string> j;
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	152 transaction_->GetChildren(j, id);
3081 2e5970ddcfeb simplification of unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	153 ASSERT_EQ(2u, j.size());
2e5970ddcfeb simplification of unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	154 ASSERT_TRUE((expected1 == j.front() && expected2 == j.back()) \|\|
2e5970ddcfeb simplification of unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	155 (expected1 == j.back() && expected2 == j.front()));
1287 63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	156 }
1746 d143db00a794 SetOfResources Sebastien Jodogne <s.jodogne@gmail.com> parents: 1744 diff changeset	157
3075 ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	158 void DoLookupIdentifier(std::list<std::string>& result,
3036 8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	159 ResourceType level,
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	160 const DicomTag& tag,
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	161 ConstraintType type,
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	162 const std::string& value)
1746 d143db00a794 SetOfResources Sebastien Jodogne <s.jodogne@gmail.com> parents: 1744 diff changeset	163 {
3036 8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	164 assert(ServerToolbox::IsIdentifier(tag, level));
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	165
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	166 DicomTagConstraint c(tag, type, value, true, true);
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	167
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	168 std::vector<DatabaseConstraint> lookup;
3073 0e9d1731b1b0 refactoring to reuse DatabaseConstraint in separate projects Sebastien Jodogne <s.jodogne@gmail.com> parents: 3061 diff changeset	169 lookup.push_back(c.ConvertToDatabaseConstraint(level, DicomTagType_Identifier));
3036 8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	170
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	171 transaction_->ApplyLookupResources(result, NULL, lookup, level, 0 /* no limit */);
3081 2e5970ddcfeb simplification of unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	172 }
1746 d143db00a794 SetOfResources Sebastien Jodogne <s.jodogne@gmail.com> parents: 1744 diff changeset	173
3075 ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	174 void DoLookupIdentifier2(std::list<std::string>& result,
3036 8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	175 ResourceType level,
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	176 const DicomTag& tag,
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	177 ConstraintType type1,
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	178 const std::string& value1,
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	179 ConstraintType type2,
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	180 const std::string& value2)
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	181 {
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	182 assert(ServerToolbox::IsIdentifier(tag, level));
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	183
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	184 DicomTagConstraint c1(tag, type1, value1, true, true);
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	185 DicomTagConstraint c2(tag, type2, value2, true, true);
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	186
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	187 std::vector<DatabaseConstraint> lookup;
3073 0e9d1731b1b0 refactoring to reuse DatabaseConstraint in separate projects Sebastien Jodogne <s.jodogne@gmail.com> parents: 3061 diff changeset	188 lookup.push_back(c1.ConvertToDatabaseConstraint(level, DicomTagType_Identifier));
0e9d1731b1b0 refactoring to reuse DatabaseConstraint in separate projects Sebastien Jodogne <s.jodogne@gmail.com> parents: 3061 diff changeset	189 lookup.push_back(c2.ConvertToDatabaseConstraint(level, DicomTagType_Identifier));
3036 8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	190
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	191 transaction_->ApplyLookupResources(result, NULL, lookup, level, 0 /* no limit */);
3036 8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	192 }
737 1dee6e9bdbf4 abstraction of databasewrapper tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 726 diff changeset	193 };
181 2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	194 }
2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	195
2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	196
3081 2e5970ddcfeb simplification of unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	197 TEST_F(DatabaseWrapperTest, Simple)
181 2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	198 {
2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	199 int64_t a[] = {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	200 transaction_->CreateResource("a", ResourceType_Patient), // 0
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	201 transaction_->CreateResource("b", ResourceType_Study), // 1
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	202 transaction_->CreateResource("c", ResourceType_Series), // 2
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	203 transaction_->CreateResource("d", ResourceType_Instance), // 3
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	204 transaction_->CreateResource("e", ResourceType_Instance), // 4
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	205 transaction_->CreateResource("f", ResourceType_Instance), // 5
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	206 transaction_->CreateResource("g", ResourceType_Study) // 6
181 2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	207 };
2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	208
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	209 ASSERT_EQ("a", transaction_->GetPublicId(a[0]));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	210 ASSERT_EQ("b", transaction_->GetPublicId(a[1]));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	211 ASSERT_EQ("c", transaction_->GetPublicId(a[2]));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	212 ASSERT_EQ("d", transaction_->GetPublicId(a[3]));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	213 ASSERT_EQ("e", transaction_->GetPublicId(a[4]));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	214 ASSERT_EQ("f", transaction_->GetPublicId(a[5]));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	215 ASSERT_EQ("g", transaction_->GetPublicId(a[6]));
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	216
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	217 ASSERT_EQ(ResourceType_Patient, transaction_->GetResourceType(a[0]));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	218 ASSERT_EQ(ResourceType_Study, transaction_->GetResourceType(a[1]));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	219 ASSERT_EQ(ResourceType_Series, transaction_->GetResourceType(a[2]));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	220 ASSERT_EQ(ResourceType_Instance, transaction_->GetResourceType(a[3]));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	221 ASSERT_EQ(ResourceType_Instance, transaction_->GetResourceType(a[4]));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	222 ASSERT_EQ(ResourceType_Instance, transaction_->GetResourceType(a[5]));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	223 ASSERT_EQ(ResourceType_Study, transaction_->GetResourceType(a[6]));
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	224
190 b6cef9d45cc3 getallpublicids Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	225 {
1241 90d2f320862d refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	226 std::list<std::string> t;
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	227 transaction_->GetAllPublicIds(t, ResourceType_Patient);
190 b6cef9d45cc3 getallpublicids Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	228
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	229 ASSERT_EQ(1u, t.size());
1241 90d2f320862d refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	230 ASSERT_EQ("a", t.front());
190 b6cef9d45cc3 getallpublicids Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	231
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	232 transaction_->GetAllPublicIds(t, ResourceType_Series);
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	233 ASSERT_EQ(1u, t.size());
1241 90d2f320862d refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	234 ASSERT_EQ("c", t.front());
190 b6cef9d45cc3 getallpublicids Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	235
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	236 transaction_->GetAllPublicIds(t, ResourceType_Study);
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	237 ASSERT_EQ(2u, t.size());
190 b6cef9d45cc3 getallpublicids Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	238
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	239 transaction_->GetAllPublicIds(t, ResourceType_Instance);
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	240 ASSERT_EQ(3u, t.size());
190 b6cef9d45cc3 getallpublicids Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	241 }
b6cef9d45cc3 getallpublicids Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	242
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4591 diff changeset	243 transaction_->SetGlobalProperty(GlobalProperty_FlushSleep, true, "World");
181 2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	244
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	245 transaction_->AttachChild(a[0], a[1]);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	246 transaction_->AttachChild(a[1], a[2]);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	247 transaction_->AttachChild(a[2], a[3]);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	248 transaction_->AttachChild(a[2], a[4]);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	249 transaction_->AttachChild(a[6], a[5]);
182 93ff5babcaf8 children public id Sebastien Jodogne <s.jodogne@gmail.com> parents: 181 diff changeset	250
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	251 int64_t parent;
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	252 ASSERT_FALSE(transaction_->LookupParent(parent, a[0]));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	253 ASSERT_TRUE(transaction_->LookupParent(parent, a[1])); ASSERT_EQ(a[0], parent);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	254 ASSERT_TRUE(transaction_->LookupParent(parent, a[2])); ASSERT_EQ(a[1], parent);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	255 ASSERT_TRUE(transaction_->LookupParent(parent, a[3])); ASSERT_EQ(a[2], parent);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	256 ASSERT_TRUE(transaction_->LookupParent(parent, a[4])); ASSERT_EQ(a[2], parent);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	257 ASSERT_TRUE(transaction_->LookupParent(parent, a[5])); ASSERT_EQ(a[6], parent);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	258 ASSERT_FALSE(transaction_->LookupParent(parent, a[6]));
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	259
182 93ff5babcaf8 children public id Sebastien Jodogne <s.jodogne@gmail.com> parents: 181 diff changeset	260 std::string s;
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	261
1287 63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	262 CheckNoParent(a[0]);
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	263 CheckNoParent(a[6]);
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	264 CheckParentPublicId("a", a[1]);
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	265 CheckParentPublicId("b", a[2]);
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	266 CheckParentPublicId("c", a[3]);
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	267 CheckParentPublicId("c", a[4]);
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	268 CheckParentPublicId("g", a[5]);
182 93ff5babcaf8 children public id Sebastien Jodogne <s.jodogne@gmail.com> parents: 181 diff changeset	269
185 5185ae1d9af5 fix for msvc Sebastien Jodogne <s.jodogne@gmail.com> parents: 184 diff changeset	270 std::list<std::string> l;
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	271 transaction_->GetChildrenPublicId(l, a[0]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("b", l.front());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	272 transaction_->GetChildrenPublicId(l, a[1]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("c", l.front());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	273 transaction_->GetChildrenPublicId(l, a[3]); ASSERT_EQ(0u, l.size());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	274 transaction_->GetChildrenPublicId(l, a[4]); ASSERT_EQ(0u, l.size());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	275 transaction_->GetChildrenPublicId(l, a[5]); ASSERT_EQ(0u, l.size());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	276 transaction_->GetChildrenPublicId(l, a[6]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("f", l.front());
182 93ff5babcaf8 children public id Sebastien Jodogne <s.jodogne@gmail.com> parents: 181 diff changeset	277
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	278 transaction_->GetChildrenPublicId(l, a[2]); ASSERT_EQ(2u, l.size());
182 93ff5babcaf8 children public id Sebastien Jodogne <s.jodogne@gmail.com> parents: 181 diff changeset	279 if (l.front() == "d")
93ff5babcaf8 children public id Sebastien Jodogne <s.jodogne@gmail.com> parents: 181 diff changeset	280 {
93ff5babcaf8 children public id Sebastien Jodogne <s.jodogne@gmail.com> parents: 181 diff changeset	281 ASSERT_EQ("e", l.back());
93ff5babcaf8 children public id Sebastien Jodogne <s.jodogne@gmail.com> parents: 181 diff changeset	282 }
93ff5babcaf8 children public id Sebastien Jodogne <s.jodogne@gmail.com> parents: 181 diff changeset	283 else
93ff5babcaf8 children public id Sebastien Jodogne <s.jodogne@gmail.com> parents: 181 diff changeset	284 {
93ff5babcaf8 children public id Sebastien Jodogne <s.jodogne@gmail.com> parents: 181 diff changeset	285 ASSERT_EQ("d", l.back());
93ff5babcaf8 children public id Sebastien Jodogne <s.jodogne@gmail.com> parents: 181 diff changeset	286 ASSERT_EQ("e", l.front());
93ff5babcaf8 children public id Sebastien Jodogne <s.jodogne@gmail.com> parents: 181 diff changeset	287 }
93ff5babcaf8 children public id Sebastien Jodogne <s.jodogne@gmail.com> parents: 181 diff changeset	288
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	289 std::map<MetadataType, std::string> md;
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	290 transaction_->GetAllMetadata(md, a[4]);
436 d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	291 ASSERT_EQ(0u, md.size());
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	292
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	293 transaction_->AddAttachment(a[4], FileInfo("my json file", FileContentType_DicomAsJson, 42, "md5",
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	294 CompressionType_ZlibWithSize, 21, "compressedMD5"), 42);
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	295 transaction_->AddAttachment(a[4], FileInfo("my dicom file", FileContentType_Dicom, 42, "md5"), 43);
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	296 transaction_->AddAttachment(a[6], FileInfo("world", FileContentType_Dicom, 44, "md5"), 44);
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	297
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	298 // TODO - REVISIONS - "42" is revision number, that is not currently stored (*)
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	299 transaction_->SetMetadata(a[4], MetadataType_RemoteAet, "PINNACLE", 42);
436 d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	300
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	301 transaction_->GetAllMetadata(md, a[4]);
436 d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	302 ASSERT_EQ(1u, md.size());
4460 6831de40acd9 New metadata automatically computed at the series level: "RemoteAET" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	303 ASSERT_EQ("PINNACLE", md[MetadataType_RemoteAet]);
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	304 transaction_->SetMetadata(a[4], MetadataType_ModifiedFrom, "TUTU", 10);
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	305 transaction_->GetAllMetadata(md, a[4]);
438 7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	306 ASSERT_EQ(2u, md.size());
1030 66fa947c7280 more tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1029 diff changeset	307
66fa947c7280 more tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1029 diff changeset	308 std::map<MetadataType, std::string> md2;
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	309 transaction_->GetAllMetadata(md2, a[4]);
1030 66fa947c7280 more tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1029 diff changeset	310 ASSERT_EQ(2u, md2.size());
66fa947c7280 more tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1029 diff changeset	311 ASSERT_EQ("TUTU", md2[MetadataType_ModifiedFrom]);
4460 6831de40acd9 New metadata automatically computed at the series level: "RemoteAET" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	312 ASSERT_EQ("PINNACLE", md2[MetadataType_RemoteAet]);
1030 66fa947c7280 more tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1029 diff changeset	313
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	314 transaction_->DeleteMetadata(a[4], MetadataType_ModifiedFrom);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	315 transaction_->GetAllMetadata(md, a[4]);
438 7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	316 ASSERT_EQ(1u, md.size());
4460 6831de40acd9 New metadata automatically computed at the series level: "RemoteAET" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	317 ASSERT_EQ("PINNACLE", md[MetadataType_RemoteAet]);
182 93ff5babcaf8 children public id Sebastien Jodogne <s.jodogne@gmail.com> parents: 181 diff changeset	318
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	319 transaction_->GetAllMetadata(md2, a[4]);
1030 66fa947c7280 more tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1029 diff changeset	320 ASSERT_EQ(1u, md2.size());
4460 6831de40acd9 New metadata automatically computed at the series level: "RemoteAET" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	321 ASSERT_EQ("PINNACLE", md2[MetadataType_RemoteAet]);
1030 66fa947c7280 more tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1029 diff changeset	322
66fa947c7280 more tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1029 diff changeset	323
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	324 ASSERT_EQ(21u + 42u + 44u, transaction_->GetTotalCompressedSize());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	325 ASSERT_EQ(42u + 42u + 44u, transaction_->GetTotalUncompressedSize());
181 2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	326
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	327 transaction_->SetMainDicomTag(a[3], DicomTag(0x0010, 0x0010), "PatientName");
181 2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	328
2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	329 int64_t b;
2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	330 ResourceType t;
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	331 ASSERT_TRUE(transaction_->LookupResource(b, t, "g"));
181 2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	332 ASSERT_EQ(7, b);
2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	333 ASSERT_EQ(ResourceType_Study, t);
2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	334
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	335 int64_t revision;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	336 ASSERT_TRUE(transaction_->LookupMetadata(s, revision, a[4], MetadataType_RemoteAet));
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	337 ASSERT_EQ(0, revision); // "0" instead of "42" because of (*)
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	338 ASSERT_FALSE(transaction_->LookupMetadata(s, revision, a[4], MetadataType_Instance_IndexInSeries));
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	339 ASSERT_EQ(0, revision);
181 2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	340 ASSERT_EQ("PINNACLE", s);
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	341
6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	342 std::string u;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	343 ASSERT_TRUE(transaction_->LookupMetadata(u, revision, a[4], MetadataType_RemoteAet));
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	344 ASSERT_EQ(0, revision);
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	345 ASSERT_EQ("PINNACLE", u);
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	346 ASSERT_FALSE(transaction_->LookupMetadata(u, revision, a[4], MetadataType_Instance_IndexInSeries));
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	347 ASSERT_EQ(0, revision);
181 2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	348
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4591 diff changeset	349 ASSERT_TRUE(transaction_->LookupGlobalProperty(s, GlobalProperty_FlushSleep, true));
f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4591 diff changeset	350 ASSERT_FALSE(transaction_->LookupGlobalProperty(s, static_cast<GlobalProperty>(42), true));
181 2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	351 ASSERT_EQ("World", s);
2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	352
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	353 FileInfo att;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	354 ASSERT_TRUE(transaction_->LookupAttachment(att, revision, a[4], FileContentType_DicomAsJson));
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	355 ASSERT_EQ(0, revision); // "0" instead of "42" because of (*)
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	356 ASSERT_EQ("my json file", att.GetUuid());
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	357 ASSERT_EQ(21u, att.GetCompressedSize());
693 01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	358 ASSERT_EQ("md5", att.GetUncompressedMD5());
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	359 ASSERT_EQ("compressedMD5", att.GetCompressedMD5());
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	360 ASSERT_EQ(42u, att.GetUncompressedSize());
1514 d73a2178b319 support of deflate and gzip content-types Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	361 ASSERT_EQ(CompressionType_ZlibWithSize, att.GetCompressionType());
181 2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	362
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	363 ASSERT_TRUE(transaction_->LookupAttachment(att, revision, a[6], FileContentType_Dicom));
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	364 ASSERT_EQ(0, revision); // "0" instead of "42" because of (*)
693 01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	365 ASSERT_EQ("world", att.GetUuid());
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	366 ASSERT_EQ(44u, att.GetCompressedSize());
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	367 ASSERT_EQ("md5", att.GetUncompressedMD5());
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	368 ASSERT_EQ("md5", att.GetCompressedMD5());
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	369 ASSERT_EQ(44u, att.GetUncompressedSize());
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	370 ASSERT_EQ(CompressionType_None, att.GetCompressionType());
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	371
738 c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	372 ASSERT_EQ(0u, listener_->deletedFiles_.size());
1159 8f9d49192815 speeding up db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	373 ASSERT_EQ(0u, listener_->deletedResources_.size());
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	374
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	375 CheckTableRecordCount(7, "Resources");
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	376 CheckTableRecordCount(3, "AttachedFiles");
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	377 CheckTableRecordCount(1, "Metadata");
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	378 CheckTableRecordCount(1, "MainDicomTags");
1159 8f9d49192815 speeding up db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	379
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	380 transaction_->DeleteResource(a[0]);
1159 8f9d49192815 speeding up db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	381 ASSERT_EQ(5u, listener_->deletedResources_.size());
738 c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	382 ASSERT_EQ(2u, listener_->deletedFiles_.size());
c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	383 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(),
c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	384 listener_->deletedFiles_.end(),
c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	385 "my json file") == listener_->deletedFiles_.end());
c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	386 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(),
c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	387 listener_->deletedFiles_.end(),
c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	388 "my dicom file") == listener_->deletedFiles_.end());
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	389
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	390 CheckTableRecordCount(2, "Resources");
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	391 CheckTableRecordCount(0, "Metadata");
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	392 CheckTableRecordCount(1, "AttachedFiles");
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	393 CheckTableRecordCount(0, "MainDicomTags");
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	394
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	395 transaction_->DeleteResource(a[5]);
1159 8f9d49192815 speeding up db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	396 ASSERT_EQ(7u, listener_->deletedResources_.size());
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	397
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	398 CheckTableRecordCount(0, "Resources");
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	399 CheckTableRecordCount(0, "AttachedFiles");
3121 f86ebf971a72 fix unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3116 diff changeset	400 CheckTableRecordCount(3, "GlobalProperties");
3018 e3b5c07146a3 speeding up the computation of the size of the attachments in SQLite Sebastien Jodogne <s.jodogne@gmail.com> parents: 3017 diff changeset	401
e3b5c07146a3 speeding up the computation of the size of the attachments in SQLite Sebastien Jodogne <s.jodogne@gmail.com> parents: 3017 diff changeset	402 std::string tmp;
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4591 diff changeset	403 ASSERT_TRUE(transaction_->LookupGlobalProperty(tmp, GlobalProperty_DatabaseSchemaVersion, true));
3018 e3b5c07146a3 speeding up the computation of the size of the attachments in SQLite Sebastien Jodogne <s.jodogne@gmail.com> parents: 3017 diff changeset	404 ASSERT_EQ("6", tmp);
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4591 diff changeset	405 ASSERT_TRUE(transaction_->LookupGlobalProperty(tmp, GlobalProperty_FlushSleep, true));
3018 e3b5c07146a3 speeding up the computation of the size of the attachments in SQLite Sebastien Jodogne <s.jodogne@gmail.com> parents: 3017 diff changeset	406 ASSERT_EQ("World", tmp);
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4591 diff changeset	407 ASSERT_TRUE(transaction_->LookupGlobalProperty(tmp, GlobalProperty_GetTotalSizeIsFast, true));
3018 e3b5c07146a3 speeding up the computation of the size of the attachments in SQLite Sebastien Jodogne <s.jodogne@gmail.com> parents: 3017 diff changeset	408 ASSERT_EQ("1", tmp);
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	409
738 c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	410 ASSERT_EQ(3u, listener_->deletedFiles_.size());
c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	411 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(),
c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	412 listener_->deletedFiles_.end(),
c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	413 "world") == listener_->deletedFiles_.end());
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	414 }
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	415
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	416
3081 2e5970ddcfeb simplification of unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	417 TEST_F(DatabaseWrapperTest, Upward)
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	418 {
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	419 int64_t a[] = {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	420 transaction_->CreateResource("a", ResourceType_Patient), // 0
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	421 transaction_->CreateResource("b", ResourceType_Study), // 1
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	422 transaction_->CreateResource("c", ResourceType_Series), // 2
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	423 transaction_->CreateResource("d", ResourceType_Instance), // 3
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	424 transaction_->CreateResource("e", ResourceType_Instance), // 4
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	425 transaction_->CreateResource("f", ResourceType_Study), // 5
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	426 transaction_->CreateResource("g", ResourceType_Series), // 6
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	427 transaction_->CreateResource("h", ResourceType_Series) // 7
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	428 };
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	429
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	430 transaction_->AttachChild(a[0], a[1]);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	431 transaction_->AttachChild(a[1], a[2]);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	432 transaction_->AttachChild(a[2], a[3]);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	433 transaction_->AttachChild(a[2], a[4]);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	434 transaction_->AttachChild(a[1], a[6]);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	435 transaction_->AttachChild(a[0], a[5]);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	436 transaction_->AttachChild(a[5], a[7]);
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	437
1287 63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	438 CheckTwoChildren("b", "f", a[0]);
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	439 CheckTwoChildren("c", "g", a[1]);
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	440 CheckTwoChildren("d", "e", a[2]);
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	441 CheckNoChild(a[3]);
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	442 CheckNoChild(a[4]);
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	443 CheckOneChild("h", a[5]);
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	444 CheckNoChild(a[6]);
63a6428771f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	445 CheckNoChild(a[7]);
193 a1b9d1e1497b failed attempt to compile with linux standard base Sebastien Jodogne <s.jodogne@gmail.com> parents: 190 diff changeset	446
738 c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	447 listener_->Reset();
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	448 transaction_->DeleteResource(a[3]);
738 c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	449 ASSERT_EQ("c", listener_->ancestorId_);
c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	450 ASSERT_EQ(ResourceType_Series, listener_->ancestorType_);
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	451
738 c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	452 listener_->Reset();
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	453 transaction_->DeleteResource(a[4]);
738 c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	454 ASSERT_EQ("b", listener_->ancestorId_);
c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	455 ASSERT_EQ(ResourceType_Study, listener_->ancestorType_);
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	456
738 c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	457 listener_->Reset();
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	458 transaction_->DeleteResource(a[7]);
738 c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	459 ASSERT_EQ("a", listener_->ancestorId_);
c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	460 ASSERT_EQ(ResourceType_Patient, listener_->ancestorType_);
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	461
738 c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	462 listener_->Reset();
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	463 transaction_->DeleteResource(a[6]);
738 c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	464 ASSERT_EQ("", listener_->ancestorId_); // No more ancestor
181 2dece1526c06 simplifying db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	465 }
262 2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	466
2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	467
3081 2e5970ddcfeb simplification of unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	468 TEST_F(DatabaseWrapperTest, PatientRecycling)
262 2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	469 {
2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	470 std::vector<int64_t> patients;
2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	471 for (int i = 0; i < 10; i++)
2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	472 {
2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	473 std::string p = "Patient " + boost::lexical_cast<std::string>(i);
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	474 patients.push_back(transaction_->CreateResource(p, ResourceType_Patient));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	475 transaction_->AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10,
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	476 "md5-" + boost::lexical_cast<std::string>(i)), 42);
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	477 ASSERT_FALSE(transaction_->IsProtectedPatient(patients[i]));
262 2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	478 }
2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	479
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	480 CheckTableRecordCount(10u, "Resources");
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	481 CheckTableRecordCount(10u, "PatientRecyclingOrder");
262 2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	482
738 c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	483 listener_->Reset();
1159 8f9d49192815 speeding up db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	484 ASSERT_EQ(0u, listener_->deletedResources_.size());
262 2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	485
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	486 transaction_->DeleteResource(patients[5]);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	487 transaction_->DeleteResource(patients[0]);
1159 8f9d49192815 speeding up db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	488 ASSERT_EQ(2u, listener_->deletedResources_.size());
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	489
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	490 CheckTableRecordCount(8u, "Resources");
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	491 CheckTableRecordCount(8u, "PatientRecyclingOrder");
262 2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	492
738 c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	493 ASSERT_EQ(2u, listener_->deletedFiles_.size());
c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	494 ASSERT_EQ("Patient 5", listener_->deletedFiles_[0]);
c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	495 ASSERT_EQ("Patient 0", listener_->deletedFiles_[1]);
262 2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	496
2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	497 int64_t p;
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	498 ASSERT_TRUE(transaction_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[1]);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	499 transaction_->DeleteResource(p);
1159 8f9d49192815 speeding up db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	500 ASSERT_EQ(3u, listener_->deletedResources_.size());
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	501 ASSERT_TRUE(transaction_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[2]);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	502 transaction_->DeleteResource(p);
1159 8f9d49192815 speeding up db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	503 ASSERT_EQ(4u, listener_->deletedResources_.size());
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	504 ASSERT_TRUE(transaction_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[3]);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	505 transaction_->DeleteResource(p);
1159 8f9d49192815 speeding up db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	506 ASSERT_EQ(5u, listener_->deletedResources_.size());
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	507 ASSERT_TRUE(transaction_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[4]);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	508 transaction_->DeleteResource(p);
1159 8f9d49192815 speeding up db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	509 ASSERT_EQ(6u, listener_->deletedResources_.size());
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	510 ASSERT_TRUE(transaction_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[6]);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	511 transaction_->DeleteResource(p);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	512 transaction_->DeleteResource(patients[8]);
1159 8f9d49192815 speeding up db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	513 ASSERT_EQ(8u, listener_->deletedResources_.size());
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	514 ASSERT_TRUE(transaction_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[7]);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	515 transaction_->DeleteResource(p);
1159 8f9d49192815 speeding up db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	516 ASSERT_EQ(9u, listener_->deletedResources_.size());
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	517 ASSERT_TRUE(transaction_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[9]);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	518 transaction_->DeleteResource(p);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	519 ASSERT_FALSE(transaction_->SelectPatientToRecycle(p));
1159 8f9d49192815 speeding up db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	520 ASSERT_EQ(10u, listener_->deletedResources_.size());
262 2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	521
738 c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	522 ASSERT_EQ(10u, listener_->deletedFiles_.size());
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	523
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	524 CheckTableRecordCount(0, "Resources");
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	525 CheckTableRecordCount(0, "PatientRecyclingOrder");
262 2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	526 }
2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	527
2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	528
3081 2e5970ddcfeb simplification of unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	529 TEST_F(DatabaseWrapperTest, PatientProtection)
262 2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	530 {
2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	531 std::vector<int64_t> patients;
2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	532 for (int i = 0; i < 5; i++)
2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	533 {
2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	534 std::string p = "Patient " + boost::lexical_cast<std::string>(i);
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	535 patients.push_back(transaction_->CreateResource(p, ResourceType_Patient));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	536 transaction_->AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10,
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	537 "md5-" + boost::lexical_cast<std::string>(i)), 42);
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	538 ASSERT_FALSE(transaction_->IsProtectedPatient(patients[i]));
262 2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	539 }
2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	540
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	541 CheckTableRecordCount(5, "Resources");
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	542 CheckTableRecordCount(5, "PatientRecyclingOrder");
262 2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	543
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	544 ASSERT_FALSE(transaction_->IsProtectedPatient(patients[2]));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	545 transaction_->SetProtectedPatient(patients[2], true);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	546 ASSERT_TRUE(transaction_->IsProtectedPatient(patients[2]));
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	547 CheckTableRecordCount(5, "Resources");
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	548 CheckTableRecordCount(4, "PatientRecyclingOrder");
262 2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	549
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	550 transaction_->SetProtectedPatient(patients[2], true);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	551 ASSERT_TRUE(transaction_->IsProtectedPatient(patients[2]));
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	552 CheckTableRecordCount(4, "PatientRecyclingOrder");
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	553 transaction_->SetProtectedPatient(patients[2], false);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	554 ASSERT_FALSE(transaction_->IsProtectedPatient(patients[2]));
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	555 CheckTableRecordCount(5, "PatientRecyclingOrder");
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	556 transaction_->SetProtectedPatient(patients[2], false);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	557 ASSERT_FALSE(transaction_->IsProtectedPatient(patients[2]));
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	558 CheckTableRecordCount(5, "PatientRecyclingOrder");
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	559 CheckTableRecordCount(5, "Resources");
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	560 transaction_->SetProtectedPatient(patients[2], true);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	561 ASSERT_TRUE(transaction_->IsProtectedPatient(patients[2]));
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	562 CheckTableRecordCount(4, "PatientRecyclingOrder");
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	563 transaction_->SetProtectedPatient(patients[2], false);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	564 ASSERT_FALSE(transaction_->IsProtectedPatient(patients[2]));
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	565 CheckTableRecordCount(5, "PatientRecyclingOrder");
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	566 transaction_->SetProtectedPatient(patients[3], true);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	567 ASSERT_TRUE(transaction_->IsProtectedPatient(patients[3]));
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	568 CheckTableRecordCount(4, "PatientRecyclingOrder");
262 2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	569
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	570 CheckTableRecordCount(5, "Resources");
738 c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	571 ASSERT_EQ(0u, listener_->deletedFiles_.size());
262 2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	572
2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	573 // Unprotecting a patient puts it at the last position in the recycling queue
2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	574 int64_t p;
1159 8f9d49192815 speeding up db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	575 ASSERT_EQ(0u, listener_->deletedResources_.size());
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	576 ASSERT_TRUE(transaction_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[0]);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	577 transaction_->DeleteResource(p);
1159 8f9d49192815 speeding up db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	578 ASSERT_EQ(1u, listener_->deletedResources_.size());
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	579 ASSERT_TRUE(transaction_->SelectPatientToRecycle(p, patients[1])); ASSERT_EQ(p, patients[4]);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	580 ASSERT_TRUE(transaction_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[1]);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	581 transaction_->DeleteResource(p);
1159 8f9d49192815 speeding up db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	582 ASSERT_EQ(2u, listener_->deletedResources_.size());
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	583 ASSERT_TRUE(transaction_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[4]);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	584 transaction_->DeleteResource(p);
1159 8f9d49192815 speeding up db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	585 ASSERT_EQ(3u, listener_->deletedResources_.size());
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	586 ASSERT_FALSE(transaction_->SelectPatientToRecycle(p, patients[2]));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	587 ASSERT_TRUE(transaction_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[2]);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	588 transaction_->DeleteResource(p);
1159 8f9d49192815 speeding up db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	589 ASSERT_EQ(4u, listener_->deletedResources_.size());
262 2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	590 // "patients[3]" is still protected
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	591 ASSERT_FALSE(transaction_->SelectPatientToRecycle(p));
262 2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	592
738 c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	593 ASSERT_EQ(4u, listener_->deletedFiles_.size());
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	594 CheckTableRecordCount(1, "Resources");
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	595 CheckTableRecordCount(0, "PatientRecyclingOrder");
262 2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	596
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	597 transaction_->SetProtectedPatient(patients[3], false);
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	598 CheckTableRecordCount(1, "PatientRecyclingOrder");
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	599 ASSERT_FALSE(transaction_->SelectPatientToRecycle(p, patients[3]));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	600 ASSERT_TRUE(transaction_->SelectPatientToRecycle(p, patients[2]));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	601 ASSERT_TRUE(transaction_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[3]);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	602 transaction_->DeleteResource(p);
1159 8f9d49192815 speeding up db schema Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	603 ASSERT_EQ(5u, listener_->deletedResources_.size());
262 2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	604
738 c60743fadd4e more abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 737 diff changeset	605 ASSERT_EQ(5u, listener_->deletedFiles_.size());
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	606 CheckTableRecordCount(0, "Resources");
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1252 diff changeset	607 CheckTableRecordCount(0, "PatientRecyclingOrder");
262 2354560daf2f primitives for recycling patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 252 diff changeset	608 }
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	609
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	610
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	611 TEST(ServerIndex, Sequence)
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	612 {
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	613 const std::string path = "UnitTestsStorage";
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	614
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2121 diff changeset	615 SystemToolbox::RemoveFile(path + "/index");
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	616 FilesystemStorage storage(path);
3017 517fc4767ae0 renamed class DatabaseWrapper as SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	617 SQLiteDatabaseWrapper db; // The SQLite DB is in memory
1672 4c5a85c3ff43 sample database plugin now working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1549 diff changeset	618 db.Open();
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2924 diff changeset	619 ServerContext context(db, storage, true /* running unit tests */, 10);
2815 925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2671 diff changeset	620 context.SetupJobsEngine(true, false);
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2671 diff changeset	621
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	622 ServerIndex& index = context.GetIndex();
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	623
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4591 diff changeset	624 ASSERT_EQ(1u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence, true));
f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4591 diff changeset	625 ASSERT_EQ(2u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence, true));
f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4591 diff changeset	626 ASSERT_EQ(3u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence, true));
f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4591 diff changeset	627 ASSERT_EQ(4u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence, true));
1453 c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	628
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	629 context.Stop();
1672 4c5a85c3ff43 sample database plugin now working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1549 diff changeset	630 db.Close();
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	631 }
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	632
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	633
3081 2e5970ddcfeb simplification of unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	634 TEST_F(DatabaseWrapperTest, LookupIdentifier)
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	635 {
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	636 int64_t a[] = {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	637 transaction_->CreateResource("a", ResourceType_Study), // 0
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	638 transaction_->CreateResource("b", ResourceType_Study), // 1
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	639 transaction_->CreateResource("c", ResourceType_Study), // 2
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	640 transaction_->CreateResource("d", ResourceType_Series) // 3
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	641 };
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	642
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	643 transaction_->SetIdentifierTag(a[0], DICOM_TAG_STUDY_INSTANCE_UID, "0");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	644 transaction_->SetIdentifierTag(a[1], DICOM_TAG_STUDY_INSTANCE_UID, "1");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	645 transaction_->SetIdentifierTag(a[2], DICOM_TAG_STUDY_INSTANCE_UID, "0");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	646 transaction_->SetIdentifierTag(a[3], DICOM_TAG_SERIES_INSTANCE_UID, "0");
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	647
3075 ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	648 std::list<std::string> s;
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	649
3036 8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	650 DoLookupIdentifier(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, ConstraintType_Equal, "0");
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	651 ASSERT_EQ(2u, s.size());
1746 d143db00a794 SetOfResources Sebastien Jodogne <s.jodogne@gmail.com> parents: 1744 diff changeset	652 ASSERT_TRUE(std::find(s.begin(), s.end(), "a") != s.end());
d143db00a794 SetOfResources Sebastien Jodogne <s.jodogne@gmail.com> parents: 1744 diff changeset	653 ASSERT_TRUE(std::find(s.begin(), s.end(), "c") != s.end());
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	654
3036 8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	655 DoLookupIdentifier(s, ResourceType_Series, DICOM_TAG_SERIES_INSTANCE_UID, ConstraintType_Equal, "0");
1718 2b812969e136 getting rid of an IDatabaseWrapper::LookupIdentifier flavor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1713 diff changeset	656 ASSERT_EQ(1u, s.size());
1746 d143db00a794 SetOfResources Sebastien Jodogne <s.jodogne@gmail.com> parents: 1744 diff changeset	657 ASSERT_TRUE(std::find(s.begin(), s.end(), "d") != s.end());
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	658
3036 8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	659 DoLookupIdentifier(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, ConstraintType_Equal, "1");
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	660 ASSERT_EQ(1u, s.size());
1746 d143db00a794 SetOfResources Sebastien Jodogne <s.jodogne@gmail.com> parents: 1744 diff changeset	661 ASSERT_TRUE(std::find(s.begin(), s.end(), "b") != s.end());
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	662
3036 8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	663 DoLookupIdentifier(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, ConstraintType_Equal, "1");
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	664 ASSERT_EQ(1u, s.size());
1746 d143db00a794 SetOfResources Sebastien Jodogne <s.jodogne@gmail.com> parents: 1744 diff changeset	665 ASSERT_TRUE(std::find(s.begin(), s.end(), "b") != s.end());
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	666
3036 8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	667 DoLookupIdentifier(s, ResourceType_Series, DICOM_TAG_SERIES_INSTANCE_UID, ConstraintType_Equal, "1");
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	668 ASSERT_EQ(0u, s.size());
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	669
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	670 DoLookupIdentifier(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, ConstraintType_GreaterOrEqual, "0");
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	671 ASSERT_EQ(3u, s.size());
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	672
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	673 DoLookupIdentifier(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, ConstraintType_GreaterOrEqual, "1");
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	674 ASSERT_EQ(1u, s.size());
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	675
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	676 DoLookupIdentifier(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, ConstraintType_GreaterOrEqual, "2");
1718 2b812969e136 getting rid of an IDatabaseWrapper::LookupIdentifier flavor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1713 diff changeset	677 ASSERT_EQ(0u, s.size());
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	678
3036 8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	679 DoLookupIdentifier2(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID,
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	680 ConstraintType_GreaterOrEqual, "0", ConstraintType_SmallerOrEqual, "0");
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	681 ASSERT_EQ(2u, s.size());
1746 d143db00a794 SetOfResources Sebastien Jodogne <s.jodogne@gmail.com> parents: 1744 diff changeset	682
3036 8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	683 DoLookupIdentifier2(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID,
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	684 ConstraintType_GreaterOrEqual, "1", ConstraintType_SmallerOrEqual, "1");
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	685 ASSERT_EQ(1u, s.size());
1746 d143db00a794 SetOfResources Sebastien Jodogne <s.jodogne@gmail.com> parents: 1744 diff changeset	686
3036 8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	687 DoLookupIdentifier2(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID,
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	688 ConstraintType_GreaterOrEqual, "0", ConstraintType_SmallerOrEqual, "1");
8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	689 ASSERT_EQ(3u, s.size());
562 f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	690 }
705 a9cff2c077d4 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	691
a9cff2c077d4 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	692
713 9d1973813d8b test attachment recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	693 TEST(ServerIndex, AttachmentRecycling)
705 a9cff2c077d4 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	694 {
803 4689e400e0fa directory to store the results of the unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	695 const std::string path = "UnitTestsStorage";
1124 790ff7a5b3bf IStorageArea abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1030 diff changeset	696
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2121 diff changeset	697 SystemToolbox::RemoveFile(path + "/index");
1124 790ff7a5b3bf IStorageArea abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1030 diff changeset	698 FilesystemStorage storage(path);
3017 517fc4767ae0 renamed class DatabaseWrapper as SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	699 SQLiteDatabaseWrapper db; // The SQLite DB is in memory
1672 4c5a85c3ff43 sample database plugin now working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1549 diff changeset	700 db.Open();
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2924 diff changeset	701 ServerContext context(db, storage, true /* running unit tests */, 10);
2815 925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2671 diff changeset	702 context.SetupJobsEngine(true, false);
705 a9cff2c077d4 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	703 ServerIndex& index = context.GetIndex();
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 706 diff changeset	704
706 2d829ea1db96 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 705 diff changeset	705 index.SetMaximumStorageSize(10);
2d829ea1db96 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 705 diff changeset	706
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	707 uint64_t diskSize, uncompressedSize, countPatients, countStudies, countSeries, countInstances;
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	708 index.GetGlobalStatistics(diskSize, uncompressedSize, countPatients,
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	709 countStudies, countSeries, countInstances);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	710
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	711 ASSERT_EQ(0u, countPatients);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	712 ASSERT_EQ(0u, diskSize);
705 a9cff2c077d4 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	713
a9cff2c077d4 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	714 ServerIndex::Attachments attachments;
a9cff2c077d4 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	715
713 9d1973813d8b test attachment recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	716 std::vector<std::string> ids;
9d1973813d8b test attachment recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	717 for (int i = 0; i < 10; i++)
9d1973813d8b test attachment recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	718 {
9d1973813d8b test attachment recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	719 std::string id = boost::lexical_cast<std::string>(i);
9d1973813d8b test attachment recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	720 DicomMap instance;
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1971 diff changeset	721 instance.SetValue(DICOM_TAG_PATIENT_ID, "patient-" + id, false);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1971 diff changeset	722 instance.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "study-" + id, false);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1971 diff changeset	723 instance.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, "series-" + id, false);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1971 diff changeset	724 instance.SetValue(DICOM_TAG_SOP_INSTANCE_UID, "instance-" + id, false);
2208 90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2190 diff changeset	725 instance.SetValue(DICOM_TAG_SOP_CLASS_UID, "1.2.840.10008.5.1.4.1.1.1", false); // CR image
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	726
4505 97d103b57cd1 removed cached dicom summary from DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 4499 diff changeset	727 ParsedDicomFile dicom(instance, GetDefaultDicomEncoding(), false /* be strict */);
97d103b57cd1 removed cached dicom summary from DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 4499 diff changeset	728
4508 8f9090b137f1 Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	729 std::unique_ptr<DicomInstanceToStore> toStore(DicomInstanceToStore::CreateFromParsedDicomFile(dicom));
4505 97d103b57cd1 removed cached dicom summary from DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 4499 diff changeset	730
4506 ac69c9f76c71 refactoring ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4505 diff changeset	731 std::map<MetadataType, std::string> instanceMetadata;
ac69c9f76c71 refactoring ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4505 diff changeset	732
4505 97d103b57cd1 removed cached dicom summary from DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 4499 diff changeset	733 {
97d103b57cd1 removed cached dicom summary from DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 4499 diff changeset	734 DicomMap summary;
4508 8f9090b137f1 Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	735 OrthancConfiguration::DefaultExtractDicomSummary(summary, toStore->GetParsedDicomFile());
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	736 toStore->SetOrigin(DicomInstanceOrigin::FromPlugins());
4505 97d103b57cd1 removed cached dicom summary from DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 4499 diff changeset	737
4507 b4c58795f3a8 widening the use of DicomTransferSyntax enum Sebastien Jodogne <s.jodogne@gmail.com> parents: 4506 diff changeset	738 DicomTransferSyntax transferSyntax;
4506 ac69c9f76c71 refactoring ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4505 diff changeset	739 bool hasTransferSyntax = dicom.LookupTransferSyntax(transferSyntax);
ac69c9f76c71 refactoring ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4505 diff changeset	740 ASSERT_EQ(StoreStatus_Success, index.Store(
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5039 diff changeset	741 instanceMetadata, summary, attachments, toStore->GetMetadata(),
4508 8f9090b137f1 Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	742 toStore->GetOrigin(), false /* don't overwrite */,
4992 d05626038846 fix unit tests (new metadata) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	743 hasTransferSyntax, transferSyntax, true /* pixel data offset */, 42, false));
4505 97d103b57cd1 removed cached dicom summary from DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 4499 diff changeset	744 }
97d103b57cd1 removed cached dicom summary from DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 4499 diff changeset	745
4992 d05626038846 fix unit tests (new metadata) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	746 ASSERT_EQ(7u, instanceMetadata.size());
4460 6831de40acd9 New metadata automatically computed at the series level: "RemoteAET" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	747 ASSERT_TRUE(instanceMetadata.find(MetadataType_RemoteAet) != instanceMetadata.end());
1029 9e04f9f36096 fix windows build jodogne parents: 1006 diff changeset	748 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_ReceptionDate) != instanceMetadata.end());
2190 3b9ee145f149 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	749 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_TransferSyntax) != instanceMetadata.end());
2208 90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2190 diff changeset	750 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_SopClassUid) != instanceMetadata.end());
4494 39192eb9b43d New metadata automatically computed at the instance level: "PixelDataOffset" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4460 diff changeset	751 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_PixelDataOffset) != instanceMetadata.end());
4992 d05626038846 fix unit tests (new metadata) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	752 ASSERT_TRUE(instanceMetadata.find(MetadataType_MainDicomTagsSignature) != instanceMetadata.end());
2190 3b9ee145f149 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	753
4499 6f99949b2878 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 4494 diff changeset	754 ASSERT_EQ("42", instanceMetadata[MetadataType_Instance_PixelDataOffset]);
6f99949b2878 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 4494 diff changeset	755
3974 bd0af2e11325 fix for big-endian Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	756 // The default transfer syntax depends on the OS endianness
bd0af2e11325 fix for big-endian Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	757 std::string s = instanceMetadata[MetadataType_Instance_TransferSyntax];
bd0af2e11325 fix for big-endian Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	758 ASSERT_TRUE(s == "1.2.840.10008.1.2.1" \|\|
bd0af2e11325 fix for big-endian Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	759 s == "1.2.840.10008.1.2.2");
713 9d1973813d8b test attachment recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	760
2208 90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2190 diff changeset	761 ASSERT_EQ("1.2.840.10008.5.1.4.1.1.1", instanceMetadata[MetadataType_Instance_SopClassUid]);
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2190 diff changeset	762
713 9d1973813d8b test attachment recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	763 DicomInstanceHasher hasher(instance);
9d1973813d8b test attachment recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	764 ids.push_back(hasher.HashPatient());
9d1973813d8b test attachment recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	765 ids.push_back(hasher.HashStudy());
9d1973813d8b test attachment recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	766 ids.push_back(hasher.HashSeries());
9d1973813d8b test attachment recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	767 ids.push_back(hasher.HashInstance());
9d1973813d8b test attachment recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	768 }
9d1973813d8b test attachment recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	769
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	770 index.GetGlobalStatistics(diskSize, uncompressedSize, countPatients,
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	771 countStudies, countSeries, countInstances);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	772 ASSERT_EQ(10u, countPatients);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	773 ASSERT_EQ(0u, diskSize);
713 9d1973813d8b test attachment recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	774
9d1973813d8b test attachment recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	775 for (size_t i = 0; i < ids.size(); i++)
9d1973813d8b test attachment recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	776 {
2512 4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	777 FileInfo info(Toolbox::GenerateUuid(), FileContentType_Dicom, 1, "md5");
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	778 int64_t revision = -1;
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	779 index.AddAttachment(revision, info, ids[i], false /* no previous revision */, -1, "");
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	780 ASSERT_EQ(0, revision);
713 9d1973813d8b test attachment recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	781
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	782 index.GetGlobalStatistics(diskSize, uncompressedSize, countPatients,
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	783 countStudies, countSeries, countInstances);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	784 ASSERT_GE(10u, diskSize);
713 9d1973813d8b test attachment recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	785 }
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 706 diff changeset	786
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 706 diff changeset	787 // Because the DB is in memory, the SQLite index must not have been created
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2121 diff changeset	788 ASSERT_FALSE(SystemToolbox::IsRegularFile(path + "/index"));
1453 c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	789
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	790 context.Stop();
1672 4c5a85c3ff43 sample database plugin now working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1549 diff changeset	791 db.Close();
705 a9cff2c077d4 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	792 }
1764 9ead18ef460a escape Sebastien Jodogne <s.jodogne@gmail.com> parents: 1747 diff changeset	793
9ead18ef460a escape Sebastien Jodogne <s.jodogne@gmail.com> parents: 1747 diff changeset	794
3036 8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	795 TEST(ServerIndex, NormalizeIdentifier)
1764 9ead18ef460a escape Sebastien Jodogne <s.jodogne@gmail.com> parents: 1747 diff changeset	796 {
2121 7e8889bc95c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	797 ASSERT_EQ("H^L.LO", ServerToolbox::NormalizeIdentifier(" Hé^l.LO %_ "));
7e8889bc95c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	798 ASSERT_EQ("1.2.840.113619.2.176.2025", ServerToolbox::NormalizeIdentifier(" 1.2.840.113619.2.176.2025 "));
1764 9ead18ef460a escape Sebastien Jodogne <s.jodogne@gmail.com> parents: 1747 diff changeset	799 }
2826 c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	800
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	801
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	802 TEST(ServerIndex, Overwrite)
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	803 {
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	804 // Create a dummy 1x1 image
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	805 Image image(PixelFormat_Grayscale8, 1, 1, false);
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	806 reinterpret_cast<uint8_t*>(image.GetBuffer()) [0] = 128;
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	807
2826 c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	808 for (unsigned int i = 0; i < 2; i++)
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	809 {
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	810 bool overwrite = (i == 0);
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	811
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	812 MemoryStorageArea storage;
3017 517fc4767ae0 renamed class DatabaseWrapper as SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	813 SQLiteDatabaseWrapper db; // The SQLite DB is in memory
2826 c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	814 db.Open();
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2924 diff changeset	815 ServerContext context(db, storage, true /* running unit tests */, 10);
2826 c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	816 context.SetupJobsEngine(true, false);
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	817 context.SetCompressionEnabled(true);
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	818
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	819 DicomMap instance;
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	820 instance.SetValue(DICOM_TAG_PATIENT_ID, "patient", false);
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	821 instance.SetValue(DICOM_TAG_PATIENT_NAME, "name", false);
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	822 instance.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "study", false);
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	823 instance.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, "series", false);
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	824 instance.SetValue(DICOM_TAG_SOP_INSTANCE_UID, "sop", false);
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	825 instance.SetValue(DICOM_TAG_SOP_CLASS_UID, "1.2.840.10008.5.1.4.1.1.1", false); // CR image
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	826
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	827 DicomInstanceHasher hasher(instance);
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	828 std::string id = hasher.HashInstance();
3813 aaaa442bfe39 moving SetOverwriteInstances from ServerIndex to ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	829 context.SetOverwriteInstances(overwrite);
2826 c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	830
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	831 uint64_t diskSize, uncompressedSize, countPatients, countStudies, countSeries, countInstances;
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	832 context.GetIndex().GetGlobalStatistics(diskSize, uncompressedSize, countPatients,
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	833 countStudies, countSeries, countInstances);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	834
3179 fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	835 ASSERT_EQ(0u, countInstances);
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	836 ASSERT_EQ(0u, diskSize);
2826 c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	837
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	838 {
4505 97d103b57cd1 removed cached dicom summary from DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 4499 diff changeset	839 ParsedDicomFile dicom(instance, GetDefaultDicomEncoding(), false /* be strict */);
97d103b57cd1 removed cached dicom summary from DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 4499 diff changeset	840
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	841 // Add a pixel data so as to have one "FileContentType_DicomUntilPixelData"
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	842 // (because of "context.SetCompressionEnabled(true)")
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	843 dicom.EmbedImage(image);
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	844
4505 97d103b57cd1 removed cached dicom summary from DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 4499 diff changeset	845 DicomInstanceHasher hasher(instance);
97d103b57cd1 removed cached dicom summary from DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 4499 diff changeset	846
4508 8f9090b137f1 Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	847 std::unique_ptr<DicomInstanceToStore> toStore(DicomInstanceToStore::CreateFromParsedDicomFile(dicom));
8f9090b137f1 Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	848 toStore->SetOrigin(DicomInstanceOrigin::FromPlugins());
4505 97d103b57cd1 removed cached dicom summary from DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 4499 diff changeset	849 ASSERT_EQ(id, hasher.HashInstance());
2826 c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	850
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	851 std::string id2;
4796 94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4640 diff changeset	852 ServerContext::StoreResult result = context.Store(id2, *toStore, StoreInstanceMode_Default);
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4640 diff changeset	853 ASSERT_EQ(StoreStatus_Success, result.GetStatus());
2826 c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	854 ASSERT_EQ(id, id2);
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	855 }
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	856
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	857 {
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	858 FileInfo nope;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	859 int64_t revision;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	860 ASSERT_FALSE(context.GetIndex().LookupAttachment(nope, revision, id, FileContentType_DicomAsJson));
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	861 }
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	862
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	863 FileInfo dicom1, pixelData1;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	864 int64_t revision;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	865 ASSERT_TRUE(context.GetIndex().LookupAttachment(dicom1, revision, id, FileContentType_Dicom));
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	866 ASSERT_EQ(0, revision);
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	867 revision = -1;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	868 ASSERT_TRUE(context.GetIndex().LookupAttachment(pixelData1, revision, id, FileContentType_DicomUntilPixelData));
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	869 ASSERT_EQ(0, revision);
2826 c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	870
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	871 context.GetIndex().GetGlobalStatistics(diskSize, uncompressedSize, countPatients,
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	872 countStudies, countSeries, countInstances);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	873 ASSERT_EQ(1u, countInstances);
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	874 ASSERT_EQ(dicom1.GetCompressedSize() + pixelData1.GetCompressedSize(), diskSize);
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	875 ASSERT_EQ(dicom1.GetUncompressedSize() + pixelData1.GetUncompressedSize(), uncompressedSize);
2826 c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	876
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	877 Json::Value tmp;
2826 c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	878 context.ReadDicomAsJson(tmp, id);
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	879 ASSERT_EQ("name", tmp["0010,0010"]["Value"].asString());
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	880
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	881 {
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	882 ServerContext::DicomCacheLocker locker(context, id);
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	883 std::string tmp;
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	884 locker.GetDicom().GetTagValue(tmp, DICOM_TAG_PATIENT_NAME);
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	885 ASSERT_EQ("name", tmp);
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	886 }
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	887
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	888 {
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	889 DicomMap instance2;
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	890 instance2.Assign(instance);
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	891 instance2.SetValue(DICOM_TAG_PATIENT_NAME, "overwritten", false);
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	892
4505 97d103b57cd1 removed cached dicom summary from DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 4499 diff changeset	893 ParsedDicomFile dicom(instance2, GetDefaultDicomEncoding(), false /* be strict */);
97d103b57cd1 removed cached dicom summary from DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 4499 diff changeset	894
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	895 // Add a pixel data so as to have one "FileContentType_DicomUntilPixelData"
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	896 dicom.EmbedImage(image);
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	897
4508 8f9090b137f1 Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	898 std::unique_ptr<DicomInstanceToStore> toStore(DicomInstanceToStore::CreateFromParsedDicomFile(dicom));
8f9090b137f1 Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	899 toStore->SetOrigin(DicomInstanceOrigin::FromPlugins());
2826 c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	900
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	901 std::string id2;
4796 94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4640 diff changeset	902 ServerContext::StoreResult result = context.Store(id2, *toStore, StoreInstanceMode_Default);
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4640 diff changeset	903 ASSERT_EQ(overwrite ? StoreStatus_Success : StoreStatus_AlreadyStored, result.GetStatus());
2826 c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	904 ASSERT_EQ(id, id2);
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	905 }
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	906
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	907 {
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	908 FileInfo nope;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	909 int64_t revision;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	910 ASSERT_FALSE(context.GetIndex().LookupAttachment(nope, revision, id, FileContentType_DicomAsJson));
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	911 }
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	912
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	913 FileInfo dicom2, pixelData2;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	914 ASSERT_TRUE(context.GetIndex().LookupAttachment(dicom2, revision, id, FileContentType_Dicom));
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	915 ASSERT_EQ(0, revision);
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	916 revision = -1;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	917 ASSERT_TRUE(context.GetIndex().LookupAttachment(pixelData2, revision, id, FileContentType_DicomUntilPixelData));
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	918 ASSERT_EQ(0, revision);
2826 c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	919
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	920 context.GetIndex().GetGlobalStatistics(diskSize, uncompressedSize, countPatients,
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	921 countStudies, countSeries, countInstances);
3179 fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	922 ASSERT_EQ(1u, countInstances);
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	923 ASSERT_EQ(dicom2.GetCompressedSize() + pixelData2.GetCompressedSize(), diskSize);
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	924 ASSERT_EQ(dicom2.GetUncompressedSize() + pixelData2.GetUncompressedSize(), uncompressedSize);
2826 c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	925
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	926 if (overwrite)
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	927 {
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	928 ASSERT_NE(dicom1.GetUuid(), dicom2.GetUuid());
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	929 ASSERT_NE(pixelData1.GetUuid(), pixelData2.GetUuid());
2826 c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	930 ASSERT_NE(dicom1.GetUncompressedSize(), dicom2.GetUncompressedSize());
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	931 ASSERT_NE(pixelData1.GetUncompressedSize(), pixelData2.GetUncompressedSize());
2826 c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	932
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	933 context.ReadDicomAsJson(tmp, id);
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	934 ASSERT_EQ("overwritten", tmp["0010,0010"]["Value"].asString());
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	935
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	936 {
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	937 ServerContext::DicomCacheLocker locker(context, id);
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	938 std::string tmp;
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	939 locker.GetDicom().GetTagValue(tmp, DICOM_TAG_PATIENT_NAME);
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	940 ASSERT_EQ("overwritten", tmp);
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	941 }
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	942 }
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	943 else
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	944 {
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	945 ASSERT_EQ(dicom1.GetUuid(), dicom2.GetUuid());
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	946 ASSERT_EQ(pixelData1.GetUuid(), pixelData2.GetUuid());
2826 c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	947 ASSERT_EQ(dicom1.GetUncompressedSize(), dicom2.GetUncompressedSize());
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	948 ASSERT_EQ(pixelData1.GetUncompressedSize(), pixelData2.GetUncompressedSize());
2826 c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	949
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	950 context.ReadDicomAsJson(tmp, id);
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	951 ASSERT_EQ("name", tmp["0010,0010"]["Value"].asString());
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	952
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	953 {
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	954 ServerContext::DicomCacheLocker locker(context, id);
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	955 std::string tmp;
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	956 locker.GetDicom().GetTagValue(tmp, DICOM_TAG_PATIENT_NAME);
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	957 ASSERT_EQ("name", tmp);
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	958 }
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	959 }
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	960
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	961 context.Stop();
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	962 db.Close();
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	963 }
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	964 }
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	965
c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	966
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	967 TEST(ServerIndex, DicomUntilPixelData)
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	968 {
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	969 // Create a dummy 1x1 image
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	970 Image image(PixelFormat_Grayscale8, 1, 1, false);
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	971 reinterpret_cast<uint8_t*>(image.GetBuffer()) [0] = 128;
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	972
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	973 for (unsigned int i = 0; i < 2; i++)
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	974 {
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	975 const bool compression = (i == 0);
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	976
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	977 MemoryStorageArea storage;
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	978 SQLiteDatabaseWrapper db; // The SQLite DB is in memory
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	979 db.Open();
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	980 ServerContext context(db, storage, true /* running unit tests */, 10);
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	981 context.SetupJobsEngine(true, false);
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	982 context.SetCompressionEnabled(compression);
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	983
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	984 for (unsigned int j = 0; j < 2; j++)
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	985 {
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	986 const bool withPixelData = (j == 0);
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	987
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	988 ParsedDicomFile dicom(true);
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	989
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	990 if (withPixelData)
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	991 {
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	992 dicom.EmbedImage(image);
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	993 }
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	994
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	995 std::string id;
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	996 size_t dicomSize;
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	997
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	998 {
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	999 std::unique_ptr<DicomInstanceToStore> toStore(DicomInstanceToStore::CreateFromParsedDicomFile(dicom));
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1000 dicomSize = toStore->GetBufferSize();
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1001 toStore->SetOrigin(DicomInstanceOrigin::FromPlugins());
4796 94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4640 diff changeset	1002 ServerContext::StoreResult result = context.Store(id, *toStore, StoreInstanceMode_Default);
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4640 diff changeset	1003 ASSERT_EQ(StoreStatus_Success, result.GetStatus());
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1004 }
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1005
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1006 std::set<FileContentType> attachments;
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1007 context.GetIndex().ListAvailableAttachments(attachments, id, ResourceType_Instance);
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1008
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1009 ASSERT_TRUE(attachments.find(FileContentType_Dicom) != attachments.end());
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1010
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1011 if (compression &&
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1012 withPixelData)
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1013 {
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1014 ASSERT_EQ(2u, attachments.size());
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1015 ASSERT_TRUE(attachments.find(FileContentType_DicomUntilPixelData) != attachments.end());
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1016 }
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1017 else
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1018 {
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1019 ASSERT_EQ(1u, attachments.size());
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1020 }
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1021
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1022 std::string s;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	1023 int64_t revision;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	1024 bool found = context.GetIndex().LookupMetadata(s, revision, id, ResourceType_Instance,
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1025 MetadataType_Instance_PixelDataOffset);
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1026
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1027 if (withPixelData)
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1028 {
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1029 ASSERT_TRUE(found);
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	1030 ASSERT_EQ(0, revision);
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1031 ASSERT_GT(boost::lexical_cast<int>(s), 128 /* length of the DICOM preamble */);
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1032 ASSERT_LT(boost::lexical_cast<size_t>(s), dicomSize);
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1033 }
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1034 else
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1035 {
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1036 ASSERT_FALSE(found);
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1037 }
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1038 }
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1039 }
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	1040 }

Mercurial > hg > orthanc

annotate OrthancServer/UnitTestsSources/ServerIndexTests.cpp @ 5044:6fed78e13233