annotate UnitTestsSources/ServerIndexTests.cpp @ 3644:e168a2dedb00 storage-commitment

integration mainline->storage-commitment
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 04 Feb 2020 08:22:22 +0100
parents 94f4a18a79cc
children 2a170a8f1faf
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
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
3640
94f4a18a79cc upgrade to year 2020
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3187
diff changeset
5 * Copyright (C) 2017-2020 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"
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35 #include "gtest/gtest.h"
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36
1486
f967bdf8534e refactoring to Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1453
diff changeset
37 #include "../Core/FileStorage/FilesystemStorage.h"
2826
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
38 #include "../Core/FileStorage/MemoryStorageArea.h"
1486
f967bdf8534e refactoring to Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1453
diff changeset
39 #include "../Core/Logging.h"
3093
2e1808b6146a reorganization of folders
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3081
diff changeset
40 #include "../OrthancServer/Database/SQLiteDatabaseWrapper.h"
3094
61da3c9b4121 cont reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3093
diff changeset
41 #include "../OrthancServer/Search/DatabaseLookup.h"
705
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
42 #include "../OrthancServer/ServerContext.h"
3001
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2950
diff changeset
43 #include "../OrthancServer/ServerToolbox.h"
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
44
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 #include <ctype.h>
521
2c739f76d0bb lookup tag values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 438
diff changeset
46 #include <algorithm>
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
48 using namespace Orthanc;
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
50 namespace
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
51 {
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1294
diff changeset
52 class TestDatabaseListener : public IDatabaseListener
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53 {
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54 public:
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
55 std::vector<std::string> deletedFiles_;
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
56 std::vector<std::string> deletedResources_;
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
57 std::string ancestorId_;
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
58 ResourceType ancestorType_;
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
59
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
60 void Reset()
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 {
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
62 ancestorId_ = "";
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
63 deletedFiles_.clear();
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
64 }
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
65
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
66 virtual void SignalRemainingAncestor(ResourceType type,
2924
22524fd06225 macros ORTHANC_OVERRIDE and ORTHANC_FINAL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2898
diff changeset
67 const std::string& publicId)
22524fd06225 macros ORTHANC_OVERRIDE and ORTHANC_FINAL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2898
diff changeset
68 ORTHANC_OVERRIDE
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
69 {
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
70 ancestorId_ = publicId;
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
71 ancestorType_ = type;
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 }
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73
2924
22524fd06225 macros ORTHANC_OVERRIDE and ORTHANC_FINAL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2898
diff changeset
74 virtual void SignalFileDeleted(const FileInfo& info) ORTHANC_OVERRIDE
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 {
273
d384af918264 more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
76 const std::string fileUuid = info.GetUuid();
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
77 deletedFiles_.push_back(fileUuid);
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 LOG(INFO) << "A file must be removed: " << fileUuid;
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
79 }
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
80
2924
22524fd06225 macros ORTHANC_OVERRIDE and ORTHANC_FINAL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2898
diff changeset
81 virtual void SignalChange(const ServerIndexChange& change) ORTHANC_OVERRIDE
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
82 {
1198
1169528a9a5f refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1177
diff changeset
83 if (change.GetChangeType() == ChangeType_Deleted)
1177
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
84 {
1198
1169528a9a5f refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1177
diff changeset
85 deletedResources_.push_back(change.GetPublicId());
1177
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
86 }
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 LOG(INFO) << "Change related to resource " << change.GetPublicId() << " of type "
1169528a9a5f refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1177
diff changeset
89 << EnumerationToString(change.GetResourceType()) << ": "
1169528a9a5f refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1177
diff changeset
90 << EnumerationToString(change.GetChangeType());
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
91 }
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92 };
737
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
93
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
94
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
95 class DatabaseWrapperTest : public ::testing::Test
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 protected:
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
98 std::auto_ptr<TestDatabaseListener> listener_;
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
99 std::auto_ptr<SQLiteDatabaseWrapper> index_;
737
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
100
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
101 public:
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
102 DatabaseWrapperTest()
737
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
103 {
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
104 }
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
105
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
106 virtual void SetUp() ORTHANC_OVERRIDE
737
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
107 {
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1294
diff changeset
108 listener_.reset(new TestDatabaseListener);
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
109 index_.reset(new SQLiteDatabaseWrapper);
1247
32fcc5dc7562 abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1241
diff changeset
110 index_->SetListener(*listener_);
1672
4c5a85c3ff43 sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1549
diff changeset
111 index_->Open();
737
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
112 }
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
113
2924
22524fd06225 macros ORTHANC_OVERRIDE and ORTHANC_FINAL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2898
diff changeset
114 virtual void TearDown() ORTHANC_OVERRIDE
737
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
115 {
1672
4c5a85c3ff43 sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1549
diff changeset
116 index_->Close();
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
117 index_.reset(NULL);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
118 listener_.reset(NULL);
737
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
119 }
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
120
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
121 void CheckTableRecordCount(uint32_t expected, const char* table)
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
122 {
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
123 ASSERT_EQ(expected, index_->GetTableRecordCount(table));
1287
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
124 }
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
125
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
126 void CheckNoParent(int64_t id)
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 std::string s;
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
129 ASSERT_FALSE(index_->GetParentPublicId(s, id));
1287
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
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
132 void CheckParentPublicId(const char* expected, int64_t id)
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
133 {
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
134 std::string s;
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
135 ASSERT_TRUE(index_->GetParentPublicId(s, id));
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
136 ASSERT_EQ(expected, s);
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
137 }
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
138
1287
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
139 void CheckNoChild(int64_t id)
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
140 {
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
141 std::list<std::string> j;
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
142 index_->GetChildren(j, id);
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
143 ASSERT_EQ(0u, j.size());
1287
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
144 }
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
145
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
146 void CheckOneChild(const char* expected, int64_t id)
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 std::list<std::string> j;
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
149 index_->GetChildren(j, id);
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
150 ASSERT_EQ(1u, j.size());
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
151 ASSERT_EQ(expected, j.front());
1287
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
152 }
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
153
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
154 void CheckTwoChildren(const char* expected1,
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
155 const char* expected2,
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
156 int64_t id)
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
157 {
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
158 std::list<std::string> j;
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
159 index_->GetChildren(j, id);
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
160 ASSERT_EQ(2u, j.size());
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
161 ASSERT_TRUE((expected1 == j.front() && expected2 == j.back()) ||
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
162 (expected1 == j.back() && expected2 == j.front()));
1287
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
163 }
1746
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
164
3075
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3073
diff changeset
165 void DoLookupIdentifier(std::list<std::string>& result,
3036
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
166 ResourceType level,
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
167 const DicomTag& tag,
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
168 ConstraintType type,
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
169 const std::string& value)
1746
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
170 {
3036
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
171 assert(ServerToolbox::IsIdentifier(tag, level));
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
172
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
173 DicomTagConstraint c(tag, type, value, true, true);
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
174
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
175 std::vector<DatabaseConstraint> lookup;
3073
0e9d1731b1b0 refactoring to reuse DatabaseConstraint in separate projects
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3061
diff changeset
176 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
177
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
178 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
179 }
1746
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
180
3075
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3073
diff changeset
181 void DoLookupIdentifier2(std::list<std::string>& result,
3036
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
182 ResourceType level,
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
183 const DicomTag& tag,
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
184 ConstraintType type1,
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
185 const std::string& value1,
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
186 ConstraintType type2,
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
187 const std::string& value2)
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
188 {
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
189 assert(ServerToolbox::IsIdentifier(tag, level));
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
190
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
191 DicomTagConstraint c1(tag, type1, value1, true, true);
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
192 DicomTagConstraint c2(tag, type2, value2, true, true);
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 std::vector<DatabaseConstraint> lookup;
3073
0e9d1731b1b0 refactoring to reuse DatabaseConstraint in separate projects
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3061
diff changeset
195 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
196 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
197
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
198 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
199 }
737
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
200 };
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
201 }
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
202
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
203
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
204 TEST_F(DatabaseWrapperTest, Simple)
181
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 int64_t a[] = {
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
207 index_->CreateResource("a", ResourceType_Patient), // 0
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
208 index_->CreateResource("b", ResourceType_Study), // 1
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
209 index_->CreateResource("c", ResourceType_Series), // 2
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
210 index_->CreateResource("d", ResourceType_Instance), // 3
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
211 index_->CreateResource("e", ResourceType_Instance), // 4
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
212 index_->CreateResource("f", ResourceType_Instance), // 5
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
213 index_->CreateResource("g", ResourceType_Study) // 6
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
214 };
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
215
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
216 ASSERT_EQ("a", index_->GetPublicId(a[0]));
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
217 ASSERT_EQ("b", index_->GetPublicId(a[1]));
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
218 ASSERT_EQ("c", index_->GetPublicId(a[2]));
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
219 ASSERT_EQ("d", index_->GetPublicId(a[3]));
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
220 ASSERT_EQ("e", index_->GetPublicId(a[4]));
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
221 ASSERT_EQ("f", index_->GetPublicId(a[5]));
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
222 ASSERT_EQ("g", index_->GetPublicId(a[6]));
198
663cc6c46d0a before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 197
diff changeset
223
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
224 ASSERT_EQ(ResourceType_Patient, index_->GetResourceType(a[0]));
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
225 ASSERT_EQ(ResourceType_Study, index_->GetResourceType(a[1]));
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
226 ASSERT_EQ(ResourceType_Series, index_->GetResourceType(a[2]));
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
227 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[3]));
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
228 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[4]));
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
229 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[5]));
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
230 ASSERT_EQ(ResourceType_Study, index_->GetResourceType(a[6]));
304
4eea080e6e7a refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
231
190
b6cef9d45cc3 getallpublicids
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
232 {
1241
90d2f320862d refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1239
diff changeset
233 std::list<std::string> t;
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
234 index_->GetAllPublicIds(t, ResourceType_Patient);
190
b6cef9d45cc3 getallpublicids
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
235
232
5368bbe813cf refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
236 ASSERT_EQ(1u, t.size());
1241
90d2f320862d refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1239
diff changeset
237 ASSERT_EQ("a", t.front());
190
b6cef9d45cc3 getallpublicids
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
238
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
239 index_->GetAllPublicIds(t, ResourceType_Series);
232
5368bbe813cf refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
240 ASSERT_EQ(1u, t.size());
1241
90d2f320862d refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1239
diff changeset
241 ASSERT_EQ("c", t.front());
190
b6cef9d45cc3 getallpublicids
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
242
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
243 index_->GetAllPublicIds(t, ResourceType_Study);
232
5368bbe813cf refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
244 ASSERT_EQ(2u, t.size());
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_Instance);
232
5368bbe813cf refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
247 ASSERT_EQ(3u, t.size());
190
b6cef9d45cc3 getallpublicids
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
248 }
b6cef9d45cc3 getallpublicids
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
249
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
250 index_->SetGlobalProperty(GlobalProperty_FlushSleep, "World");
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
251
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
252 index_->AttachChild(a[0], a[1]);
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
253 index_->AttachChild(a[1], a[2]);
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
254 index_->AttachChild(a[2], a[3]);
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
255 index_->AttachChild(a[2], a[4]);
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
256 index_->AttachChild(a[6], a[5]);
182
93ff5babcaf8 children public id
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
257
198
663cc6c46d0a before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 197
diff changeset
258 int64_t parent;
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
259 ASSERT_FALSE(index_->LookupParent(parent, a[0]));
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
260 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
261 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
262 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
263 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
264 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
265 ASSERT_FALSE(index_->LookupParent(parent, a[6]));
198
663cc6c46d0a before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 197
diff changeset
266
182
93ff5babcaf8 children public id
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
267 std::string s;
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
268
1287
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
269 CheckNoParent(a[0]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
270 CheckNoParent(a[6]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
271 CheckParentPublicId("a", a[1]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
272 CheckParentPublicId("b", a[2]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
273 CheckParentPublicId("c", a[3]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
274 CheckParentPublicId("c", a[4]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
275 CheckParentPublicId("g", a[5]);
182
93ff5babcaf8 children public id
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
276
185
5185ae1d9af5 fix for msvc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
277 std::list<std::string> l;
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
278 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
279 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
280 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
281 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
282 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
283 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
284
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
285 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
286 if (l.front() == "d")
93ff5babcaf8 children public id
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
287 {
93ff5babcaf8 children public id
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
288 ASSERT_EQ("e", l.back());
93ff5babcaf8 children public id
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
289 }
93ff5babcaf8 children public id
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
290 else
93ff5babcaf8 children public id
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
291 {
93ff5babcaf8 children public id
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
292 ASSERT_EQ("d", l.back());
93ff5babcaf8 children public id
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
293 ASSERT_EQ("e", l.front());
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
3187
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3179
diff changeset
296 std::map<MetadataType, std::string> md;
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3179
diff changeset
297 index_->GetAllMetadata(md, a[4]);
436
d51186bf7602 read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 310
diff changeset
298 ASSERT_EQ(0u, md.size());
d51186bf7602 read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 310
diff changeset
299
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
300 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
301 CompressionType_ZlibWithSize, 21, "compressedMD5"));
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
302 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
303 index_->AddAttachment(a[6], FileInfo("world", FileContentType_Dicom, 44, "md5"));
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
304 index_->SetMetadata(a[4], MetadataType_Instance_RemoteAet, "PINNACLE");
436
d51186bf7602 read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 310
diff changeset
305
3187
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3179
diff changeset
306 index_->GetAllMetadata(md, a[4]);
436
d51186bf7602 read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 310
diff changeset
307 ASSERT_EQ(1u, md.size());
3187
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3179
diff changeset
308 ASSERT_EQ("PINNACLE", md[MetadataType_Instance_RemoteAet]);
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
309 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
310 index_->GetAllMetadata(md, a[4]);
438
7bbe77cb9e12 DELETE metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 436
diff changeset
311 ASSERT_EQ(2u, md.size());
1030
66fa947c7280 more tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1029
diff changeset
312
66fa947c7280 more tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1029
diff changeset
313 std::map<MetadataType, std::string> md2;
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
314 index_->GetAllMetadata(md2, a[4]);
1030
66fa947c7280 more tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1029
diff changeset
315 ASSERT_EQ(2u, md2.size());
66fa947c7280 more tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1029
diff changeset
316 ASSERT_EQ("TUTU", md2[MetadataType_ModifiedFrom]);
66fa947c7280 more tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1029
diff changeset
317 ASSERT_EQ("PINNACLE", md2[MetadataType_Instance_RemoteAet]);
66fa947c7280 more tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1029
diff changeset
318
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
319 index_->DeleteMetadata(a[4], MetadataType_ModifiedFrom);
3187
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3179
diff changeset
320 index_->GetAllMetadata(md, a[4]);
438
7bbe77cb9e12 DELETE metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 436
diff changeset
321 ASSERT_EQ(1u, md.size());
3187
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3179
diff changeset
322 ASSERT_EQ("PINNACLE", md[MetadataType_Instance_RemoteAet]);
182
93ff5babcaf8 children public id
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
323
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
324 index_->GetAllMetadata(md2, a[4]);
1030
66fa947c7280 more tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1029
diff changeset
325 ASSERT_EQ(1u, md2.size());
66fa947c7280 more tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1029
diff changeset
326 ASSERT_EQ("PINNACLE", md2[MetadataType_Instance_RemoteAet]);
66fa947c7280 more tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1029
diff changeset
327
66fa947c7280 more tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1029
diff changeset
328
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
329 ASSERT_EQ(21u + 42u + 44u, index_->GetTotalCompressedSize());
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
330 ASSERT_EQ(42u + 42u + 44u, index_->GetTotalUncompressedSize());
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
331
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
332 index_->SetMainDicomTag(a[3], DicomTag(0x0010, 0x0010), "PatientName");
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
333
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
334 int64_t b;
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
335 ResourceType t;
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
336 ASSERT_TRUE(index_->LookupResource(b, t, "g"));
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
337 ASSERT_EQ(7, b);
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
338 ASSERT_EQ(ResourceType_Study, t);
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
339
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
340 ASSERT_TRUE(index_->LookupMetadata(s, a[4], MetadataType_Instance_RemoteAet));
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
341 ASSERT_FALSE(index_->LookupMetadata(s, a[4], MetadataType_Instance_IndexInSeries));
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
342 ASSERT_EQ("PINNACLE", s);
1238
6c07108ff1e2 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1237
diff changeset
343
6c07108ff1e2 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1237
diff changeset
344 std::string u;
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
345 ASSERT_TRUE(index_->LookupMetadata(u, a[4], MetadataType_Instance_RemoteAet));
1238
6c07108ff1e2 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1237
diff changeset
346 ASSERT_EQ("PINNACLE", u);
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
347 ASSERT_FALSE(index_->LookupMetadata(u, a[4], MetadataType_Instance_IndexInSeries));
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
348
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
349 ASSERT_TRUE(index_->LookupGlobalProperty(s, GlobalProperty_FlushSleep));
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
350 ASSERT_FALSE(index_->LookupGlobalProperty(s, static_cast<GlobalProperty>(42)));
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
351 ASSERT_EQ("World", s);
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
352
232
5368bbe813cf refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
353 FileInfo att;
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
354 ASSERT_TRUE(index_->LookupAttachment(att, a[4], FileContentType_DicomAsJson));
232
5368bbe813cf refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
355 ASSERT_EQ("my json file", att.GetUuid());
5368bbe813cf refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
356 ASSERT_EQ(21u, att.GetCompressedSize());
693
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 632
diff changeset
357 ASSERT_EQ("md5", att.GetUncompressedMD5());
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 632
diff changeset
358 ASSERT_EQ("compressedMD5", att.GetCompressedMD5());
232
5368bbe813cf refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
359 ASSERT_EQ(42u, att.GetUncompressedSize());
1514
d73a2178b319 support of deflate and gzip content-types
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1492
diff changeset
360 ASSERT_EQ(CompressionType_ZlibWithSize, att.GetCompressionType());
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
361
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
362 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
363 ASSERT_EQ("world", att.GetUuid());
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 632
diff changeset
364 ASSERT_EQ(44u, att.GetCompressedSize());
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 632
diff changeset
365 ASSERT_EQ("md5", att.GetUncompressedMD5());
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 632
diff changeset
366 ASSERT_EQ("md5", att.GetCompressedMD5());
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 632
diff changeset
367 ASSERT_EQ(44u, att.GetUncompressedSize());
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 632
diff changeset
368 ASSERT_EQ(CompressionType_None, att.GetCompressionType());
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 632
diff changeset
369
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
370 ASSERT_EQ(0u, listener_->deletedFiles_.size());
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
371 ASSERT_EQ(0u, listener_->deletedResources_.size());
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
372
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
373 CheckTableRecordCount(7, "Resources");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
374 CheckTableRecordCount(3, "AttachedFiles");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
375 CheckTableRecordCount(1, "Metadata");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
376 CheckTableRecordCount(1, "MainDicomTags");
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
377
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
378 index_->DeleteResource(a[0]);
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
379 ASSERT_EQ(5u, listener_->deletedResources_.size());
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
380 ASSERT_EQ(2u, listener_->deletedFiles_.size());
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
381 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(),
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
382 listener_->deletedFiles_.end(),
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
383 "my json file") == listener_->deletedFiles_.end());
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 dicom file") == listener_->deletedFiles_.end());
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
387
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
388 CheckTableRecordCount(2, "Resources");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
389 CheckTableRecordCount(0, "Metadata");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
390 CheckTableRecordCount(1, "AttachedFiles");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
391 CheckTableRecordCount(0, "MainDicomTags");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
392
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
393 index_->DeleteResource(a[5]);
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
394 ASSERT_EQ(7u, listener_->deletedResources_.size());
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
395
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
396 CheckTableRecordCount(0, "Resources");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
397 CheckTableRecordCount(0, "AttachedFiles");
3121
f86ebf971a72 fix unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3116
diff changeset
398 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
399
e3b5c07146a3 speeding up the computation of the size of the attachments in SQLite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3017
diff changeset
400 std::string tmp;
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
401 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
402 ASSERT_EQ("6", tmp);
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
403 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
404 ASSERT_EQ("World", tmp);
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
405 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
406 ASSERT_EQ("1", tmp);
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
407
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
408 ASSERT_EQ(3u, listener_->deletedFiles_.size());
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
409 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(),
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
410 listener_->deletedFiles_.end(),
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
411 "world") == listener_->deletedFiles_.end());
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
412 }
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
413
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
414
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
415 TEST_F(DatabaseWrapperTest, Upward)
183
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 int64_t a[] = {
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
418 index_->CreateResource("a", ResourceType_Patient), // 0
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
419 index_->CreateResource("b", ResourceType_Study), // 1
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
420 index_->CreateResource("c", ResourceType_Series), // 2
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
421 index_->CreateResource("d", ResourceType_Instance), // 3
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
422 index_->CreateResource("e", ResourceType_Instance), // 4
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
423 index_->CreateResource("f", ResourceType_Study), // 5
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
424 index_->CreateResource("g", ResourceType_Series), // 6
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
425 index_->CreateResource("h", ResourceType_Series) // 7
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
426 };
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
427
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
428 index_->AttachChild(a[0], a[1]);
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
429 index_->AttachChild(a[1], a[2]);
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
430 index_->AttachChild(a[2], a[3]);
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
431 index_->AttachChild(a[2], a[4]);
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
432 index_->AttachChild(a[1], a[6]);
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
433 index_->AttachChild(a[0], a[5]);
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
434 index_->AttachChild(a[5], a[7]);
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
435
1287
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
436 CheckTwoChildren("b", "f", a[0]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
437 CheckTwoChildren("c", "g", a[1]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
438 CheckTwoChildren("d", "e", a[2]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
439 CheckNoChild(a[3]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
440 CheckNoChild(a[4]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
441 CheckOneChild("h", a[5]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
442 CheckNoChild(a[6]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
443 CheckNoChild(a[7]);
193
a1b9d1e1497b failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 190
diff changeset
444
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
445 listener_->Reset();
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
446 index_->DeleteResource(a[3]);
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
447 ASSERT_EQ("c", listener_->ancestorId_);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
448 ASSERT_EQ(ResourceType_Series, listener_->ancestorType_);
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
449
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
450 listener_->Reset();
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
451 index_->DeleteResource(a[4]);
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
452 ASSERT_EQ("b", listener_->ancestorId_);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
453 ASSERT_EQ(ResourceType_Study, listener_->ancestorType_);
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
454
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
455 listener_->Reset();
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
456 index_->DeleteResource(a[7]);
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
457 ASSERT_EQ("a", listener_->ancestorId_);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
458 ASSERT_EQ(ResourceType_Patient, listener_->ancestorType_);
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
459
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
460 listener_->Reset();
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
461 index_->DeleteResource(a[6]);
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
462 ASSERT_EQ("", listener_->ancestorId_); // No more ancestor
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
463 }
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
464
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
465
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
466 TEST_F(DatabaseWrapperTest, PatientRecycling)
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 std::vector<int64_t> patients;
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
469 for (int i = 0; i < 10; i++)
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::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
472 patients.push_back(index_->CreateResource(p, ResourceType_Patient));
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
473 index_->AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10,
1287
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
474 "md5-" + boost::lexical_cast<std::string>(i)));
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
475 ASSERT_FALSE(index_->IsProtectedPatient(patients[i]));
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
476 }
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
477
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
478 CheckTableRecordCount(10u, "Resources");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
479 CheckTableRecordCount(10u, "PatientRecyclingOrder");
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
480
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
481 listener_->Reset();
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
482 ASSERT_EQ(0u, listener_->deletedResources_.size());
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
483
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
484 index_->DeleteResource(patients[5]);
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
485 index_->DeleteResource(patients[0]);
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
486 ASSERT_EQ(2u, listener_->deletedResources_.size());
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
487
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
488 CheckTableRecordCount(8u, "Resources");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
489 CheckTableRecordCount(8u, "PatientRecyclingOrder");
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
490
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
491 ASSERT_EQ(2u, listener_->deletedFiles_.size());
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
492 ASSERT_EQ("Patient 5", listener_->deletedFiles_[0]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
493 ASSERT_EQ("Patient 0", listener_->deletedFiles_[1]);
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
494
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
495 int64_t p;
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
496 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
497 index_->DeleteResource(p);
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
498 ASSERT_EQ(3u, listener_->deletedResources_.size());
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[2]);
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(4u, 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[3]);
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(5u, 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[4]);
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(6u, 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[6]);
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
509 index_->DeleteResource(p);
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
510 index_->DeleteResource(patients[8]);
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
511 ASSERT_EQ(8u, listener_->deletedResources_.size());
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
512 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
513 index_->DeleteResource(p);
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
514 ASSERT_EQ(9u, 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[9]);
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
516 index_->DeleteResource(p);
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
517 ASSERT_FALSE(index_->SelectPatientToRecycle(p));
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
518 ASSERT_EQ(10u, listener_->deletedResources_.size());
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
519
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
520 ASSERT_EQ(10u, listener_->deletedFiles_.size());
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
521
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
522 CheckTableRecordCount(0, "Resources");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
523 CheckTableRecordCount(0, "PatientRecyclingOrder");
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
524 }
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
525
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
526
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
527 TEST_F(DatabaseWrapperTest, PatientProtection)
262
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 std::vector<int64_t> patients;
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
530 for (int i = 0; i < 5; i++)
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::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
533 patients.push_back(index_->CreateResource(p, ResourceType_Patient));
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
534 index_->AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10,
1287
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
535 "md5-" + boost::lexical_cast<std::string>(i)));
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
536 ASSERT_FALSE(index_->IsProtectedPatient(patients[i]));
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
537 }
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
538
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
539 CheckTableRecordCount(5, "Resources");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
540 CheckTableRecordCount(5, "PatientRecyclingOrder");
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
541
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
542 ASSERT_FALSE(index_->IsProtectedPatient(patients[2]));
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
543 index_->SetProtectedPatient(patients[2], true);
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
544 ASSERT_TRUE(index_->IsProtectedPatient(patients[2]));
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
545 CheckTableRecordCount(5, "Resources");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
546 CheckTableRecordCount(4, "PatientRecyclingOrder");
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
547
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
548 index_->SetProtectedPatient(patients[2], true);
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
549 ASSERT_TRUE(index_->IsProtectedPatient(patients[2]));
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
550 CheckTableRecordCount(4, "PatientRecyclingOrder");
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
551 index_->SetProtectedPatient(patients[2], false);
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
552 ASSERT_FALSE(index_->IsProtectedPatient(patients[2]));
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
553 CheckTableRecordCount(5, "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");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
557 CheckTableRecordCount(5, "Resources");
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
558 index_->SetProtectedPatient(patients[2], true);
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
559 ASSERT_TRUE(index_->IsProtectedPatient(patients[2]));
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
560 CheckTableRecordCount(4, "PatientRecyclingOrder");
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
561 index_->SetProtectedPatient(patients[2], false);
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
562 ASSERT_FALSE(index_->IsProtectedPatient(patients[2]));
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
563 CheckTableRecordCount(5, "PatientRecyclingOrder");
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
564 index_->SetProtectedPatient(patients[3], true);
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
565 ASSERT_TRUE(index_->IsProtectedPatient(patients[3]));
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
566 CheckTableRecordCount(4, "PatientRecyclingOrder");
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
567
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
568 CheckTableRecordCount(5, "Resources");
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
569 ASSERT_EQ(0u, listener_->deletedFiles_.size());
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
570
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
571 // 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
572 int64_t p;
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
573 ASSERT_EQ(0u, listener_->deletedResources_.size());
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
574 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
575 index_->DeleteResource(p);
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
576 ASSERT_EQ(1u, 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, patients[1])); ASSERT_EQ(p, patients[4]);
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
578 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
579 index_->DeleteResource(p);
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
580 ASSERT_EQ(2u, listener_->deletedResources_.size());
3081
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[4]);
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(3u, listener_->deletedResources_.size());
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
584 ASSERT_FALSE(index_->SelectPatientToRecycle(p, patients[2]));
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
585 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
586 index_->DeleteResource(p);
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
587 ASSERT_EQ(4u, listener_->deletedResources_.size());
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
588 // "patients[3]" is still protected
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
589 ASSERT_FALSE(index_->SelectPatientToRecycle(p));
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
590
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
591 ASSERT_EQ(4u, listener_->deletedFiles_.size());
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
592 CheckTableRecordCount(1, "Resources");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
593 CheckTableRecordCount(0, "PatientRecyclingOrder");
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
594
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
595 index_->SetProtectedPatient(patients[3], false);
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
596 CheckTableRecordCount(1, "PatientRecyclingOrder");
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
597 ASSERT_FALSE(index_->SelectPatientToRecycle(p, patients[3]));
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
598 ASSERT_TRUE(index_->SelectPatientToRecycle(p, patients[2]));
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
599 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
600 index_->DeleteResource(p);
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
601 ASSERT_EQ(5u, listener_->deletedResources_.size());
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
602
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
603 ASSERT_EQ(5u, listener_->deletedFiles_.size());
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
604 CheckTableRecordCount(0, "Resources");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
605 CheckTableRecordCount(0, "PatientRecyclingOrder");
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
606 }
310
6ab6cdeedf4e global sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
607
6ab6cdeedf4e global sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
608
1237
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
609 TEST(ServerIndex, Sequence)
310
6ab6cdeedf4e global sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
610 {
1237
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
611 const std::string path = "UnitTestsStorage";
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
612
2140
aa4b8895cd23 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2121
diff changeset
613 SystemToolbox::RemoveFile(path + "/index");
1237
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
614 FilesystemStorage storage(path);
3017
517fc4767ae0 renamed class DatabaseWrapper as SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3001
diff changeset
615 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
616 db.Open();
2950
dc18d5804746 support of JobsHistorySize set to zero
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2924
diff changeset
617 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
618 context.SetupJobsEngine(true, false);
925d8dc03a23 unserialization of jobs from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2671
diff changeset
619
1237
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
620 ServerIndex& index = context.GetIndex();
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
621
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
622 ASSERT_EQ(1u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence));
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
623 ASSERT_EQ(2u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence));
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
624 ASSERT_EQ(3u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence));
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
625 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
626
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
627 context.Stop();
1672
4c5a85c3ff43 sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1549
diff changeset
628 db.Close();
310
6ab6cdeedf4e global sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
629 }
521
2c739f76d0bb lookup tag values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 438
diff changeset
630
2c739f76d0bb lookup tag values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 438
diff changeset
631
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
632 TEST_F(DatabaseWrapperTest, LookupIdentifier)
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 int64_t a[] = {
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
635 index_->CreateResource("a", ResourceType_Study), // 0
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
636 index_->CreateResource("b", ResourceType_Study), // 1
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
637 index_->CreateResource("c", ResourceType_Study), // 2
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
638 index_->CreateResource("d", ResourceType_Series) // 3
521
2c739f76d0bb lookup tag values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 438
diff changeset
639 };
2c739f76d0bb lookup tag values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 438
diff changeset
640
3081
2e5970ddcfeb simplification of unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
641 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
642 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
643 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
644 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
645
3075
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3073
diff changeset
646 std::list<std::string> s;
521
2c739f76d0bb lookup tag values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 438
diff changeset
647
3036
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
648 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
649 ASSERT_EQ(2u, s.size());
1746
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
650 ASSERT_TRUE(std::find(s.begin(), s.end(), "a") != s.end());
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
651 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
652
3036
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
653 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
654 ASSERT_EQ(1u, s.size());
1746
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
655 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
656
3036
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
657 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
658 ASSERT_EQ(1u, s.size());
1746
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
659 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
660
3036
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
661 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
662 ASSERT_EQ(1u, s.size());
1746
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
663 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
664
3036
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
665 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
666 ASSERT_EQ(0u, s.size());
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
667
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
668 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
669 ASSERT_EQ(3u, 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, "1");
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
672 ASSERT_EQ(1u, 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, "2");
1718
2b812969e136 getting rid of an IDatabaseWrapper::LookupIdentifier flavor
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1713
diff changeset
675 ASSERT_EQ(0u, s.size());
521
2c739f76d0bb lookup tag values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 438
diff changeset
676
3036
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
677 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
678 ConstraintType_GreaterOrEqual, "0", ConstraintType_SmallerOrEqual, "0");
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
679 ASSERT_EQ(2u, s.size());
1746
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
680
3036
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
681 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
682 ConstraintType_GreaterOrEqual, "1", ConstraintType_SmallerOrEqual, "1");
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
683 ASSERT_EQ(1u, s.size());
1746
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
684
3036
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
685 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
686 ConstraintType_GreaterOrEqual, "0", ConstraintType_SmallerOrEqual, "1");
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
687 ASSERT_EQ(3u, s.size());
562
f64e3838d6e1 refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 521
diff changeset
688 }
705
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
689
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
690
713
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
691 TEST(ServerIndex, AttachmentRecycling)
705
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
692 {
803
4689e400e0fa directory to store the results of the unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 738
diff changeset
693 const std::string path = "UnitTestsStorage";
1124
790ff7a5b3bf IStorageArea abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1030
diff changeset
694
2140
aa4b8895cd23 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2121
diff changeset
695 SystemToolbox::RemoveFile(path + "/index");
1124
790ff7a5b3bf IStorageArea abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1030
diff changeset
696 FilesystemStorage storage(path);
3017
517fc4767ae0 renamed class DatabaseWrapper as SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3001
diff changeset
697 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
698 db.Open();
2950
dc18d5804746 support of JobsHistorySize set to zero
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2924
diff changeset
699 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
700 context.SetupJobsEngine(true, false);
705
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
701 ServerIndex& index = context.GetIndex();
707
203157cb4fde unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 706
diff changeset
702
706
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 705
diff changeset
703 index.SetMaximumStorageSize(10);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 705
diff changeset
704
3174
8ea7c4546c3a primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3121
diff changeset
705 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
706 index.GetGlobalStatistics(diskSize, uncompressedSize, countPatients,
8ea7c4546c3a primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3121
diff changeset
707 countStudies, countSeries, countInstances);
8ea7c4546c3a primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3121
diff changeset
708
8ea7c4546c3a primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3121
diff changeset
709 ASSERT_EQ(0u, countPatients);
8ea7c4546c3a primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3121
diff changeset
710 ASSERT_EQ(0u, diskSize);
705
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
711
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
712 ServerIndex::Attachments attachments;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
713
713
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
714 std::vector<std::string> ids;
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
715 for (int i = 0; i < 10; i++)
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
716 {
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
717 std::string id = boost::lexical_cast<std::string>(i);
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
718 DicomMap instance;
2007
655489d9165d DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1971
diff changeset
719 instance.SetValue(DICOM_TAG_PATIENT_ID, "patient-" + id, false);
655489d9165d DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1971
diff changeset
720 instance.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "study-" + id, false);
655489d9165d DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1971
diff changeset
721 instance.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, "series-" + id, false);
655489d9165d DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1971
diff changeset
722 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
723 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
724
649d47854314 proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 831
diff changeset
725 std::map<MetadataType, std::string> instanceMetadata;
1822
9ed9458aa44f refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1764
diff changeset
726 DicomInstanceToStore toStore;
9ed9458aa44f refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1764
diff changeset
727 toStore.SetSummary(instance);
9ed9458aa44f refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1764
diff changeset
728 ASSERT_EQ(StoreStatus_Success, index.Store(instanceMetadata, toStore, attachments));
2208
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2190
diff changeset
729 ASSERT_EQ(5u, instanceMetadata.size());
1029
9e04f9f36096 fix windows build
jodogne
parents: 1006
diff changeset
730 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_RemoteAet) != instanceMetadata.end());
9e04f9f36096 fix windows build
jodogne
parents: 1006
diff changeset
731 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_ReceptionDate) != instanceMetadata.end());
2190
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2172
diff changeset
732 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
733 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_SopClassUid) != instanceMetadata.end());
2190
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2172
diff changeset
734
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2172
diff changeset
735 // By default, an Explicit VR Little Endian is used by Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2172
diff changeset
736 ASSERT_EQ("1.2.840.10008.1.2.1", instanceMetadata[MetadataType_Instance_TransferSyntax]);
713
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
737
2208
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2190
diff changeset
738 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
739
713
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
740 DicomInstanceHasher hasher(instance);
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
741 ids.push_back(hasher.HashPatient());
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
742 ids.push_back(hasher.HashStudy());
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
743 ids.push_back(hasher.HashSeries());
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
744 ids.push_back(hasher.HashInstance());
2898
e5e3253a1164 DicomInstanceToStore::GetHasher()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2828
diff changeset
745
e5e3253a1164 DicomInstanceToStore::GetHasher()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2828
diff changeset
746 ASSERT_EQ(hasher.HashPatient(), toStore.GetHasher().HashPatient());
e5e3253a1164 DicomInstanceToStore::GetHasher()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2828
diff changeset
747 ASSERT_EQ(hasher.HashStudy(), toStore.GetHasher().HashStudy());
e5e3253a1164 DicomInstanceToStore::GetHasher()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2828
diff changeset
748 ASSERT_EQ(hasher.HashSeries(), toStore.GetHasher().HashSeries());
e5e3253a1164 DicomInstanceToStore::GetHasher()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2828
diff changeset
749 ASSERT_EQ(hasher.HashInstance(), toStore.GetHasher().HashInstance());
713
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
750 }
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
751
3174
8ea7c4546c3a primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3121
diff changeset
752 index.GetGlobalStatistics(diskSize, uncompressedSize, countPatients,
8ea7c4546c3a primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3121
diff changeset
753 countStudies, countSeries, countInstances);
8ea7c4546c3a primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3121
diff changeset
754 ASSERT_EQ(10u, countPatients);
8ea7c4546c3a primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3121
diff changeset
755 ASSERT_EQ(0u, diskSize);
713
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
756
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
757 for (size_t i = 0; i < ids.size(); i++)
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
758 {
2512
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
759 FileInfo info(Toolbox::GenerateUuid(), FileContentType_Dicom, 1, "md5");
713
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
760 index.AddAttachment(info, ids[i]);
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
761
3174
8ea7c4546c3a primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3121
diff changeset
762 index.GetGlobalStatistics(diskSize, uncompressedSize, countPatients,
8ea7c4546c3a primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3121
diff changeset
763 countStudies, countSeries, countInstances);
8ea7c4546c3a primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3121
diff changeset
764 ASSERT_GE(10u, diskSize);
713
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
765 }
707
203157cb4fde unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 706
diff changeset
766
203157cb4fde unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 706
diff changeset
767 // 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
768 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
769
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
770 context.Stop();
1672
4c5a85c3ff43 sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1549
diff changeset
771 db.Close();
705
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
772 }
1764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1747
diff changeset
773
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1747
diff changeset
774
3036
8fd203510d8b moving LookupIdentifierQuery to the graveyard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
775 TEST(ServerIndex, NormalizeIdentifier)
1764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1747
diff changeset
776 {
2121
7e8889bc95c6 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
777 ASSERT_EQ("H^L.LO", ServerToolbox::NormalizeIdentifier(" Hé^l.LO %_ "));
7e8889bc95c6 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
778 ASSERT_EQ("1.2.840.113619.2.176.2025", ServerToolbox::NormalizeIdentifier(" 1.2.840.113619.2.176.2025 "));
1764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1747
diff changeset
779 }
2826
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
780
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
781
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
782 TEST(ServerIndex, Overwrite)
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
783 {
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
784 for (unsigned int i = 0; i < 2; i++)
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
785 {
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
786 bool overwrite = (i == 0);
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
787
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
788 MemoryStorageArea storage;
3017
517fc4767ae0 renamed class DatabaseWrapper as SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3001
diff changeset
789 SQLiteDatabaseWrapper db; // The SQLite DB is in memory
2826
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
790 db.Open();
2950
dc18d5804746 support of JobsHistorySize set to zero
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2924
diff changeset
791 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
792 context.SetupJobsEngine(true, false);
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
793 context.SetCompressionEnabled(true);
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
794
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
795 DicomMap instance;
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
796 instance.SetValue(DICOM_TAG_PATIENT_ID, "patient", false);
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
797 instance.SetValue(DICOM_TAG_PATIENT_NAME, "name", false);
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
798 instance.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "study", false);
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
799 instance.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, "series", false);
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
800 instance.SetValue(DICOM_TAG_SOP_INSTANCE_UID, "sop", false);
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
801 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
802
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
803 DicomInstanceHasher hasher(instance);
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
804 std::string id = hasher.HashInstance();
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
805 context.GetIndex().SetOverwriteInstances(overwrite);
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
806
3174
8ea7c4546c3a primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3121
diff changeset
807 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
808 context.GetIndex().GetGlobalStatistics(diskSize, uncompressedSize, countPatients,
8ea7c4546c3a primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3121
diff changeset
809 countStudies, countSeries, countInstances);
8ea7c4546c3a primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3121
diff changeset
810
3179
fca730c267d7 New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
811 ASSERT_EQ(0u, countInstances);
fca730c267d7 New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
812 ASSERT_EQ(0u, diskSize);
2826
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
813
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
814 {
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
815 DicomInstanceToStore toStore;
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
816 toStore.SetSummary(instance);
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
817 toStore.SetOrigin(DicomInstanceOrigin::FromPlugins());
2898
e5e3253a1164 DicomInstanceToStore::GetHasher()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2828
diff changeset
818 ASSERT_EQ(id, toStore.GetHasher().HashInstance());
2826
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 std::string id2;
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
821 ASSERT_EQ(StoreStatus_Success, context.Store(id2, toStore));
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
822 ASSERT_EQ(id, id2);
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
823 }
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
824
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
825 FileInfo dicom1, json1;
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
826 ASSERT_TRUE(context.GetIndex().LookupAttachment(dicom1, id, FileContentType_Dicom));
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
827 ASSERT_TRUE(context.GetIndex().LookupAttachment(json1, id, FileContentType_DicomAsJson));
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
828
3174
8ea7c4546c3a primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3121
diff changeset
829 context.GetIndex().GetGlobalStatistics(diskSize, uncompressedSize, countPatients,
8ea7c4546c3a primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3121
diff changeset
830 countStudies, countSeries, countInstances);
8ea7c4546c3a primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3121
diff changeset
831 ASSERT_EQ(1u, countInstances);
8ea7c4546c3a primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3121
diff changeset
832 ASSERT_EQ(dicom1.GetCompressedSize() + json1.GetCompressedSize(), diskSize);
8ea7c4546c3a primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3121
diff changeset
833 ASSERT_EQ(dicom1.GetUncompressedSize() + json1.GetUncompressedSize(), uncompressedSize);
2826
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
834
3174
8ea7c4546c3a primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3121
diff changeset
835 Json::Value tmp;
2826
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
836 context.ReadDicomAsJson(tmp, id);
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
837 ASSERT_EQ("name", tmp["0010,0010"]["Value"].asString());
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
838
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 ServerContext::DicomCacheLocker locker(context, id);
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
841 std::string tmp;
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
842 locker.GetDicom().GetTagValue(tmp, DICOM_TAG_PATIENT_NAME);
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
843 ASSERT_EQ("name", tmp);
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
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
846 {
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
847 DicomMap instance2;
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
848 instance2.Assign(instance);
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
849 instance2.SetValue(DICOM_TAG_PATIENT_NAME, "overwritten", false);
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
850
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
851 DicomInstanceToStore toStore;
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
852 toStore.SetSummary(instance2);
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
853 toStore.SetOrigin(DicomInstanceOrigin::FromPlugins());
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
854
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
855 std::string id2;
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
856 ASSERT_EQ(overwrite ? StoreStatus_Success : StoreStatus_AlreadyStored, context.Store(id2, toStore));
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
857 ASSERT_EQ(id, id2);
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 FileInfo dicom2, json2;
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
861 ASSERT_TRUE(context.GetIndex().LookupAttachment(dicom2, id, FileContentType_Dicom));
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
862 ASSERT_TRUE(context.GetIndex().LookupAttachment(json2, id, FileContentType_DicomAsJson));
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
863
3174
8ea7c4546c3a primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3121
diff changeset
864 context.GetIndex().GetGlobalStatistics(diskSize, uncompressedSize, countPatients,
8ea7c4546c3a primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3121
diff changeset
865 countStudies, countSeries, countInstances);
3179
fca730c267d7 New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
866 ASSERT_EQ(1u, countInstances);
3174
8ea7c4546c3a primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3121
diff changeset
867 ASSERT_EQ(dicom2.GetCompressedSize() + json2.GetCompressedSize(), diskSize);
8ea7c4546c3a primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3121
diff changeset
868 ASSERT_EQ(dicom2.GetUncompressedSize() + json2.GetUncompressedSize(), uncompressedSize);
2826
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
869
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
870 if (overwrite)
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
871 {
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
872 ASSERT_NE(dicom1.GetUuid(), dicom2.GetUuid());
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
873 ASSERT_NE(json1.GetUuid(), json2.GetUuid());
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
874 ASSERT_NE(dicom1.GetUncompressedSize(), dicom2.GetUncompressedSize());
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
875 ASSERT_NE(json1.GetUncompressedSize(), json2.GetUncompressedSize());
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
876
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
877 context.ReadDicomAsJson(tmp, id);
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
878 ASSERT_EQ("overwritten", tmp["0010,0010"]["Value"].asString());
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
879
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 ServerContext::DicomCacheLocker locker(context, id);
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
882 std::string tmp;
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
883 locker.GetDicom().GetTagValue(tmp, DICOM_TAG_PATIENT_NAME);
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
884 ASSERT_EQ("overwritten", tmp);
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
885 }
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
886 }
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
887 else
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
888 {
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
889 ASSERT_EQ(dicom1.GetUuid(), dicom2.GetUuid());
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
890 ASSERT_EQ(json1.GetUuid(), json2.GetUuid());
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
891 ASSERT_EQ(dicom1.GetUncompressedSize(), dicom2.GetUncompressedSize());
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
892 ASSERT_EQ(json1.GetUncompressedSize(), json2.GetUncompressedSize());
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 context.ReadDicomAsJson(tmp, id);
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
895 ASSERT_EQ("name", tmp["0010,0010"]["Value"].asString());
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
896
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
897 {
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
898 ServerContext::DicomCacheLocker locker(context, id);
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
899 std::string tmp;
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
900 locker.GetDicom().GetTagValue(tmp, DICOM_TAG_PATIENT_NAME);
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
901 ASSERT_EQ("name", tmp);
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 }
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
904
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
905 context.Stop();
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
906 db.Close();
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
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2815
diff changeset
910