orthanc: OrthancServer/UnitTestsSources/ServerIndexTests.cpp annotate

annotate OrthancServer/UnitTestsSources/ServerIndexTests.cpp @ 4508:8f9090b137f1

Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 11 Feb 2021 11:00:05 +0100
parents	b4c58795f3a8
children	5b929e6b3c36

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

Mercurial > hg > orthanc

annotate OrthancServer/UnitTestsSources/ServerIndexTests.cpp @ 4508:8f9090b137f1