annotate UnitTestsSources/ServerIndexTests.cpp @ 2208:90ea60bee5ff

New metadata automatically computed at the instance level: "SopClassUid"
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 09 Dec 2016 14:48:31 +0100
parents 3b9ee145f149
children a3a65de1840f
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
827
3d6f9b7d0add precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 803
diff changeset
5 *
3d6f9b7d0add precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 803
diff changeset
6 * 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
7 * 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
8 * 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
9 * License, or (at your option) any later version.
3d6f9b7d0add precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 803
diff changeset
10 *
3d6f9b7d0add precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 803
diff changeset
11 * 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
12 * 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
13 * 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
14 * 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
15 * 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
16 * 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
17 * 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
18 * 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
19 * 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
20 * 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
21 * in the program, then also delete it here.
3d6f9b7d0add precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 803
diff changeset
22 *
3d6f9b7d0add precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 803
diff changeset
23 * 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
24 * 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
25 * 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
26 * General Public License for more details.
3d6f9b7d0add precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 803
diff changeset
27 *
3d6f9b7d0add precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 803
diff changeset
28 * 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
29 * 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
30 **/
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
831
84513f2ee1f3 pch for unit tests and server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 827
diff changeset
33 #include "PrecompiledHeadersUnitTests.h"
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 #include "gtest/gtest.h"
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35
1486
f967bdf8534e refactoring to Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1453
diff changeset
36 #include "../Core/FileStorage/FilesystemStorage.h"
f967bdf8534e refactoring to Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1453
diff changeset
37 #include "../Core/Logging.h"
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
38 #include "../OrthancServer/DatabaseWrapper.h"
705
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
39 #include "../OrthancServer/ServerContext.h"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
40 #include "../OrthancServer/ServerIndex.h"
1747
ca69082ab200 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1746
diff changeset
41 #include "../OrthancServer/Search/LookupIdentifierQuery.h"
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
42
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 #include <ctype.h>
521
2c739f76d0bb lookup tag values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 438
diff changeset
44 #include <algorithm>
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
46 using namespace Orthanc;
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 namespace
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
49 {
737
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
50 enum DatabaseWrapperClass
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
51 {
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
52 DatabaseWrapperClass_SQLite
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
53 };
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
54
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
55
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1294
diff changeset
56 class TestDatabaseListener : public IDatabaseListener
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 {
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58 public:
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
59 std::vector<std::string> deletedFiles_;
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
60 std::vector<std::string> deletedResources_;
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
61 std::string ancestorId_;
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
62 ResourceType ancestorType_;
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
63
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
64 void Reset()
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65 {
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
66 ancestorId_ = "";
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
67 deletedFiles_.clear();
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
68 }
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
69
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
70 virtual void SignalRemainingAncestor(ResourceType type,
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
71 const std::string& publicId)
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
72 {
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
73 ancestorId_ = publicId;
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
74 ancestorType_ = type;
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 }
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76
273
d384af918264 more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
77 virtual void SignalFileDeleted(const FileInfo& info)
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 {
273
d384af918264 more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
79 const std::string fileUuid = info.GetUuid();
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
80 deletedFiles_.push_back(fileUuid);
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81 LOG(INFO) << "A file must be removed: " << fileUuid;
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
82 }
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
83
1198
1169528a9a5f refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1177
diff changeset
84 virtual void SignalChange(const ServerIndexChange& change)
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
85 {
1198
1169528a9a5f refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1177
diff changeset
86 if (change.GetChangeType() == ChangeType_Deleted)
1177
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
87 {
1198
1169528a9a5f refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1177
diff changeset
88 deletedResources_.push_back(change.GetPublicId());
1177
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
89 }
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
90
1198
1169528a9a5f refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1177
diff changeset
91 LOG(INFO) << "Change related to resource " << change.GetPublicId() << " of type "
1169528a9a5f refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1177
diff changeset
92 << EnumerationToString(change.GetResourceType()) << ": "
1169528a9a5f refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1177
diff changeset
93 << EnumerationToString(change.GetChangeType());
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
94 }
1177
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
95
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96 };
737
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
97
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
98
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
99 class DatabaseWrapperTest : public ::testing::TestWithParam<DatabaseWrapperClass>
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
100 {
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
101 protected:
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1294
diff changeset
102 std::auto_ptr<TestDatabaseListener> listener_;
1252
ee43f0d611a8 testing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1247
diff changeset
103 std::auto_ptr<IDatabaseWrapper> index_;
737
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
104
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
105 DatabaseWrapperTest()
737
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
106 {
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
107 }
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
108
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
109 virtual void SetUp()
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
110 {
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1294
diff changeset
111 listener_.reset(new TestDatabaseListener);
1287
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
112
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
113 switch (GetParam())
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
114 {
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
115 case DatabaseWrapperClass_SQLite:
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
116 index_.reset(new DatabaseWrapper());
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
117 break;
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
118
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
119 default:
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
120 throw OrthancException(ErrorCode_InternalError);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
121 }
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
122
1247
32fcc5dc7562 abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1241
diff changeset
123 index_->SetListener(*listener_);
1672
4c5a85c3ff43 sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1549
diff changeset
124 index_->Open();
737
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
125 }
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
126
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
127 virtual void TearDown()
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
128 {
1672
4c5a85c3ff43 sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1549
diff changeset
129 index_->Close();
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
130 index_.reset(NULL);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
131 listener_.reset(NULL);
737
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
132 }
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
133
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
134 void CheckTableRecordCount(uint32_t expected, const char* table)
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
135 {
1287
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
136 switch (GetParam())
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
137 {
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
138 case DatabaseWrapperClass_SQLite:
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
139 {
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
140 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get());
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
141 ASSERT_EQ(expected, sqlite->GetTableRecordCount(table));
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
142 break;
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
143 }
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
144
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
145 default:
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
146 throw OrthancException(ErrorCode_InternalError);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
147 }
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
148 }
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
149
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
150 void CheckNoParent(int64_t id)
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
151 {
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
152 std::string s;
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 switch (GetParam())
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
155 {
1287
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
156 case DatabaseWrapperClass_SQLite:
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 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get());
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
159 ASSERT_FALSE(sqlite->GetParentPublicId(s, id));
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
160 break;
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
161 }
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
162
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
163 default:
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
164 throw OrthancException(ErrorCode_InternalError);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
165 }
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
166 }
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
167
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
168 void CheckParentPublicId(const char* expected, int64_t id)
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
169 {
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
170 std::string s;
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
171
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
172 switch (GetParam())
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
173 {
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
174 case DatabaseWrapperClass_SQLite:
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
175 {
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
176 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get());
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
177 ASSERT_TRUE(sqlite->GetParentPublicId(s, id));
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
178 ASSERT_EQ(expected, s);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
179 break;
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
180 }
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
181
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
182 default:
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
183 throw OrthancException(ErrorCode_InternalError);
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
184 }
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
185 }
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
186
1287
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
187 void CheckNoChild(int64_t id)
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
188 {
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
189 std::list<std::string> j;
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
190
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
191 switch (GetParam())
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
192 {
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
193 case DatabaseWrapperClass_SQLite:
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
194 {
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
195 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get());
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
196 sqlite->GetChildren(j, id);
1492
9f66a12eb8fc fix warnings for gcc 5
jodogne
parents: 1486
diff changeset
197 ASSERT_EQ(0u, j.size());
1287
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
198 break;
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
199 }
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
200
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
201 default:
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
202 throw OrthancException(ErrorCode_InternalError);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
203 }
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
204 }
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
205
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
206 void CheckOneChild(const char* expected, int64_t id)
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
207 {
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
208 std::list<std::string> j;
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
209
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
210 switch (GetParam())
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
211 {
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
212 case DatabaseWrapperClass_SQLite:
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
213 {
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
214 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get());
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
215 sqlite->GetChildren(j, id);
1492
9f66a12eb8fc fix warnings for gcc 5
jodogne
parents: 1486
diff changeset
216 ASSERT_EQ(1u, j.size());
1287
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
217 ASSERT_EQ(expected, j.front());
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
218 break;
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
219 }
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
220
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
221 default:
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
222 throw OrthancException(ErrorCode_InternalError);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
223 }
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
224 }
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
225
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
226 void CheckTwoChildren(const char* expected1,
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
227 const char* expected2,
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
228 int64_t id)
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
229 {
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
230 std::list<std::string> j;
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
231
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
232 switch (GetParam())
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
233 {
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
234 case DatabaseWrapperClass_SQLite:
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
235 {
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
236 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get());
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
237 sqlite->GetChildren(j, id);
1492
9f66a12eb8fc fix warnings for gcc 5
jodogne
parents: 1486
diff changeset
238 ASSERT_EQ(2u, j.size());
1287
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
239 ASSERT_TRUE((expected1 == j.front() && expected2 == j.back()) ||
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
240 (expected1 == j.back() && expected2 == j.front()));
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
241 break;
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
242 }
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
243
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
244 default:
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
245 throw OrthancException(ErrorCode_InternalError);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
246 }
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
247 }
1746
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
248
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
249
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
250 void DoLookup(std::list<std::string>& result,
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
251 ResourceType level,
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
252 const DicomTag& tag,
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
253 const std::string& value)
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
254 {
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
255 LookupIdentifierQuery query(level);
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
256 query.AddConstraint(tag, IdentifierConstraintType_Equal, value);
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
257 query.Apply(result, *index_);
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
258 }
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
259
737
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
260 };
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
261 }
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
262
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
263
737
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
264 INSTANTIATE_TEST_CASE_P(DatabaseWrapperName,
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
265 DatabaseWrapperTest,
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
266 ::testing::Values(DatabaseWrapperClass_SQLite));
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
267
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
268
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
269 TEST_P(DatabaseWrapperTest, Simple)
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
270 {
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
271 int64_t a[] = {
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
272 index_->CreateResource("a", ResourceType_Patient), // 0
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
273 index_->CreateResource("b", ResourceType_Study), // 1
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
274 index_->CreateResource("c", ResourceType_Series), // 2
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
275 index_->CreateResource("d", ResourceType_Instance), // 3
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
276 index_->CreateResource("e", ResourceType_Instance), // 4
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
277 index_->CreateResource("f", ResourceType_Instance), // 5
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
278 index_->CreateResource("g", ResourceType_Study) // 6
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
279 };
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
280
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
281 ASSERT_EQ("a", index_->GetPublicId(a[0]));
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
282 ASSERT_EQ("b", index_->GetPublicId(a[1]));
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
283 ASSERT_EQ("c", index_->GetPublicId(a[2]));
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
284 ASSERT_EQ("d", index_->GetPublicId(a[3]));
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
285 ASSERT_EQ("e", index_->GetPublicId(a[4]));
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
286 ASSERT_EQ("f", index_->GetPublicId(a[5]));
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
287 ASSERT_EQ("g", index_->GetPublicId(a[6]));
198
663cc6c46d0a before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 197
diff changeset
288
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
289 ASSERT_EQ(ResourceType_Patient, index_->GetResourceType(a[0]));
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
290 ASSERT_EQ(ResourceType_Study, index_->GetResourceType(a[1]));
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
291 ASSERT_EQ(ResourceType_Series, index_->GetResourceType(a[2]));
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
292 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[3]));
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
293 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[4]));
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
294 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[5]));
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
295 ASSERT_EQ(ResourceType_Study, index_->GetResourceType(a[6]));
304
4eea080e6e7a refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
296
190
b6cef9d45cc3 getallpublicids
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
297 {
1241
90d2f320862d refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1239
diff changeset
298 std::list<std::string> t;
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
299 index_->GetAllPublicIds(t, ResourceType_Patient);
190
b6cef9d45cc3 getallpublicids
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
300
232
5368bbe813cf refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
301 ASSERT_EQ(1u, t.size());
1241
90d2f320862d refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1239
diff changeset
302 ASSERT_EQ("a", t.front());
190
b6cef9d45cc3 getallpublicids
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
303
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
304 index_->GetAllPublicIds(t, ResourceType_Series);
232
5368bbe813cf refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
305 ASSERT_EQ(1u, t.size());
1241
90d2f320862d refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1239
diff changeset
306 ASSERT_EQ("c", t.front());
190
b6cef9d45cc3 getallpublicids
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
307
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
308 index_->GetAllPublicIds(t, ResourceType_Study);
232
5368bbe813cf refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
309 ASSERT_EQ(2u, t.size());
190
b6cef9d45cc3 getallpublicids
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
310
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
311 index_->GetAllPublicIds(t, ResourceType_Instance);
232
5368bbe813cf refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
312 ASSERT_EQ(3u, t.size());
190
b6cef9d45cc3 getallpublicids
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
313 }
b6cef9d45cc3 getallpublicids
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
314
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
315 index_->SetGlobalProperty(GlobalProperty_FlushSleep, "World");
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
316
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
317 index_->AttachChild(a[0], a[1]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
318 index_->AttachChild(a[1], a[2]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
319 index_->AttachChild(a[2], a[3]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
320 index_->AttachChild(a[2], a[4]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
321 index_->AttachChild(a[6], a[5]);
182
93ff5babcaf8 children public id
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
322
198
663cc6c46d0a before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 197
diff changeset
323 int64_t parent;
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
324 ASSERT_FALSE(index_->LookupParent(parent, a[0]));
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
325 ASSERT_TRUE(index_->LookupParent(parent, a[1])); ASSERT_EQ(a[0], parent);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
326 ASSERT_TRUE(index_->LookupParent(parent, a[2])); ASSERT_EQ(a[1], parent);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
327 ASSERT_TRUE(index_->LookupParent(parent, a[3])); ASSERT_EQ(a[2], parent);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
328 ASSERT_TRUE(index_->LookupParent(parent, a[4])); ASSERT_EQ(a[2], parent);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
329 ASSERT_TRUE(index_->LookupParent(parent, a[5])); ASSERT_EQ(a[6], parent);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
330 ASSERT_FALSE(index_->LookupParent(parent, a[6]));
198
663cc6c46d0a before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 197
diff changeset
331
182
93ff5babcaf8 children public id
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
332 std::string s;
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
333
1287
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
334 CheckNoParent(a[0]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
335 CheckNoParent(a[6]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
336 CheckParentPublicId("a", a[1]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
337 CheckParentPublicId("b", a[2]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
338 CheckParentPublicId("c", a[3]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
339 CheckParentPublicId("c", a[4]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
340 CheckParentPublicId("g", a[5]);
182
93ff5babcaf8 children public id
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
341
185
5185ae1d9af5 fix for msvc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
342 std::list<std::string> l;
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
343 index_->GetChildrenPublicId(l, a[0]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("b", l.front());
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
344 index_->GetChildrenPublicId(l, a[1]); ASSERT_EQ(1u, l.size()); ASSERT_EQ("c", l.front());
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
345 index_->GetChildrenPublicId(l, a[3]); ASSERT_EQ(0u, l.size());
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
346 index_->GetChildrenPublicId(l, a[4]); ASSERT_EQ(0u, l.size());
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
347 index_->GetChildrenPublicId(l, a[5]); ASSERT_EQ(0u, l.size());
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
348 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
349
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
350 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
351 if (l.front() == "d")
93ff5babcaf8 children public id
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
352 {
93ff5babcaf8 children public id
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
353 ASSERT_EQ("e", l.back());
93ff5babcaf8 children public id
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
354 }
93ff5babcaf8 children public id
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
355 else
93ff5babcaf8 children public id
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
356 {
93ff5babcaf8 children public id
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
357 ASSERT_EQ("d", l.back());
93ff5babcaf8 children public id
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
358 ASSERT_EQ("e", l.front());
93ff5babcaf8 children public id
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
359 }
93ff5babcaf8 children public id
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
360
436
d51186bf7602 read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 310
diff changeset
361 std::list<MetadataType> md;
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
362 index_->ListAvailableMetadata(md, a[4]);
436
d51186bf7602 read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 310
diff changeset
363 ASSERT_EQ(0u, md.size());
d51186bf7602 read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 310
diff changeset
364
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
365 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
366 CompressionType_ZlibWithSize, 21, "compressedMD5"));
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
367 index_->AddAttachment(a[4], FileInfo("my dicom file", FileContentType_Dicom, 42, "md5"));
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
368 index_->AddAttachment(a[6], FileInfo("world", FileContentType_Dicom, 44, "md5"));
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
369 index_->SetMetadata(a[4], MetadataType_Instance_RemoteAet, "PINNACLE");
436
d51186bf7602 read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 310
diff changeset
370
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
371 index_->ListAvailableMetadata(md, a[4]);
436
d51186bf7602 read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 310
diff changeset
372 ASSERT_EQ(1u, md.size());
d51186bf7602 read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 310
diff changeset
373 ASSERT_EQ(MetadataType_Instance_RemoteAet, md.front());
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
374 index_->SetMetadata(a[4], MetadataType_ModifiedFrom, "TUTU");
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
375 index_->ListAvailableMetadata(md, a[4]);
438
7bbe77cb9e12 DELETE metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 436
diff changeset
376 ASSERT_EQ(2u, md.size());
1030
66fa947c7280 more tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1029
diff changeset
377
66fa947c7280 more tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1029
diff changeset
378 std::map<MetadataType, std::string> md2;
66fa947c7280 more tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1029
diff changeset
379 index_->GetAllMetadata(md2, a[4]);
66fa947c7280 more tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1029
diff changeset
380 ASSERT_EQ(2u, md2.size());
66fa947c7280 more tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1029
diff changeset
381 ASSERT_EQ("TUTU", md2[MetadataType_ModifiedFrom]);
66fa947c7280 more tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1029
diff changeset
382 ASSERT_EQ("PINNACLE", md2[MetadataType_Instance_RemoteAet]);
66fa947c7280 more tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1029
diff changeset
383
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
384 index_->DeleteMetadata(a[4], MetadataType_ModifiedFrom);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
385 index_->ListAvailableMetadata(md, a[4]);
438
7bbe77cb9e12 DELETE metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 436
diff changeset
386 ASSERT_EQ(1u, md.size());
7bbe77cb9e12 DELETE metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 436
diff changeset
387 ASSERT_EQ(MetadataType_Instance_RemoteAet, md.front());
182
93ff5babcaf8 children public id
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
388
1030
66fa947c7280 more tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1029
diff changeset
389 index_->GetAllMetadata(md2, a[4]);
66fa947c7280 more tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1029
diff changeset
390 ASSERT_EQ(1u, md2.size());
66fa947c7280 more tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1029
diff changeset
391 ASSERT_EQ("PINNACLE", md2[MetadataType_Instance_RemoteAet]);
66fa947c7280 more tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1029
diff changeset
392
66fa947c7280 more tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1029
diff changeset
393
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
394 ASSERT_EQ(21u + 42u + 44u, index_->GetTotalCompressedSize());
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
395 ASSERT_EQ(42u + 42u + 44u, index_->GetTotalUncompressedSize());
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
396
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
397 index_->SetMainDicomTag(a[3], DicomTag(0x0010, 0x0010), "PatientName");
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
398
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
399 int64_t b;
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
400 ResourceType t;
1294
910478b2d4e4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
401 ASSERT_TRUE(index_->LookupResource(b, t, "g"));
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
402 ASSERT_EQ(7, b);
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
403 ASSERT_EQ(ResourceType_Study, t);
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
404
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
405 ASSERT_TRUE(index_->LookupMetadata(s, a[4], MetadataType_Instance_RemoteAet));
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
406 ASSERT_FALSE(index_->LookupMetadata(s, a[4], MetadataType_Instance_IndexInSeries));
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
407 ASSERT_EQ("PINNACLE", s);
1238
6c07108ff1e2 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1237
diff changeset
408
6c07108ff1e2 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1237
diff changeset
409 std::string u;
6c07108ff1e2 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1237
diff changeset
410 ASSERT_TRUE(index_->LookupMetadata(u, a[4], MetadataType_Instance_RemoteAet));
6c07108ff1e2 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1237
diff changeset
411 ASSERT_EQ("PINNACLE", u);
6c07108ff1e2 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1237
diff changeset
412 ASSERT_FALSE(index_->LookupMetadata(u, a[4], MetadataType_Instance_IndexInSeries));
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
413
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
414 ASSERT_TRUE(index_->LookupGlobalProperty(s, GlobalProperty_FlushSleep));
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
415 ASSERT_FALSE(index_->LookupGlobalProperty(s, static_cast<GlobalProperty>(42)));
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
416 ASSERT_EQ("World", s);
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
417
232
5368bbe813cf refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
418 FileInfo att;
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
419 ASSERT_TRUE(index_->LookupAttachment(att, a[4], FileContentType_DicomAsJson));
232
5368bbe813cf refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
420 ASSERT_EQ("my json file", att.GetUuid());
5368bbe813cf refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
421 ASSERT_EQ(21u, att.GetCompressedSize());
693
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 632
diff changeset
422 ASSERT_EQ("md5", att.GetUncompressedMD5());
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 632
diff changeset
423 ASSERT_EQ("compressedMD5", att.GetCompressedMD5());
232
5368bbe813cf refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
424 ASSERT_EQ(42u, att.GetUncompressedSize());
1514
d73a2178b319 support of deflate and gzip content-types
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1492
diff changeset
425 ASSERT_EQ(CompressionType_ZlibWithSize, att.GetCompressionType());
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
426
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
427 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
428 ASSERT_EQ("world", att.GetUuid());
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 632
diff changeset
429 ASSERT_EQ(44u, att.GetCompressedSize());
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 632
diff changeset
430 ASSERT_EQ("md5", att.GetUncompressedMD5());
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 632
diff changeset
431 ASSERT_EQ("md5", att.GetCompressedMD5());
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 632
diff changeset
432 ASSERT_EQ(44u, att.GetUncompressedSize());
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 632
diff changeset
433 ASSERT_EQ(CompressionType_None, att.GetCompressionType());
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 632
diff changeset
434
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
435 ASSERT_EQ(0u, listener_->deletedFiles_.size());
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
436 ASSERT_EQ(0u, listener_->deletedResources_.size());
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
437
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
438 CheckTableRecordCount(7, "Resources");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
439 CheckTableRecordCount(3, "AttachedFiles");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
440 CheckTableRecordCount(1, "Metadata");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
441 CheckTableRecordCount(1, "MainDicomTags");
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
442
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
443 index_->DeleteResource(a[0]);
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
444 ASSERT_EQ(5u, listener_->deletedResources_.size());
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
445 ASSERT_EQ(2u, listener_->deletedFiles_.size());
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
446 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(),
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
447 listener_->deletedFiles_.end(),
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
448 "my json file") == listener_->deletedFiles_.end());
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
449 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(),
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
450 listener_->deletedFiles_.end(),
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
451 "my dicom file") == listener_->deletedFiles_.end());
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
452
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
453 CheckTableRecordCount(2, "Resources");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
454 CheckTableRecordCount(0, "Metadata");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
455 CheckTableRecordCount(1, "AttachedFiles");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
456 CheckTableRecordCount(0, "MainDicomTags");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
457
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
458 index_->DeleteResource(a[5]);
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
459 ASSERT_EQ(7u, listener_->deletedResources_.size());
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
460
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
461 CheckTableRecordCount(0, "Resources");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
462 CheckTableRecordCount(0, "AttachedFiles");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
463 CheckTableRecordCount(2, "GlobalProperties");
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
464
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
465 ASSERT_EQ(3u, listener_->deletedFiles_.size());
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
466 ASSERT_FALSE(std::find(listener_->deletedFiles_.begin(),
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
467 listener_->deletedFiles_.end(),
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
468 "world") == listener_->deletedFiles_.end());
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
469 }
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
470
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
471
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
472
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
473
737
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
474 TEST_P(DatabaseWrapperTest, Upward)
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
475 {
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
476 int64_t a[] = {
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
477 index_->CreateResource("a", ResourceType_Patient), // 0
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
478 index_->CreateResource("b", ResourceType_Study), // 1
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
479 index_->CreateResource("c", ResourceType_Series), // 2
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
480 index_->CreateResource("d", ResourceType_Instance), // 3
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
481 index_->CreateResource("e", ResourceType_Instance), // 4
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
482 index_->CreateResource("f", ResourceType_Study), // 5
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
483 index_->CreateResource("g", ResourceType_Series), // 6
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
484 index_->CreateResource("h", ResourceType_Series) // 7
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
485 };
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
486
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
487 index_->AttachChild(a[0], a[1]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
488 index_->AttachChild(a[1], a[2]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
489 index_->AttachChild(a[2], a[3]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
490 index_->AttachChild(a[2], a[4]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
491 index_->AttachChild(a[1], a[6]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
492 index_->AttachChild(a[0], a[5]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
493 index_->AttachChild(a[5], a[7]);
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
494
1287
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
495 CheckTwoChildren("b", "f", a[0]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
496 CheckTwoChildren("c", "g", a[1]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
497 CheckTwoChildren("d", "e", a[2]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
498 CheckNoChild(a[3]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
499 CheckNoChild(a[4]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
500 CheckOneChild("h", a[5]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
501 CheckNoChild(a[6]);
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
502 CheckNoChild(a[7]);
193
a1b9d1e1497b failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 190
diff changeset
503
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
504 listener_->Reset();
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
505 index_->DeleteResource(a[3]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
506 ASSERT_EQ("c", listener_->ancestorId_);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
507 ASSERT_EQ(ResourceType_Series, listener_->ancestorType_);
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
508
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
509 listener_->Reset();
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
510 index_->DeleteResource(a[4]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
511 ASSERT_EQ("b", listener_->ancestorId_);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
512 ASSERT_EQ(ResourceType_Study, listener_->ancestorType_);
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
513
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
514 listener_->Reset();
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
515 index_->DeleteResource(a[7]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
516 ASSERT_EQ("a", listener_->ancestorId_);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
517 ASSERT_EQ(ResourceType_Patient, listener_->ancestorType_);
183
baada606da3c databasewrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
518
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
519 listener_->Reset();
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
520 index_->DeleteResource(a[6]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
521 ASSERT_EQ("", listener_->ancestorId_); // No more ancestor
181
2dece1526c06 simplifying db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
522 }
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
523
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
524
737
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
525 TEST_P(DatabaseWrapperTest, PatientRecycling)
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
526 {
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
527 std::vector<int64_t> patients;
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
528 for (int i = 0; i < 10; i++)
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
529 {
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
530 std::string p = "Patient " + boost::lexical_cast<std::string>(i);
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
531 patients.push_back(index_->CreateResource(p, ResourceType_Patient));
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
532 index_->AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10,
1287
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
533 "md5-" + boost::lexical_cast<std::string>(i)));
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
534 ASSERT_FALSE(index_->IsProtectedPatient(patients[i]));
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
535 }
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
536
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
537 CheckTableRecordCount(10u, "Resources");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
538 CheckTableRecordCount(10u, "PatientRecyclingOrder");
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
539
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
540 listener_->Reset();
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
541 ASSERT_EQ(0u, listener_->deletedResources_.size());
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
542
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
543 index_->DeleteResource(patients[5]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
544 index_->DeleteResource(patients[0]);
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
545 ASSERT_EQ(2u, listener_->deletedResources_.size());
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
546
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
547 CheckTableRecordCount(8u, "Resources");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
548 CheckTableRecordCount(8u, "PatientRecyclingOrder");
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
549
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
550 ASSERT_EQ(2u, listener_->deletedFiles_.size());
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
551 ASSERT_EQ("Patient 5", listener_->deletedFiles_[0]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
552 ASSERT_EQ("Patient 0", listener_->deletedFiles_[1]);
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
553
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
554 int64_t p;
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
555 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[1]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
556 index_->DeleteResource(p);
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
557 ASSERT_EQ(3u, listener_->deletedResources_.size());
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
558 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[2]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
559 index_->DeleteResource(p);
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
560 ASSERT_EQ(4u, listener_->deletedResources_.size());
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
561 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[3]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
562 index_->DeleteResource(p);
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
563 ASSERT_EQ(5u, listener_->deletedResources_.size());
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
564 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[4]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
565 index_->DeleteResource(p);
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
566 ASSERT_EQ(6u, listener_->deletedResources_.size());
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
567 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[6]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
568 index_->DeleteResource(p);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
569 index_->DeleteResource(patients[8]);
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
570 ASSERT_EQ(8u, listener_->deletedResources_.size());
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
571 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[7]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
572 index_->DeleteResource(p);
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
573 ASSERT_EQ(9u, listener_->deletedResources_.size());
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
574 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[9]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
575 index_->DeleteResource(p);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
576 ASSERT_FALSE(index_->SelectPatientToRecycle(p));
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
577 ASSERT_EQ(10u, listener_->deletedResources_.size());
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
578
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
579 ASSERT_EQ(10u, listener_->deletedFiles_.size());
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
580
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
581 CheckTableRecordCount(0, "Resources");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
582 CheckTableRecordCount(0, "PatientRecyclingOrder");
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
583 }
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
584
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
585
737
1dee6e9bdbf4 abstraction of databasewrapper tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
586 TEST_P(DatabaseWrapperTest, PatientProtection)
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
587 {
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
588 std::vector<int64_t> patients;
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
589 for (int i = 0; i < 5; i++)
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
590 {
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
591 std::string p = "Patient " + boost::lexical_cast<std::string>(i);
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
592 patients.push_back(index_->CreateResource(p, ResourceType_Patient));
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
593 index_->AddAttachment(patients[i], FileInfo(p, FileContentType_Dicom, i + 10,
1287
63a6428771f4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
594 "md5-" + boost::lexical_cast<std::string>(i)));
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
595 ASSERT_FALSE(index_->IsProtectedPatient(patients[i]));
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
596 }
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
597
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
598 CheckTableRecordCount(5, "Resources");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
599 CheckTableRecordCount(5, "PatientRecyclingOrder");
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
600
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
601 ASSERT_FALSE(index_->IsProtectedPatient(patients[2]));
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
602 index_->SetProtectedPatient(patients[2], true);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
603 ASSERT_TRUE(index_->IsProtectedPatient(patients[2]));
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
604 CheckTableRecordCount(5, "Resources");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
605 CheckTableRecordCount(4, "PatientRecyclingOrder");
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
606
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
607 index_->SetProtectedPatient(patients[2], true);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
608 ASSERT_TRUE(index_->IsProtectedPatient(patients[2]));
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
609 CheckTableRecordCount(4, "PatientRecyclingOrder");
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
610 index_->SetProtectedPatient(patients[2], false);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
611 ASSERT_FALSE(index_->IsProtectedPatient(patients[2]));
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
612 CheckTableRecordCount(5, "PatientRecyclingOrder");
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
613 index_->SetProtectedPatient(patients[2], false);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
614 ASSERT_FALSE(index_->IsProtectedPatient(patients[2]));
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
615 CheckTableRecordCount(5, "PatientRecyclingOrder");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
616 CheckTableRecordCount(5, "Resources");
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
617 index_->SetProtectedPatient(patients[2], true);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
618 ASSERT_TRUE(index_->IsProtectedPatient(patients[2]));
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
619 CheckTableRecordCount(4, "PatientRecyclingOrder");
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
620 index_->SetProtectedPatient(patients[2], false);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
621 ASSERT_FALSE(index_->IsProtectedPatient(patients[2]));
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
622 CheckTableRecordCount(5, "PatientRecyclingOrder");
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
623 index_->SetProtectedPatient(patients[3], true);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
624 ASSERT_TRUE(index_->IsProtectedPatient(patients[3]));
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
625 CheckTableRecordCount(4, "PatientRecyclingOrder");
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
626
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
627 CheckTableRecordCount(5, "Resources");
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
628 ASSERT_EQ(0u, listener_->deletedFiles_.size());
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
629
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
630 // 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
631 int64_t p;
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
632 ASSERT_EQ(0u, listener_->deletedResources_.size());
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
633 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[0]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
634 index_->DeleteResource(p);
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
635 ASSERT_EQ(1u, listener_->deletedResources_.size());
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
636 ASSERT_TRUE(index_->SelectPatientToRecycle(p, patients[1])); ASSERT_EQ(p, patients[4]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
637 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[1]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
638 index_->DeleteResource(p);
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
639 ASSERT_EQ(2u, listener_->deletedResources_.size());
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
640 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[4]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
641 index_->DeleteResource(p);
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
642 ASSERT_EQ(3u, listener_->deletedResources_.size());
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
643 ASSERT_FALSE(index_->SelectPatientToRecycle(p, patients[2]));
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
644 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[2]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
645 index_->DeleteResource(p);
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
646 ASSERT_EQ(4u, listener_->deletedResources_.size());
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
647 // "patients[3]" is still protected
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
648 ASSERT_FALSE(index_->SelectPatientToRecycle(p));
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
649
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
650 ASSERT_EQ(4u, listener_->deletedFiles_.size());
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
651 CheckTableRecordCount(1, "Resources");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
652 CheckTableRecordCount(0, "PatientRecyclingOrder");
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
653
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
654 index_->SetProtectedPatient(patients[3], false);
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
655 CheckTableRecordCount(1, "PatientRecyclingOrder");
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
656 ASSERT_FALSE(index_->SelectPatientToRecycle(p, patients[3]));
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
657 ASSERT_TRUE(index_->SelectPatientToRecycle(p, patients[2]));
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
658 ASSERT_TRUE(index_->SelectPatientToRecycle(p)); ASSERT_EQ(p, patients[3]);
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
659 index_->DeleteResource(p);
1159
8f9d49192815 speeding up db schema
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1134
diff changeset
660 ASSERT_EQ(5u, listener_->deletedResources_.size());
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
661
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
662 ASSERT_EQ(5u, listener_->deletedFiles_.size());
1286
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
663 CheckTableRecordCount(0, "Resources");
b4acdb37e43b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1252
diff changeset
664 CheckTableRecordCount(0, "PatientRecyclingOrder");
262
2354560daf2f primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 252
diff changeset
665 }
310
6ab6cdeedf4e global sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
666
6ab6cdeedf4e global sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
667
6ab6cdeedf4e global sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
668
1237
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
669 TEST(ServerIndex, Sequence)
310
6ab6cdeedf4e global sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
670 {
1237
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
671 const std::string path = "UnitTestsStorage";
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
672
2140
aa4b8895cd23 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2121
diff changeset
673 SystemToolbox::RemoveFile(path + "/index");
1237
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
674 FilesystemStorage storage(path);
1247
32fcc5dc7562 abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1241
diff changeset
675 DatabaseWrapper db; // The SQLite DB is in memory
1672
4c5a85c3ff43 sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1549
diff changeset
676 db.Open();
1549
e5e975e9b738 refactoring and simplification of StorageAccessor
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1514
diff changeset
677 ServerContext context(db, storage);
1237
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
678 ServerIndex& index = context.GetIndex();
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
679
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
680 ASSERT_EQ(1u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence));
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
681 ASSERT_EQ(2u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence));
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
682 ASSERT_EQ(3u, index.IncrementGlobalSequence(GlobalProperty_AnonymizationSequence));
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
683 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
684
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
685 context.Stop();
1672
4c5a85c3ff43 sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1549
diff changeset
686 db.Close();
310
6ab6cdeedf4e global sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
687 }
521
2c739f76d0bb lookup tag values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 438
diff changeset
688
2c739f76d0bb lookup tag values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 438
diff changeset
689
2c739f76d0bb lookup tag values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 438
diff changeset
690
1162
1ea4094d077c refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1159
diff changeset
691 TEST_P(DatabaseWrapperTest, LookupIdentifier)
521
2c739f76d0bb lookup tag values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 438
diff changeset
692 {
2c739f76d0bb lookup tag values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 438
diff changeset
693 int64_t a[] = {
738
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
694 index_->CreateResource("a", ResourceType_Study), // 0
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
695 index_->CreateResource("b", ResourceType_Study), // 1
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
696 index_->CreateResource("c", ResourceType_Study), // 2
c60743fadd4e more abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 737
diff changeset
697 index_->CreateResource("d", ResourceType_Series) // 3
521
2c739f76d0bb lookup tag values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 438
diff changeset
698 };
2c739f76d0bb lookup tag values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 438
diff changeset
699
1713
4db9200c7f46 SetIdentifierTag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
700 index_->SetIdentifierTag(a[0], DICOM_TAG_STUDY_INSTANCE_UID, "0");
4db9200c7f46 SetIdentifierTag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
701 index_->SetIdentifierTag(a[1], DICOM_TAG_STUDY_INSTANCE_UID, "1");
4db9200c7f46 SetIdentifierTag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
702 index_->SetIdentifierTag(a[2], DICOM_TAG_STUDY_INSTANCE_UID, "0");
4db9200c7f46 SetIdentifierTag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
703 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
704
1746
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
705 std::list<std::string> s;
521
2c739f76d0bb lookup tag values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 438
diff changeset
706
1746
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
707 DoLookup(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, "0");
521
2c739f76d0bb lookup tag values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 438
diff changeset
708 ASSERT_EQ(2u, s.size());
1746
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
709 ASSERT_TRUE(std::find(s.begin(), s.end(), "a") != s.end());
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
710 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
711
1746
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
712 DoLookup(s, ResourceType_Series, DICOM_TAG_SERIES_INSTANCE_UID, "0");
1718
2b812969e136 getting rid of an IDatabaseWrapper::LookupIdentifier flavor
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1713
diff changeset
713 ASSERT_EQ(1u, s.size());
1746
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
714 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
715
1746
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
716 DoLookup(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, "1");
521
2c739f76d0bb lookup tag values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 438
diff changeset
717 ASSERT_EQ(1u, s.size());
1746
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
718 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
719
1746
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
720 DoLookup(s, ResourceType_Study, DICOM_TAG_STUDY_INSTANCE_UID, "1");
521
2c739f76d0bb lookup tag values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 438
diff changeset
721 ASSERT_EQ(1u, s.size());
1746
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
722 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
723
1746
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
724 DoLookup(s, ResourceType_Series, DICOM_TAG_SERIES_INSTANCE_UID, "1");
1718
2b812969e136 getting rid of an IDatabaseWrapper::LookupIdentifier flavor
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1713
diff changeset
725 ASSERT_EQ(0u, s.size());
521
2c739f76d0bb lookup tag values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 438
diff changeset
726
1746
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
727 {
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
728 LookupIdentifierQuery query(ResourceType_Study);
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
729 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_GreaterOrEqual, "0");
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
730 query.Apply(s, *index_);
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
731 ASSERT_EQ(3u, s.size());
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
732 }
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
733
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
734 {
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
735 LookupIdentifierQuery query(ResourceType_Study);
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
736 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_GreaterOrEqual, "0");
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
737 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_SmallerOrEqual, "0");
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
738 query.Apply(s, *index_);
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
739 ASSERT_EQ(2u, s.size());
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
740 }
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
741
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
742 {
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
743 LookupIdentifierQuery query(ResourceType_Study);
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
744 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_GreaterOrEqual, "1");
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
745 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_SmallerOrEqual, "1");
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
746 query.Apply(s, *index_);
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
747 ASSERT_EQ(1u, s.size());
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
748 }
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
749
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
750 {
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
751 LookupIdentifierQuery query(ResourceType_Study);
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
752 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_GreaterOrEqual, "1");
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
753 query.Apply(s, *index_);
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
754 ASSERT_EQ(1u, s.size());
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
755 }
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
756
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
757 {
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
758 LookupIdentifierQuery query(ResourceType_Study);
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
759 query.AddConstraint(DICOM_TAG_STUDY_INSTANCE_UID, IdentifierConstraintType_GreaterOrEqual, "2");
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
760 query.Apply(s, *index_);
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
761 ASSERT_EQ(0u, s.size());
d143db00a794 SetOfResources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1744
diff changeset
762 }
562
f64e3838d6e1 refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 521
diff changeset
763 }
705
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
765
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
766
713
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
767 TEST(ServerIndex, AttachmentRecycling)
705
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
768 {
803
4689e400e0fa directory to store the results of the unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 738
diff changeset
769 const std::string path = "UnitTestsStorage";
1124
790ff7a5b3bf IStorageArea abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1030
diff changeset
770
2140
aa4b8895cd23 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2121
diff changeset
771 SystemToolbox::RemoveFile(path + "/index");
1124
790ff7a5b3bf IStorageArea abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1030
diff changeset
772 FilesystemStorage storage(path);
1247
32fcc5dc7562 abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1241
diff changeset
773 DatabaseWrapper db; // The SQLite DB is in memory
1672
4c5a85c3ff43 sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1549
diff changeset
774 db.Open();
1549
e5e975e9b738 refactoring and simplification of StorageAccessor
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1514
diff changeset
775 ServerContext context(db, storage);
705
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
776 ServerIndex& index = context.GetIndex();
707
203157cb4fde unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 706
diff changeset
777
706
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 705
diff changeset
778 index.SetMaximumStorageSize(10);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 705
diff changeset
779
705
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
780 Json::Value tmp;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
781 index.ComputeStatistics(tmp);
713
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
782 ASSERT_EQ(0, tmp["CountPatients"].asInt());
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
783 ASSERT_EQ(0, boost::lexical_cast<int>(tmp["TotalDiskSize"].asString()));
705
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
784
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
785 ServerIndex::Attachments attachments;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
786
713
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
787 std::vector<std::string> ids;
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
788 for (int i = 0; i < 10; i++)
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
789 {
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
790 std::string id = boost::lexical_cast<std::string>(i);
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
791 DicomMap instance;
2007
655489d9165d DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1971
diff changeset
792 instance.SetValue(DICOM_TAG_PATIENT_ID, "patient-" + id, false);
655489d9165d DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1971
diff changeset
793 instance.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "study-" + id, false);
655489d9165d DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1971
diff changeset
794 instance.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, "series-" + id, false);
655489d9165d DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1971
diff changeset
795 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
796 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
797
649d47854314 proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 831
diff changeset
798 std::map<MetadataType, std::string> instanceMetadata;
1822
9ed9458aa44f refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1764
diff changeset
799 DicomInstanceToStore toStore;
9ed9458aa44f refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1764
diff changeset
800 toStore.SetSummary(instance);
9ed9458aa44f refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1764
diff changeset
801 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
802 ASSERT_EQ(5u, instanceMetadata.size());
1029
9e04f9f36096 fix windows build
jodogne
parents: 1006
diff changeset
803 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_RemoteAet) != instanceMetadata.end());
9e04f9f36096 fix windows build
jodogne
parents: 1006
diff changeset
804 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_ReceptionDate) != instanceMetadata.end());
2190
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2172
diff changeset
805 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
806 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_SopClassUid) != instanceMetadata.end());
2190
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2172
diff changeset
807
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2172
diff changeset
808 // By default, an Explicit VR Little Endian is used by Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2172
diff changeset
809 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
810
2208
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2190
diff changeset
811 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
812
713
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
813 DicomInstanceHasher hasher(instance);
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
814 ids.push_back(hasher.HashPatient());
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
815 ids.push_back(hasher.HashStudy());
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
816 ids.push_back(hasher.HashSeries());
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
817 ids.push_back(hasher.HashInstance());
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
818 }
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
819
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
820 index.ComputeStatistics(tmp);
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
821 ASSERT_EQ(10, tmp["CountPatients"].asInt());
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
822 ASSERT_EQ(0, boost::lexical_cast<int>(tmp["TotalDiskSize"].asString()));
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
823
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
824 for (size_t i = 0; i < ids.size(); i++)
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
825 {
2172
84d1d392a9ab GenerateUuid() not available in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2142
diff changeset
826 FileInfo info(SystemToolbox::GenerateUuid(), FileContentType_Dicom, 1, "md5");
713
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
827 index.AddAttachment(info, ids[i]);
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
828
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
829 index.ComputeStatistics(tmp);
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
830 ASSERT_GE(10, boost::lexical_cast<int>(tmp["TotalDiskSize"].asString()));
9d1973813d8b test attachment recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
831 }
707
203157cb4fde unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 706
diff changeset
832
203157cb4fde unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 706
diff changeset
833 // 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
834 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
835
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
836 context.Stop();
1672
4c5a85c3ff43 sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1549
diff changeset
837 db.Close();
705
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
838 }
1764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1747
diff changeset
839
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1747
diff changeset
840
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1747
diff changeset
841 TEST(LookupIdentifierQuery, NormalizeIdentifier)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1747
diff changeset
842 {
2121
7e8889bc95c6 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
843 ASSERT_EQ("H^L.LO", ServerToolbox::NormalizeIdentifier(" Hé^l.LO %_ "));
7e8889bc95c6 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
844 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
845 }