Mercurial > hg > orthanc
annotate UnitTestsSources/UnitTestsMain.cpp @ 2457:2a211c0fc7ca
note about ar
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 04 Jan 2018 09:27:16 +0100 |
parents | 878b59270859 |
children | 8cc3ca64a534 |
rev | line source |
---|---|
827
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
1 /** |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
2 * Orthanc - A Lightweight, RESTful DICOM Store |
1900 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1102
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
2447
878b59270859
upgrade to year 2018
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2442
diff
changeset
|
5 * Copyright (C) 2017-2018 Osimis S.A., Belgium |
827
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
6 * |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
7 * This program is free software: you can redistribute it and/or |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
8 * modify it under the terms of the GNU General Public License as |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
9 * published by the Free Software Foundation, either version 3 of the |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
10 * License, or (at your option) any later version. |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
11 * |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
12 * In addition, as a special exception, the copyright holders of this |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
13 * program give permission to link the code of its release with the |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
14 * OpenSSL project's "OpenSSL" library (or with modified versions of it |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
15 * that use the same license as the "OpenSSL" library), and distribute |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
16 * the linked executables. You must obey the GNU General Public License |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
17 * in all respects for all of the code used other than "OpenSSL". If you |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
18 * modify file(s) with this exception, you may extend this exception to |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
19 * your version of the file(s), but you are not obligated to do so. If |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
20 * you do not wish to do so, delete this exception statement from your |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
21 * version. If you delete this exception statement from all source files |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
22 * in the program, then also delete it here. |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
23 * |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
24 * This program is distributed in the hope that it will be useful, but |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
25 * WITHOUT ANY WARRANTY; without even the implied warranty of |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
27 * General Public License for more details. |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
28 * |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
29 * You should have received a copy of the GNU General Public License |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
30 * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
31 **/ |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
32 |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
33 |
831
84513f2ee1f3
pch for unit tests and server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
827
diff
changeset
|
34 #include "PrecompiledHeadersUnitTests.h" |
434
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
35 #include "../Core/EnumerationDictionary.h" |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
36 |
0 | 37 #include "gtest/gtest.h" |
38 | |
39 #include <ctype.h> | |
40 | |
41 #include "../Core/DicomFormat/DicomTag.h" | |
1441
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1430
diff
changeset
|
42 #include "../Core/HttpServer/HttpToolbox.h" |
1485
27661b33f624
Creation of Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1441
diff
changeset
|
43 #include "../Core/Logging.h" |
63 | 44 #include "../Core/OrthancException.h" |
2142 | 45 #include "../Core/TemporaryFile.h" |
0 | 46 #include "../Core/Toolbox.h" |
63 | 47 #include "../OrthancServer/OrthancInitialization.h" |
0 | 48 |
1337 | 49 |
63 | 50 using namespace Orthanc; |
0 | 51 |
52 | |
53 TEST(Uuid, Generation) | |
54 { | |
55 for (int i = 0; i < 10; i++) | |
56 { | |
2172
84d1d392a9ab
GenerateUuid() not available in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2142
diff
changeset
|
57 std::string s = SystemToolbox::GenerateUuid(); |
0 | 58 ASSERT_TRUE(Toolbox::IsUuid(s)); |
59 } | |
60 } | |
61 | |
62 TEST(Uuid, Test) | |
63 { | |
64 ASSERT_FALSE(Toolbox::IsUuid("")); | |
65 ASSERT_FALSE(Toolbox::IsUuid("012345678901234567890123456789012345")); | |
66 ASSERT_TRUE(Toolbox::IsUuid("550e8400-e29b-41d4-a716-446655440000")); | |
708 | 67 ASSERT_FALSE(Toolbox::IsUuid("550e8400-e29b-41d4-a716-44665544000_")); |
707
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
68 ASSERT_FALSE(Toolbox::IsUuid("01234567890123456789012345678901234_")); |
402 | 69 ASSERT_FALSE(Toolbox::StartsWithUuid("550e8400-e29b-41d4-a716-44665544000")); |
70 ASSERT_TRUE(Toolbox::StartsWithUuid("550e8400-e29b-41d4-a716-446655440000")); | |
71 ASSERT_TRUE(Toolbox::StartsWithUuid("550e8400-e29b-41d4-a716-446655440000 ok")); | |
72 ASSERT_FALSE(Toolbox::StartsWithUuid("550e8400-e29b-41d4-a716-446655440000ok")); | |
73 } | |
74 | |
75 TEST(Toolbox, IsSHA1) | |
76 { | |
77 ASSERT_FALSE(Toolbox::IsSHA1("")); | |
78 ASSERT_FALSE(Toolbox::IsSHA1("01234567890123456789012345678901234567890123")); | |
79 ASSERT_FALSE(Toolbox::IsSHA1("012345678901234567890123456789012345678901234")); | |
80 ASSERT_TRUE(Toolbox::IsSHA1("b5ed549f-956400ce-69a8c063-bf5b78be-2732a4b9")); | |
81 | |
1428 | 82 std::string sha = " b5ed549f-956400ce-69a8c063-bf5b78be-2732a4b9 "; |
83 ASSERT_TRUE(Toolbox::IsSHA1(sha)); | |
84 sha[3] = '\0'; | |
85 sha[53] = '\0'; | |
86 ASSERT_TRUE(Toolbox::IsSHA1(sha)); | |
87 sha[40] = '\0'; | |
88 ASSERT_FALSE(Toolbox::IsSHA1(sha)); | |
89 ASSERT_FALSE(Toolbox::IsSHA1(" ")); | |
90 | |
91 ASSERT_TRUE(Toolbox::IsSHA1("16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0")); | |
92 | |
402 | 93 std::string s; |
94 Toolbox::ComputeSHA1(s, "The quick brown fox jumps over the lazy dog"); | |
95 ASSERT_TRUE(Toolbox::IsSHA1(s)); | |
96 ASSERT_EQ("2fd4e1c6-7a2d28fc-ed849ee1-bb76e739-1b93eb12", s); | |
707
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
97 |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
98 ASSERT_FALSE(Toolbox::IsSHA1("b5ed549f-956400ce-69a8c063-bf5b78be-2732a4b_")); |
0 | 99 } |
100 | |
708 | 101 |
912
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
102 TEST(ParseGetArguments, Basic) |
0 | 103 { |
1441
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1430
diff
changeset
|
104 IHttpHandler::GetArguments b; |
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1430
diff
changeset
|
105 HttpToolbox::ParseGetArguments(b, "aaa=baaa&bb=a&aa=c"); |
1363
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1337
diff
changeset
|
106 |
1441
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1430
diff
changeset
|
107 IHttpHandler::Arguments a; |
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1430
diff
changeset
|
108 HttpToolbox::CompileGetArguments(a, b); |
1363
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1337
diff
changeset
|
109 |
0 | 110 ASSERT_EQ(3u, a.size()); |
111 ASSERT_EQ(a["aaa"], "baaa"); | |
112 ASSERT_EQ(a["bb"], "a"); | |
113 ASSERT_EQ(a["aa"], "c"); | |
114 } | |
115 | |
912
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
116 TEST(ParseGetArguments, BasicEmpty) |
0 | 117 { |
1441
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1430
diff
changeset
|
118 IHttpHandler::GetArguments b; |
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1430
diff
changeset
|
119 HttpToolbox::ParseGetArguments(b, "aaa&bb=aa&aa"); |
1363
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1337
diff
changeset
|
120 |
1441
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1430
diff
changeset
|
121 IHttpHandler::Arguments a; |
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1430
diff
changeset
|
122 HttpToolbox::CompileGetArguments(a, b); |
1363
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1337
diff
changeset
|
123 |
0 | 124 ASSERT_EQ(3u, a.size()); |
125 ASSERT_EQ(a["aaa"], ""); | |
126 ASSERT_EQ(a["bb"], "aa"); | |
127 ASSERT_EQ(a["aa"], ""); | |
128 } | |
129 | |
912
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
130 TEST(ParseGetArguments, Single) |
0 | 131 { |
1441
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1430
diff
changeset
|
132 IHttpHandler::GetArguments b; |
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1430
diff
changeset
|
133 HttpToolbox::ParseGetArguments(b, "aaa=baaa"); |
1363
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1337
diff
changeset
|
134 |
1441
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1430
diff
changeset
|
135 IHttpHandler::Arguments a; |
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1430
diff
changeset
|
136 HttpToolbox::CompileGetArguments(a, b); |
1363
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1337
diff
changeset
|
137 |
0 | 138 ASSERT_EQ(1u, a.size()); |
139 ASSERT_EQ(a["aaa"], "baaa"); | |
140 } | |
141 | |
912
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
142 TEST(ParseGetArguments, SingleEmpty) |
0 | 143 { |
1441
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1430
diff
changeset
|
144 IHttpHandler::GetArguments b; |
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1430
diff
changeset
|
145 HttpToolbox::ParseGetArguments(b, "aaa"); |
1363
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1337
diff
changeset
|
146 |
1441
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1430
diff
changeset
|
147 IHttpHandler::Arguments a; |
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1430
diff
changeset
|
148 HttpToolbox::CompileGetArguments(a, b); |
1363
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1337
diff
changeset
|
149 |
0 | 150 ASSERT_EQ(1u, a.size()); |
151 ASSERT_EQ(a["aaa"], ""); | |
152 } | |
153 | |
912
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
154 TEST(ParseGetQuery, Test1) |
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
155 { |
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
156 UriComponents uri; |
1441
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1430
diff
changeset
|
157 IHttpHandler::GetArguments b; |
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1430
diff
changeset
|
158 HttpToolbox::ParseGetQuery(uri, b, "/instances/test/world?aaa=baaa&bb=a&aa=c"); |
1363
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1337
diff
changeset
|
159 |
1441
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1430
diff
changeset
|
160 IHttpHandler::Arguments a; |
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1430
diff
changeset
|
161 HttpToolbox::CompileGetArguments(a, b); |
1363
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1337
diff
changeset
|
162 |
912
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
163 ASSERT_EQ(3u, uri.size()); |
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
164 ASSERT_EQ("instances", uri[0]); |
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
165 ASSERT_EQ("test", uri[1]); |
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
166 ASSERT_EQ("world", uri[2]); |
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
167 ASSERT_EQ(3u, a.size()); |
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
168 ASSERT_EQ(a["aaa"], "baaa"); |
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
169 ASSERT_EQ(a["bb"], "a"); |
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
170 ASSERT_EQ(a["aa"], "c"); |
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
171 } |
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
172 |
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
173 TEST(ParseGetQuery, Test2) |
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
174 { |
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
175 UriComponents uri; |
1441
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1430
diff
changeset
|
176 IHttpHandler::GetArguments b; |
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1430
diff
changeset
|
177 HttpToolbox::ParseGetQuery(uri, b, "/instances/test/world"); |
1363
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1337
diff
changeset
|
178 |
1441
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1430
diff
changeset
|
179 IHttpHandler::Arguments a; |
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1430
diff
changeset
|
180 HttpToolbox::CompileGetArguments(a, b); |
1363
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1337
diff
changeset
|
181 |
912
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
182 ASSERT_EQ(3u, uri.size()); |
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
183 ASSERT_EQ("instances", uri[0]); |
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
184 ASSERT_EQ("test", uri[1]); |
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
185 ASSERT_EQ("world", uri[2]); |
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
186 ASSERT_EQ(0u, a.size()); |
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
187 } |
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
890
diff
changeset
|
188 |
0 | 189 TEST(Uri, SplitUriComponents) |
190 { | |
966
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
191 UriComponents c, d; |
0 | 192 Toolbox::SplitUriComponents(c, "/cou/hello/world"); |
193 ASSERT_EQ(3u, c.size()); | |
194 ASSERT_EQ("cou", c[0]); | |
195 ASSERT_EQ("hello", c[1]); | |
196 ASSERT_EQ("world", c[2]); | |
197 | |
198 Toolbox::SplitUriComponents(c, "/cou/hello/world/"); | |
199 ASSERT_EQ(3u, c.size()); | |
200 ASSERT_EQ("cou", c[0]); | |
201 ASSERT_EQ("hello", c[1]); | |
202 ASSERT_EQ("world", c[2]); | |
203 | |
204 Toolbox::SplitUriComponents(c, "/cou/hello/world/a"); | |
205 ASSERT_EQ(4u, c.size()); | |
206 ASSERT_EQ("cou", c[0]); | |
207 ASSERT_EQ("hello", c[1]); | |
208 ASSERT_EQ("world", c[2]); | |
209 ASSERT_EQ("a", c[3]); | |
210 | |
211 Toolbox::SplitUriComponents(c, "/"); | |
212 ASSERT_EQ(0u, c.size()); | |
213 | |
214 Toolbox::SplitUriComponents(c, "/hello"); | |
215 ASSERT_EQ(1u, c.size()); | |
216 ASSERT_EQ("hello", c[0]); | |
217 | |
218 Toolbox::SplitUriComponents(c, "/hello/"); | |
219 ASSERT_EQ(1u, c.size()); | |
220 ASSERT_EQ("hello", c[0]); | |
221 | |
63 | 222 ASSERT_THROW(Toolbox::SplitUriComponents(c, ""), OrthancException); |
223 ASSERT_THROW(Toolbox::SplitUriComponents(c, "a"), OrthancException); | |
207 | 224 ASSERT_THROW(Toolbox::SplitUriComponents(c, "/coucou//coucou"), OrthancException); |
707
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
225 |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
226 c.clear(); |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
227 c.push_back("test"); |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
228 ASSERT_EQ("/", Toolbox::FlattenUri(c, 10)); |
0 | 229 } |
230 | |
231 | |
966
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
232 TEST(Uri, Truncate) |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
233 { |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
234 UriComponents c, d; |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
235 Toolbox::SplitUriComponents(c, "/cou/hello/world"); |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
236 |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
237 Toolbox::TruncateUri(d, c, 0); |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
238 ASSERT_EQ(3u, d.size()); |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
239 ASSERT_EQ("cou", d[0]); |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
240 ASSERT_EQ("hello", d[1]); |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
241 ASSERT_EQ("world", d[2]); |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
242 |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
243 Toolbox::TruncateUri(d, c, 1); |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
244 ASSERT_EQ(2u, d.size()); |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
245 ASSERT_EQ("hello", d[0]); |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
246 ASSERT_EQ("world", d[1]); |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
247 |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
248 Toolbox::TruncateUri(d, c, 2); |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
249 ASSERT_EQ(1u, d.size()); |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
250 ASSERT_EQ("world", d[0]); |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
251 |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
252 Toolbox::TruncateUri(d, c, 3); |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
253 ASSERT_EQ(0u, d.size()); |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
254 |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
255 Toolbox::TruncateUri(d, c, 4); |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
256 ASSERT_EQ(0u, d.size()); |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
257 |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
258 Toolbox::TruncateUri(d, c, 5); |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
259 ASSERT_EQ(0u, d.size()); |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
260 } |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
261 |
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
262 |
0 | 263 TEST(Uri, Child) |
264 { | |
265 UriComponents c1; Toolbox::SplitUriComponents(c1, "/hello/world"); | |
266 UriComponents c2; Toolbox::SplitUriComponents(c2, "/hello/hello"); | |
267 UriComponents c3; Toolbox::SplitUriComponents(c3, "/hello"); | |
268 UriComponents c4; Toolbox::SplitUriComponents(c4, "/world"); | |
269 UriComponents c5; Toolbox::SplitUriComponents(c5, "/"); | |
270 | |
271 ASSERT_TRUE(Toolbox::IsChildUri(c1, c1)); | |
272 ASSERT_FALSE(Toolbox::IsChildUri(c1, c2)); | |
273 ASSERT_FALSE(Toolbox::IsChildUri(c1, c3)); | |
274 ASSERT_FALSE(Toolbox::IsChildUri(c1, c4)); | |
275 ASSERT_FALSE(Toolbox::IsChildUri(c1, c5)); | |
276 | |
277 ASSERT_FALSE(Toolbox::IsChildUri(c2, c1)); | |
278 ASSERT_TRUE(Toolbox::IsChildUri(c2, c2)); | |
279 ASSERT_FALSE(Toolbox::IsChildUri(c2, c3)); | |
280 ASSERT_FALSE(Toolbox::IsChildUri(c2, c4)); | |
281 ASSERT_FALSE(Toolbox::IsChildUri(c2, c5)); | |
282 | |
283 ASSERT_TRUE(Toolbox::IsChildUri(c3, c1)); | |
284 ASSERT_TRUE(Toolbox::IsChildUri(c3, c2)); | |
285 ASSERT_TRUE(Toolbox::IsChildUri(c3, c3)); | |
286 ASSERT_FALSE(Toolbox::IsChildUri(c3, c4)); | |
287 ASSERT_FALSE(Toolbox::IsChildUri(c3, c5)); | |
288 | |
289 ASSERT_FALSE(Toolbox::IsChildUri(c4, c1)); | |
290 ASSERT_FALSE(Toolbox::IsChildUri(c4, c2)); | |
291 ASSERT_FALSE(Toolbox::IsChildUri(c4, c3)); | |
292 ASSERT_TRUE(Toolbox::IsChildUri(c4, c4)); | |
293 ASSERT_FALSE(Toolbox::IsChildUri(c4, c5)); | |
294 | |
295 ASSERT_TRUE(Toolbox::IsChildUri(c5, c1)); | |
296 ASSERT_TRUE(Toolbox::IsChildUri(c5, c2)); | |
297 ASSERT_TRUE(Toolbox::IsChildUri(c5, c3)); | |
298 ASSERT_TRUE(Toolbox::IsChildUri(c5, c4)); | |
299 ASSERT_TRUE(Toolbox::IsChildUri(c5, c5)); | |
300 } | |
301 | |
302 TEST(Uri, AutodetectMimeType) | |
303 { | |
304 ASSERT_EQ("", Toolbox::AutodetectMimeType("../NOTES")); | |
305 ASSERT_EQ("", Toolbox::AutodetectMimeType("")); | |
306 ASSERT_EQ("", Toolbox::AutodetectMimeType("/")); | |
307 ASSERT_EQ("", Toolbox::AutodetectMimeType("a/a")); | |
308 | |
309 ASSERT_EQ("text/plain", Toolbox::AutodetectMimeType("../NOTES.txt")); | |
310 ASSERT_EQ("text/plain", Toolbox::AutodetectMimeType("../coucou.xml/NOTES.txt")); | |
311 ASSERT_EQ("text/xml", Toolbox::AutodetectMimeType("../.xml")); | |
312 | |
313 ASSERT_EQ("application/javascript", Toolbox::AutodetectMimeType("NOTES.js")); | |
314 ASSERT_EQ("application/json", Toolbox::AutodetectMimeType("NOTES.json")); | |
315 ASSERT_EQ("application/pdf", Toolbox::AutodetectMimeType("NOTES.pdf")); | |
316 ASSERT_EQ("text/css", Toolbox::AutodetectMimeType("NOTES.css")); | |
317 ASSERT_EQ("text/html", Toolbox::AutodetectMimeType("NOTES.html")); | |
318 ASSERT_EQ("text/plain", Toolbox::AutodetectMimeType("NOTES.txt")); | |
319 ASSERT_EQ("text/xml", Toolbox::AutodetectMimeType("NOTES.xml")); | |
320 ASSERT_EQ("image/gif", Toolbox::AutodetectMimeType("NOTES.gif")); | |
321 ASSERT_EQ("image/jpeg", Toolbox::AutodetectMimeType("NOTES.jpg")); | |
322 ASSERT_EQ("image/jpeg", Toolbox::AutodetectMimeType("NOTES.jpeg")); | |
323 ASSERT_EQ("image/png", Toolbox::AutodetectMimeType("NOTES.png")); | |
324 } | |
325 | |
22 | 326 TEST(Toolbox, ComputeMD5) |
327 { | |
328 std::string s; | |
329 | |
330 // # echo -n "Hello" | md5sum | |
331 | |
332 Toolbox::ComputeMD5(s, "Hello"); | |
333 ASSERT_EQ("8b1a9953c4611296a827abf8c47804d7", s); | |
334 Toolbox::ComputeMD5(s, ""); | |
335 ASSERT_EQ("d41d8cd98f00b204e9800998ecf8427e", s); | |
336 } | |
337 | |
177 | 338 TEST(Toolbox, ComputeSHA1) |
339 { | |
340 std::string s; | |
341 | |
342 Toolbox::ComputeSHA1(s, "The quick brown fox jumps over the lazy dog"); | |
343 ASSERT_EQ("2fd4e1c6-7a2d28fc-ed849ee1-bb76e739-1b93eb12", s); | |
344 Toolbox::ComputeSHA1(s, ""); | |
345 ASSERT_EQ("da39a3ee-5e6b4b0d-3255bfef-95601890-afd80709", s); | |
346 } | |
347 | |
348 | |
809
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
349 static std::string EncodeBase64Bis(const std::string& s) |
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
350 { |
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
351 std::string result; |
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
352 Toolbox::EncodeBase64(result, s); |
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
353 return result; |
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
354 } |
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
355 |
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
356 |
24 | 357 TEST(Toolbox, Base64) |
358 { | |
809
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
359 ASSERT_EQ("", EncodeBase64Bis("")); |
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
360 ASSERT_EQ("YQ==", EncodeBase64Bis("a")); |
707
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
361 |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
362 const std::string hello = "SGVsbG8gd29ybGQ="; |
809
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
363 ASSERT_EQ(hello, EncodeBase64Bis("Hello world")); |
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
364 |
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
365 std::string decoded; |
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
366 Toolbox::DecodeBase64(decoded, hello); |
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
367 ASSERT_EQ("Hello world", decoded); |
1988
e29aea2349b9
test validity of base64 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1976
diff
changeset
|
368 |
e29aea2349b9
test validity of base64 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1976
diff
changeset
|
369 // Invalid character |
e29aea2349b9
test validity of base64 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1976
diff
changeset
|
370 ASSERT_THROW(Toolbox::DecodeBase64(decoded, "?"), OrthancException); |
e29aea2349b9
test validity of base64 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1976
diff
changeset
|
371 |
e29aea2349b9
test validity of base64 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1976
diff
changeset
|
372 // All the allowed characters |
e29aea2349b9
test validity of base64 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1976
diff
changeset
|
373 Toolbox::DecodeBase64(decoded, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="); |
24 | 374 } |
375 | |
87
8517e2c44283
path to configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
63
diff
changeset
|
376 TEST(Toolbox, PathToExecutable) |
8517e2c44283
path to configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
63
diff
changeset
|
377 { |
2140 | 378 printf("[%s]\n", SystemToolbox::GetPathToExecutable().c_str()); |
379 printf("[%s]\n", SystemToolbox::GetDirectoryOfExecutable().c_str()); | |
87
8517e2c44283
path to configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
63
diff
changeset
|
380 } |
8517e2c44283
path to configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
63
diff
changeset
|
381 |
247
c9b3ba0fd140
path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
382 TEST(Toolbox, StripSpaces) |
c9b3ba0fd140
path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
383 { |
c9b3ba0fd140
path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
384 ASSERT_EQ("", Toolbox::StripSpaces(" \t \r \n ")); |
c9b3ba0fd140
path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
385 ASSERT_EQ("coucou", Toolbox::StripSpaces(" coucou \t \r \n ")); |
c9b3ba0fd140
path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
386 ASSERT_EQ("cou cou", Toolbox::StripSpaces(" cou cou \n ")); |
c9b3ba0fd140
path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
387 ASSERT_EQ("c", Toolbox::StripSpaces(" \n\t c\r \n ")); |
c9b3ba0fd140
path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
388 } |
100
27dc762e3dc8
getting rid of static dcmtk for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
389 |
707
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
390 TEST(Toolbox, Case) |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
391 { |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
392 std::string s = "CoU"; |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
393 std::string ss; |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
394 |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
395 Toolbox::ToUpperCase(ss, s); |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
396 ASSERT_EQ("COU", ss); |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
397 Toolbox::ToLowerCase(ss, s); |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
398 ASSERT_EQ("cou", ss); |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
399 |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
400 s = "CoU"; |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
401 Toolbox::ToUpperCase(s); |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
402 ASSERT_EQ("COU", s); |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
403 |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
404 s = "CoU"; |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
405 Toolbox::ToLowerCase(s); |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
406 ASSERT_EQ("cou", s); |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
407 } |
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
408 |
100
27dc762e3dc8
getting rid of static dcmtk for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
409 |
27dc762e3dc8
getting rid of static dcmtk for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
410 TEST(Logger, Basic) |
27dc762e3dc8
getting rid of static dcmtk for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
411 { |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
412 LOG(INFO) << "I say hello"; |
100
27dc762e3dc8
getting rid of static dcmtk for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
413 } |
27dc762e3dc8
getting rid of static dcmtk for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
414 |
107
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
415 TEST(Toolbox, ConvertFromLatin1) |
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
416 { |
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
417 // This is a Latin-1 test string |
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
418 const unsigned char data[10] = { 0xe0, 0xe9, 0xea, 0xe7, 0x26, 0xc6, 0x61, 0x62, 0x63, 0x00 }; |
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
419 |
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
420 std::string s((char*) &data[0], 10); |
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
421 ASSERT_EQ("&abc", Toolbox::ConvertToAscii(s)); |
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
422 |
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
423 // Open in Emacs, then save with UTF-8 encoding, then "hexdump -C" |
949
766a57997121
enumeration for encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
930
diff
changeset
|
424 std::string utf8 = Toolbox::ConvertToUtf8(s, Encoding_Latin1); |
235 | 425 ASSERT_EQ(15u, utf8.size()); |
107
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
426 ASSERT_EQ(0xc3, static_cast<unsigned char>(utf8[0])); |
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
427 ASSERT_EQ(0xa0, static_cast<unsigned char>(utf8[1])); |
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
428 ASSERT_EQ(0xc3, static_cast<unsigned char>(utf8[2])); |
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
429 ASSERT_EQ(0xa9, static_cast<unsigned char>(utf8[3])); |
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
430 ASSERT_EQ(0xc3, static_cast<unsigned char>(utf8[4])); |
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
431 ASSERT_EQ(0xaa, static_cast<unsigned char>(utf8[5])); |
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
432 ASSERT_EQ(0xc3, static_cast<unsigned char>(utf8[6])); |
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
433 ASSERT_EQ(0xa7, static_cast<unsigned char>(utf8[7])); |
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
434 ASSERT_EQ(0x26, static_cast<unsigned char>(utf8[8])); |
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
435 ASSERT_EQ(0xc3, static_cast<unsigned char>(utf8[9])); |
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
436 ASSERT_EQ(0x86, static_cast<unsigned char>(utf8[10])); |
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
437 ASSERT_EQ(0x61, static_cast<unsigned char>(utf8[11])); |
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
438 ASSERT_EQ(0x62, static_cast<unsigned char>(utf8[12])); |
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
439 ASSERT_EQ(0x63, static_cast<unsigned char>(utf8[13])); |
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
440 ASSERT_EQ(0x00, static_cast<unsigned char>(utf8[14])); // Null-terminated string |
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
441 } |
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
442 |
336 | 443 TEST(Toolbox, UrlDecode) |
444 { | |
445 std::string s; | |
446 | |
447 s = "Hello%20World"; | |
448 Toolbox::UrlDecode(s); | |
449 ASSERT_EQ("Hello World", s); | |
450 | |
337 | 451 s = "%21%23%24%26%27%28%29%2A%2B%2c%2f%3A%3b%3d%3f%40%5B%5D%90%ff"; |
336 | 452 Toolbox::UrlDecode(s); |
337 | 453 std::string ss = "!#$&'()*+,/:;=?@[]"; |
454 ss.push_back((char) 144); | |
455 ss.push_back((char) 255); | |
456 ASSERT_EQ(ss, s); | |
336 | 457 |
458 s = "(2000%2C00A4)+Other"; | |
459 Toolbox::UrlDecode(s); | |
460 ASSERT_EQ("(2000,00A4) Other", s); | |
461 } | |
462 | |
100
27dc762e3dc8
getting rid of static dcmtk for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
463 |
2442
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
464 TEST(Toolbox, IsAsciiString) |
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
465 { |
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
466 std::string s = "Hello 12 /"; |
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
467 ASSERT_EQ(10u, s.size()); |
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
468 ASSERT_TRUE(Toolbox::IsAsciiString(s)); |
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
469 ASSERT_TRUE(Toolbox::IsAsciiString(s.c_str(), 10)); |
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
470 ASSERT_FALSE(Toolbox::IsAsciiString(s.c_str(), 11)); // Taking the trailing hidden '\0' |
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
471 |
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
472 s[2] = '\0'; |
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
473 ASSERT_EQ(10u, s.size()); |
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
474 ASSERT_FALSE(Toolbox::IsAsciiString(s)); |
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
475 } |
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
476 |
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
477 |
1976
325772dadcd6
Macro "__linux" (now obsolete) replaced by macro "__linux__"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1971
diff
changeset
|
478 #if defined(__linux__) |
429
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
402
diff
changeset
|
479 TEST(OrthancInitialization, AbsoluteDirectory) |
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
402
diff
changeset
|
480 { |
810
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
809
diff
changeset
|
481 ASSERT_EQ("/tmp/hello", Configuration::InterpretRelativePath("/tmp", "hello")); |
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
809
diff
changeset
|
482 ASSERT_EQ("/tmp", Configuration::InterpretRelativePath("/tmp", "/tmp")); |
429
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
402
diff
changeset
|
483 } |
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
402
diff
changeset
|
484 #endif |
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
402
diff
changeset
|
485 |
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
402
diff
changeset
|
486 |
434
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
487 |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
488 #include "../OrthancServer/ServerEnumerations.h" |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
489 |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
490 TEST(EnumerationDictionary, Simple) |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
491 { |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
492 Toolbox::EnumerationDictionary<MetadataType> d; |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
493 |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
494 ASSERT_THROW(d.Translate("ReceptionDate"), OrthancException); |
435
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
495 ASSERT_EQ(MetadataType_ModifiedFrom, d.Translate("5")); |
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
435
diff
changeset
|
496 ASSERT_EQ(256, d.Translate("256")); |
434
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
497 |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
498 d.Add(MetadataType_Instance_ReceptionDate, "ReceptionDate"); |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
499 |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
500 ASSERT_EQ(MetadataType_Instance_ReceptionDate, d.Translate("ReceptionDate")); |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
501 ASSERT_EQ(MetadataType_Instance_ReceptionDate, d.Translate("2")); |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
502 ASSERT_EQ("ReceptionDate", d.Translate(MetadataType_Instance_ReceptionDate)); |
435
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
503 |
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
504 ASSERT_THROW(d.Add(MetadataType_Instance_ReceptionDate, "Hello"), OrthancException); |
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
505 ASSERT_THROW(d.Add(MetadataType_ModifiedFrom, "ReceptionDate"), OrthancException); // already used |
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
506 ASSERT_THROW(d.Add(MetadataType_ModifiedFrom, "1024"), OrthancException); // cannot register numbers |
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
507 d.Add(MetadataType_ModifiedFrom, "ModifiedFrom"); // ok |
434
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
508 } |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
509 |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
510 |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
511 TEST(EnumerationDictionary, ServerEnumerations) |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
512 { |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
513 ASSERT_STREQ("Patient", EnumerationToString(ResourceType_Patient)); |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
514 ASSERT_STREQ("Study", EnumerationToString(ResourceType_Study)); |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
515 ASSERT_STREQ("Series", EnumerationToString(ResourceType_Series)); |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
516 ASSERT_STREQ("Instance", EnumerationToString(ResourceType_Instance)); |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
517 |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
518 ASSERT_STREQ("ModifiedSeries", EnumerationToString(ChangeType_ModifiedSeries)); |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
519 |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
520 ASSERT_STREQ("Failure", EnumerationToString(StoreStatus_Failure)); |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
521 ASSERT_STREQ("Success", EnumerationToString(StoreStatus_Success)); |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
522 |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
523 ASSERT_STREQ("CompletedSeries", EnumerationToString(ChangeType_CompletedSeries)); |
435
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
524 |
437 | 525 ASSERT_EQ("IndexInSeries", EnumerationToString(MetadataType_Instance_IndexInSeries)); |
526 ASSERT_EQ("LastUpdate", EnumerationToString(MetadataType_LastUpdate)); | |
435
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
527 |
559 | 528 ASSERT_EQ(ResourceType_Patient, StringToResourceType("PATienT")); |
529 ASSERT_EQ(ResourceType_Study, StringToResourceType("STudy")); | |
530 ASSERT_EQ(ResourceType_Series, StringToResourceType("SeRiEs")); | |
531 ASSERT_EQ(ResourceType_Instance, StringToResourceType("INStance")); | |
532 ASSERT_EQ(ResourceType_Instance, StringToResourceType("IMagE")); | |
533 ASSERT_THROW(StringToResourceType("heLLo"), OrthancException); | |
534 | |
435
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
535 ASSERT_EQ(2047, StringToMetadata("2047")); |
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
536 ASSERT_THROW(StringToMetadata("Ceci est un test"), OrthancException); |
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
537 ASSERT_THROW(RegisterUserMetadata(128, ""), OrthancException); // too low (< 1024) |
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
538 ASSERT_THROW(RegisterUserMetadata(128000, ""), OrthancException); // too high (> 65535) |
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
539 RegisterUserMetadata(2047, "Ceci est un test"); |
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
540 ASSERT_EQ(2047, StringToMetadata("2047")); |
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
541 ASSERT_EQ(2047, StringToMetadata("Ceci est un test")); |
1429
7366a0bdda6a
attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1428
diff
changeset
|
542 |
7366a0bdda6a
attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1428
diff
changeset
|
543 ASSERT_STREQ("Generic", EnumerationToString(StringToModalityManufacturer("Generic"))); |
2319
ae6245053bcf
made some manufacturer obsolete: MedInria (that was not used), Syngovia & AgfaImpax (replaced by GenericNoWildcardInDates) + added 'GenericNoWildcards'
amazy
parents:
2313
diff
changeset
|
544 ASSERT_STREQ("GenericNoWildcardInDates", EnumerationToString(StringToModalityManufacturer("GenericNoWildcardInDates"))); |
2352
3ab96768d144
Fix issue 52 (DICOM level security association problems)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2319
diff
changeset
|
545 ASSERT_STREQ("GenericNoUniversalWildcard", EnumerationToString(StringToModalityManufacturer("GenericNoUniversalWildcard"))); |
1429
7366a0bdda6a
attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1428
diff
changeset
|
546 ASSERT_STREQ("StoreScp", EnumerationToString(StringToModalityManufacturer("StoreScp"))); |
7366a0bdda6a
attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1428
diff
changeset
|
547 ASSERT_STREQ("ClearCanvas", EnumerationToString(StringToModalityManufacturer("ClearCanvas"))); |
7366a0bdda6a
attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1428
diff
changeset
|
548 ASSERT_STREQ("Dcm4Chee", EnumerationToString(StringToModalityManufacturer("Dcm4Chee"))); |
1852
efbc3afd6cd3
Efilm and Vitrea manufacturers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1846
diff
changeset
|
549 ASSERT_STREQ("Vitrea", EnumerationToString(StringToModalityManufacturer("Vitrea"))); |
2319
ae6245053bcf
made some manufacturer obsolete: MedInria (that was not used), Syngovia & AgfaImpax (replaced by GenericNoWildcardInDates) + added 'GenericNoWildcards'
amazy
parents:
2313
diff
changeset
|
550 // backward compatibility tests (to remove once we make these manufacturer really obsolete) |
ae6245053bcf
made some manufacturer obsolete: MedInria (that was not used), Syngovia & AgfaImpax (replaced by GenericNoWildcardInDates) + added 'GenericNoWildcards'
amazy
parents:
2313
diff
changeset
|
551 ASSERT_STREQ("Generic", EnumerationToString(StringToModalityManufacturer("MedInria"))); |
ae6245053bcf
made some manufacturer obsolete: MedInria (that was not used), Syngovia & AgfaImpax (replaced by GenericNoWildcardInDates) + added 'GenericNoWildcards'
amazy
parents:
2313
diff
changeset
|
552 ASSERT_STREQ("Generic", EnumerationToString(StringToModalityManufacturer("EFilm2"))); |
ae6245053bcf
made some manufacturer obsolete: MedInria (that was not used), Syngovia & AgfaImpax (replaced by GenericNoWildcardInDates) + added 'GenericNoWildcards'
amazy
parents:
2313
diff
changeset
|
553 ASSERT_STREQ("GenericNoWildcardInDates", EnumerationToString(StringToModalityManufacturer("SyngoVia"))); |
ae6245053bcf
made some manufacturer obsolete: MedInria (that was not used), Syngovia & AgfaImpax (replaced by GenericNoWildcardInDates) + added 'GenericNoWildcards'
amazy
parents:
2313
diff
changeset
|
554 ASSERT_STREQ("GenericNoWildcardInDates", EnumerationToString(StringToModalityManufacturer("AgfaImpax"))); |
434
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
555 } |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
556 |
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
557 |
450 | 558 |
483
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
559 TEST(Toolbox, WriteFile) |
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
560 { |
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
561 std::string path; |
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
562 |
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
563 { |
2140 | 564 TemporaryFile tmp; |
483
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
565 path = tmp.GetPath(); |
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
566 |
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
567 std::string s; |
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
568 s.append("Hello"); |
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
569 s.push_back('\0'); |
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
570 s.append("World"); |
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
571 ASSERT_EQ(11u, s.size()); |
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
572 |
2140 | 573 SystemToolbox::WriteFile(s, path.c_str()); |
483
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
574 |
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
575 std::string t; |
2140 | 576 SystemToolbox::ReadFile(t, path.c_str()); |
483
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
577 |
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
578 ASSERT_EQ(11u, t.size()); |
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
579 ASSERT_EQ(0, t[5]); |
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
580 ASSERT_EQ(0, memcmp(s.c_str(), t.c_str(), s.size())); |
1933
ff11ba08e5d0
Toolbox::ReadHeader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
581 |
ff11ba08e5d0
Toolbox::ReadHeader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
582 std::string h; |
2140 | 583 ASSERT_EQ(true, SystemToolbox::ReadHeader(h, path.c_str(), 1)); |
1971
869a87c08673
fix for mingw <= 4.2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1969
diff
changeset
|
584 ASSERT_EQ(1u, h.size()); |
1933
ff11ba08e5d0
Toolbox::ReadHeader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
585 ASSERT_EQ('H', h[0]); |
2140 | 586 ASSERT_TRUE(SystemToolbox::ReadHeader(h, path.c_str(), 0)); |
1971
869a87c08673
fix for mingw <= 4.2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1969
diff
changeset
|
587 ASSERT_EQ(0u, h.size()); |
2140 | 588 ASSERT_FALSE(SystemToolbox::ReadHeader(h, path.c_str(), 32)); |
1933
ff11ba08e5d0
Toolbox::ReadHeader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
589 ASSERT_EQ(11u, h.size()); |
ff11ba08e5d0
Toolbox::ReadHeader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
590 ASSERT_EQ(0, memcmp(s.c_str(), h.c_str(), s.size())); |
483
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
591 } |
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
592 |
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
593 std::string u; |
2140 | 594 ASSERT_THROW(SystemToolbox::ReadFile(u, path.c_str()), OrthancException); |
483
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
595 } |
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
596 |
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
597 |
608 | 598 TEST(Toolbox, Wildcard) |
599 { | |
600 ASSERT_EQ("abcd", Toolbox::WildcardToRegularExpression("abcd")); | |
601 ASSERT_EQ("ab.*cd", Toolbox::WildcardToRegularExpression("ab*cd")); | |
602 ASSERT_EQ("ab..cd", Toolbox::WildcardToRegularExpression("ab??cd")); | |
603 ASSERT_EQ("a.*b.c.*d", Toolbox::WildcardToRegularExpression("a*b?c*d")); | |
604 ASSERT_EQ("a\\{b\\]", Toolbox::WildcardToRegularExpression("a{b]")); | |
605 } | |
606 | |
607 | |
608 TEST(Toolbox, Tokenize) | |
609 { | |
610 std::vector<std::string> t; | |
611 | |
612 Toolbox::TokenizeString(t, "", ','); | |
1492 | 613 ASSERT_EQ(1u, t.size()); |
608 | 614 ASSERT_EQ("", t[0]); |
615 | |
616 Toolbox::TokenizeString(t, "abc", ','); | |
1492 | 617 ASSERT_EQ(1u, t.size()); |
608 | 618 ASSERT_EQ("abc", t[0]); |
619 | |
620 Toolbox::TokenizeString(t, "ab,cd,ef,", ','); | |
1492 | 621 ASSERT_EQ(4u, t.size()); |
608 | 622 ASSERT_EQ("ab", t[0]); |
623 ASSERT_EQ("cd", t[1]); | |
624 ASSERT_EQ("ef", t[2]); | |
625 ASSERT_EQ("", t[3]); | |
626 } | |
627 | |
1086
e56c3ed8d738
Parameter to set the default encoding for DICOM files without SpecificCharacterSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1050
diff
changeset
|
628 TEST(Toolbox, Enumerations) |
e56c3ed8d738
Parameter to set the default encoding for DICOM files without SpecificCharacterSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1050
diff
changeset
|
629 { |
e56c3ed8d738
Parameter to set the default encoding for DICOM files without SpecificCharacterSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1050
diff
changeset
|
630 ASSERT_EQ(Encoding_Utf8, StringToEncoding(EnumerationToString(Encoding_Utf8))); |
e56c3ed8d738
Parameter to set the default encoding for DICOM files without SpecificCharacterSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1050
diff
changeset
|
631 ASSERT_EQ(Encoding_Ascii, StringToEncoding(EnumerationToString(Encoding_Ascii))); |
e56c3ed8d738
Parameter to set the default encoding for DICOM files without SpecificCharacterSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1050
diff
changeset
|
632 ASSERT_EQ(Encoding_Latin1, StringToEncoding(EnumerationToString(Encoding_Latin1))); |
1087 | 633 ASSERT_EQ(Encoding_Latin2, StringToEncoding(EnumerationToString(Encoding_Latin2))); |
634 ASSERT_EQ(Encoding_Latin3, StringToEncoding(EnumerationToString(Encoding_Latin3))); | |
635 ASSERT_EQ(Encoding_Latin4, StringToEncoding(EnumerationToString(Encoding_Latin4))); | |
636 ASSERT_EQ(Encoding_Latin5, StringToEncoding(EnumerationToString(Encoding_Latin5))); | |
637 ASSERT_EQ(Encoding_Cyrillic, StringToEncoding(EnumerationToString(Encoding_Cyrillic))); | |
638 ASSERT_EQ(Encoding_Arabic, StringToEncoding(EnumerationToString(Encoding_Arabic))); | |
639 ASSERT_EQ(Encoding_Greek, StringToEncoding(EnumerationToString(Encoding_Greek))); | |
640 ASSERT_EQ(Encoding_Hebrew, StringToEncoding(EnumerationToString(Encoding_Hebrew))); | |
1090
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
641 ASSERT_EQ(Encoding_Japanese, StringToEncoding(EnumerationToString(Encoding_Japanese))); |
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
642 ASSERT_EQ(Encoding_Chinese, StringToEncoding(EnumerationToString(Encoding_Chinese))); |
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
643 ASSERT_EQ(Encoding_Thai, StringToEncoding(EnumerationToString(Encoding_Thai))); |
1086
e56c3ed8d738
Parameter to set the default encoding for DICOM files without SpecificCharacterSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1050
diff
changeset
|
644 |
e56c3ed8d738
Parameter to set the default encoding for DICOM files without SpecificCharacterSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1050
diff
changeset
|
645 ASSERT_EQ(ResourceType_Patient, StringToResourceType(EnumerationToString(ResourceType_Patient))); |
e56c3ed8d738
Parameter to set the default encoding for DICOM files without SpecificCharacterSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1050
diff
changeset
|
646 ASSERT_EQ(ResourceType_Study, StringToResourceType(EnumerationToString(ResourceType_Study))); |
e56c3ed8d738
Parameter to set the default encoding for DICOM files without SpecificCharacterSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1050
diff
changeset
|
647 ASSERT_EQ(ResourceType_Series, StringToResourceType(EnumerationToString(ResourceType_Series))); |
e56c3ed8d738
Parameter to set the default encoding for DICOM files without SpecificCharacterSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1050
diff
changeset
|
648 ASSERT_EQ(ResourceType_Instance, StringToResourceType(EnumerationToString(ResourceType_Instance))); |
e56c3ed8d738
Parameter to set the default encoding for DICOM files without SpecificCharacterSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1050
diff
changeset
|
649 |
e56c3ed8d738
Parameter to set the default encoding for DICOM files without SpecificCharacterSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1050
diff
changeset
|
650 ASSERT_EQ(ImageFormat_Png, StringToImageFormat(EnumerationToString(ImageFormat_Png))); |
2281
e002430baa41
Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
651 |
e002430baa41
Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
652 ASSERT_EQ(PhotometricInterpretation_ARGB, StringToPhotometricInterpretation(EnumerationToString(PhotometricInterpretation_ARGB))); |
e002430baa41
Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
653 ASSERT_EQ(PhotometricInterpretation_CMYK, StringToPhotometricInterpretation(EnumerationToString(PhotometricInterpretation_CMYK))); |
e002430baa41
Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
654 ASSERT_EQ(PhotometricInterpretation_HSV, StringToPhotometricInterpretation(EnumerationToString(PhotometricInterpretation_HSV))); |
e002430baa41
Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
655 ASSERT_EQ(PhotometricInterpretation_Monochrome1, StringToPhotometricInterpretation(EnumerationToString(PhotometricInterpretation_Monochrome1))); |
e002430baa41
Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
656 ASSERT_EQ(PhotometricInterpretation_Monochrome2, StringToPhotometricInterpretation(EnumerationToString(PhotometricInterpretation_Monochrome2))); |
e002430baa41
Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
657 ASSERT_EQ(PhotometricInterpretation_Palette, StringToPhotometricInterpretation(EnumerationToString(PhotometricInterpretation_Palette))); |
e002430baa41
Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
658 ASSERT_EQ(PhotometricInterpretation_RGB, StringToPhotometricInterpretation(EnumerationToString(PhotometricInterpretation_RGB))); |
e002430baa41
Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
659 ASSERT_EQ(PhotometricInterpretation_YBRFull, StringToPhotometricInterpretation(EnumerationToString(PhotometricInterpretation_YBRFull))); |
e002430baa41
Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
660 ASSERT_EQ(PhotometricInterpretation_YBRFull422, StringToPhotometricInterpretation(EnumerationToString(PhotometricInterpretation_YBRFull422))); |
e002430baa41
Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
661 ASSERT_EQ(PhotometricInterpretation_YBRPartial420, StringToPhotometricInterpretation(EnumerationToString(PhotometricInterpretation_YBRPartial420))); |
e002430baa41
Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
662 ASSERT_EQ(PhotometricInterpretation_YBRPartial422, StringToPhotometricInterpretation(EnumerationToString(PhotometricInterpretation_YBRPartial422))); |
e002430baa41
Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
663 ASSERT_EQ(PhotometricInterpretation_YBR_ICT, StringToPhotometricInterpretation(EnumerationToString(PhotometricInterpretation_YBR_ICT))); |
e002430baa41
Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
664 ASSERT_EQ(PhotometricInterpretation_YBR_RCT, StringToPhotometricInterpretation(EnumerationToString(PhotometricInterpretation_YBR_RCT))); |
e002430baa41
Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
665 |
e002430baa41
Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
666 ASSERT_STREQ("Unknown", EnumerationToString(PhotometricInterpretation_Unknown)); |
e002430baa41
Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
667 ASSERT_THROW(StringToPhotometricInterpretation("Unknown"), OrthancException); |
2309
4dc313b9a20a
Argument "DicomVersion" in URIs "/{...}/{...}/anonymization"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2281
diff
changeset
|
668 |
4dc313b9a20a
Argument "DicomVersion" in URIs "/{...}/{...}/anonymization"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2281
diff
changeset
|
669 ASSERT_EQ(DicomVersion_2008, StringToDicomVersion(EnumerationToString(DicomVersion_2008))); |
4dc313b9a20a
Argument "DicomVersion" in URIs "/{...}/{...}/anonymization"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2281
diff
changeset
|
670 ASSERT_EQ(DicomVersion_2017c, StringToDicomVersion(EnumerationToString(DicomVersion_2017c))); |
1086
e56c3ed8d738
Parameter to set the default encoding for DICOM files without SpecificCharacterSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1050
diff
changeset
|
671 } |
e56c3ed8d738
Parameter to set the default encoding for DICOM files without SpecificCharacterSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1050
diff
changeset
|
672 |
608 | 673 |
674
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
674 |
2364 | 675 #if defined(__linux__) || defined(__OpenBSD__) |
674
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
676 #include <endian.h> |
1337 | 677 #elif defined(__FreeBSD__) |
678 #include <machine/endian.h> | |
674
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
679 #endif |
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
680 |
1337 | 681 |
637 | 682 TEST(Toolbox, Endianness) |
683 { | |
674
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
684 // Parts of this test come from Adam Conrad |
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
685 // http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=728822#5 |
637 | 686 |
1337 | 687 |
688 /** | |
689 * Windows and OS X are assumed to always little-endian. | |
690 **/ | |
691 | |
692 #if defined(_WIN32) || defined(__APPLE__) | |
637 | 693 ASSERT_EQ(Endianness_Little, Toolbox::DetectEndianness()); |
674
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
694 |
918 | 695 |
1337 | 696 /** |
697 * Linux. | |
698 **/ | |
699 | |
1976
325772dadcd6
Macro "__linux" (now obsolete) replaced by macro "__linux__"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1971
diff
changeset
|
700 #elif defined(__linux__) || defined(__FreeBSD_kernel__) |
674
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
701 |
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
702 #if !defined(__BYTE_ORDER) |
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
703 # error Support your platform here |
637 | 704 #endif |
705 | |
674
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
706 # if __BYTE_ORDER == __BIG_ENDIAN |
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
707 ASSERT_EQ(Endianness_Big, Toolbox::DetectEndianness()); |
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
708 # else // __LITTLE_ENDIAN |
637 | 709 ASSERT_EQ(Endianness_Little, Toolbox::DetectEndianness()); |
674
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
710 # endif |
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
711 |
1337 | 712 |
713 /** | |
714 * FreeBSD. | |
715 **/ | |
716 | |
2364 | 717 #elif defined(__FreeBSD__) || defined(__OpenBSD__) |
1337 | 718 # if _BYTE_ORDER == _BIG_ENDIAN |
719 ASSERT_EQ(Endianness_Big, Toolbox::DetectEndianness()); | |
720 # else // _LITTLE_ENDIAN | |
721 ASSERT_EQ(Endianness_Little, Toolbox::DetectEndianness()); | |
722 # endif | |
723 | |
674
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
724 #else |
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
725 #error Support your platform here |
637 | 726 #endif |
727 } | |
728 | |
729 | |
1938 | 730 #include "../Core/Endianness.h" |
731 | |
732 static void ASSERT_EQ16(uint16_t a, uint16_t b) | |
733 { | |
1939
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
734 #ifdef __MINGW32__ |
1938 | 735 // This cast solves a linking problem with MinGW |
736 ASSERT_EQ(static_cast<unsigned int>(a), static_cast<unsigned int>(b)); | |
1939
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
737 #else |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
738 ASSERT_EQ(a, b); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
739 #endif |
1938 | 740 } |
741 | |
742 static void ASSERT_NE16(uint16_t a, uint16_t b) | |
743 { | |
1939
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
744 #ifdef __MINGW32__ |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
745 // This cast solves a linking problem with MinGW |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
746 ASSERT_NE(static_cast<unsigned int>(a), static_cast<unsigned int>(b)); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
747 #else |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
748 ASSERT_NE(a, b); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
749 #endif |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
750 } |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
751 |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
752 static void ASSERT_EQ32(uint32_t a, uint32_t b) |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
753 { |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
754 #ifdef __MINGW32__ |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
755 // This cast solves a linking problem with MinGW |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
756 ASSERT_EQ(static_cast<unsigned int>(a), static_cast<unsigned int>(b)); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
757 #else |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
758 ASSERT_EQ(a, b); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
759 #endif |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
760 } |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
761 |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
762 static void ASSERT_NE32(uint32_t a, uint32_t b) |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
763 { |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
764 #ifdef __MINGW32__ |
1938 | 765 // This cast solves a linking problem with MinGW |
766 ASSERT_NE(static_cast<unsigned int>(a), static_cast<unsigned int>(b)); | |
1939
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
767 #else |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
768 ASSERT_NE(a, b); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
769 #endif |
1938 | 770 } |
771 | |
1939
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
772 static void ASSERT_EQ64(uint64_t a, uint64_t b) |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
773 { |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
774 #ifdef __MINGW32__ |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
775 // This cast solves a linking problem with MinGW |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
776 ASSERT_EQ(static_cast<unsigned int>(a), static_cast<unsigned int>(b)); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
777 #else |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
778 ASSERT_EQ(a, b); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
779 #endif |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
780 } |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
781 |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
782 static void ASSERT_NE64(uint64_t a, uint64_t b) |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
783 { |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
784 #ifdef __MINGW32__ |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
785 // This cast solves a linking problem with MinGW |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
786 ASSERT_NE(static_cast<unsigned long long>(a), static_cast<unsigned long long>(b)); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
787 #else |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
788 ASSERT_NE(a, b); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
789 #endif |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
790 } |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
791 |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
792 |
1938 | 793 |
794 TEST(Toolbox, EndiannessConversions16) | |
795 { | |
796 Endianness e = Toolbox::DetectEndianness(); | |
797 | |
1939
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
798 for (unsigned int i = 0; i < 65536; i += 17) |
1938 | 799 { |
800 uint16_t v = static_cast<uint16_t>(i); | |
801 ASSERT_EQ16(v, be16toh(htobe16(v))); | |
802 ASSERT_EQ16(v, le16toh(htole16(v))); | |
803 | |
804 const uint8_t* bytes = reinterpret_cast<const uint8_t*>(&v); | |
805 if (bytes[0] != bytes[1]) | |
806 { | |
807 ASSERT_NE16(v, le16toh(htobe16(v))); | |
808 ASSERT_NE16(v, be16toh(htole16(v))); | |
809 } | |
810 else | |
811 { | |
812 ASSERT_EQ16(v, le16toh(htobe16(v))); | |
813 ASSERT_EQ16(v, be16toh(htole16(v))); | |
814 } | |
815 | |
816 switch (e) | |
817 { | |
818 case Endianness_Little: | |
819 ASSERT_EQ16(v, htole16(v)); | |
820 if (bytes[0] != bytes[1]) | |
821 { | |
822 ASSERT_NE16(v, htobe16(v)); | |
823 } | |
824 else | |
825 { | |
826 ASSERT_EQ16(v, htobe16(v)); | |
827 } | |
828 break; | |
829 | |
830 case Endianness_Big: | |
831 ASSERT_EQ16(v, htobe16(v)); | |
832 if (bytes[0] != bytes[1]) | |
833 { | |
834 ASSERT_NE16(v, htole16(v)); | |
835 } | |
836 else | |
837 { | |
838 ASSERT_EQ16(v, htole16(v)); | |
839 } | |
840 break; | |
841 | |
842 default: | |
843 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
844 } | |
845 } | |
846 } | |
847 | |
848 | |
1939
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
849 TEST(Toolbox, EndiannessConversions32) |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
850 { |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
851 const uint32_t v = 0xff010203u; |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
852 const uint32_t r = 0x030201ffu; |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
853 ASSERT_EQ32(v, be32toh(htobe32(v))); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
854 ASSERT_EQ32(v, le32toh(htole32(v))); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
855 ASSERT_NE32(v, be32toh(htole32(v))); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
856 ASSERT_NE32(v, le32toh(htobe32(v))); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
857 |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
858 switch (Toolbox::DetectEndianness()) |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
859 { |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
860 case Endianness_Little: |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
861 ASSERT_EQ32(r, htobe32(v)); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
862 ASSERT_EQ32(v, htole32(v)); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
863 ASSERT_EQ32(r, be32toh(v)); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
864 ASSERT_EQ32(v, le32toh(v)); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
865 break; |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
866 |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
867 case Endianness_Big: |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
868 ASSERT_EQ32(v, htobe32(v)); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
869 ASSERT_EQ32(r, htole32(v)); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
870 ASSERT_EQ32(v, be32toh(v)); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
871 ASSERT_EQ32(r, le32toh(v)); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
872 break; |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
873 |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
874 default: |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
875 throw OrthancException(ErrorCode_ParameterOutOfRange); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
876 } |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
877 } |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
878 |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
879 |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
880 TEST(Toolbox, EndiannessConversions64) |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
881 { |
1942 | 882 const uint64_t v = 0xff01020304050607LL; |
883 const uint64_t r = 0x07060504030201ffLL; | |
1939
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
884 ASSERT_EQ64(v, be64toh(htobe64(v))); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
885 ASSERT_EQ64(v, le64toh(htole64(v))); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
886 ASSERT_NE64(v, be64toh(htole64(v))); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
887 ASSERT_NE64(v, le64toh(htobe64(v))); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
888 |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
889 switch (Toolbox::DetectEndianness()) |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
890 { |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
891 case Endianness_Little: |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
892 ASSERT_EQ64(r, htobe64(v)); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
893 ASSERT_EQ64(v, htole64(v)); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
894 ASSERT_EQ64(r, be64toh(v)); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
895 ASSERT_EQ64(v, le64toh(v)); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
896 break; |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
897 |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
898 case Endianness_Big: |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
899 ASSERT_EQ64(v, htobe64(v)); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
900 ASSERT_EQ64(r, htole64(v)); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
901 ASSERT_EQ64(v, be64toh(v)); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
902 ASSERT_EQ64(r, le64toh(v)); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
903 break; |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
904 |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
905 default: |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
906 throw OrthancException(ErrorCode_ParameterOutOfRange); |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
907 } |
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
908 } |
1938 | 909 |
910 | |
911 | |
2136
dd609a99d39a
uniformization of the macro naming
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2071
diff
changeset
|
912 #if ORTHANC_ENABLE_PUGIXML == 1 |
1045
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
913 TEST(Toolbox, Xml) |
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
914 { |
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
915 Json::Value a; |
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
916 a["hello"] = "world"; |
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
917 a["42"] = 43; |
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
918 a["b"] = Json::arrayValue; |
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
919 a["b"].append("test"); |
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
920 a["b"].append("test2"); |
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
921 |
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
922 std::string s; |
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
923 Toolbox::JsonToXml(s, a); |
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
924 |
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
925 std::cout << s; |
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
926 } |
1050
64f1842aae2e
Toolbox::ExecuteSystemCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1045
diff
changeset
|
927 #endif |
1045
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
928 |
1050
64f1842aae2e
Toolbox::ExecuteSystemCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1045
diff
changeset
|
929 |
64f1842aae2e
Toolbox::ExecuteSystemCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1045
diff
changeset
|
930 #if !defined(_WIN32) |
64f1842aae2e
Toolbox::ExecuteSystemCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1045
diff
changeset
|
931 TEST(Toolbox, ExecuteSystemCommand) |
64f1842aae2e
Toolbox::ExecuteSystemCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1045
diff
changeset
|
932 { |
64f1842aae2e
Toolbox::ExecuteSystemCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1045
diff
changeset
|
933 std::vector<std::string> args(2); |
64f1842aae2e
Toolbox::ExecuteSystemCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1045
diff
changeset
|
934 args[0] = "Hello"; |
64f1842aae2e
Toolbox::ExecuteSystemCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1045
diff
changeset
|
935 args[1] = "World"; |
64f1842aae2e
Toolbox::ExecuteSystemCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1045
diff
changeset
|
936 |
2140 | 937 SystemToolbox::ExecuteSystemCommand("echo", args); |
1050
64f1842aae2e
Toolbox::ExecuteSystemCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1045
diff
changeset
|
938 } |
1045
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
939 #endif |
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
940 |
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
941 |
1102
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
942 TEST(Toolbox, IsInteger) |
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
943 { |
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
944 ASSERT_TRUE(Toolbox::IsInteger("00236")); |
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
945 ASSERT_TRUE(Toolbox::IsInteger("-0042")); |
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
946 ASSERT_TRUE(Toolbox::IsInteger("0")); |
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
947 ASSERT_TRUE(Toolbox::IsInteger("-0")); |
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
948 |
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
949 ASSERT_FALSE(Toolbox::IsInteger("")); |
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
950 ASSERT_FALSE(Toolbox::IsInteger("42a")); |
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
951 ASSERT_FALSE(Toolbox::IsInteger("42-")); |
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
952 } |
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
953 |
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
954 |
1430
ad94a3583b07
Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1429
diff
changeset
|
955 TEST(Toolbox, StartsWith) |
ad94a3583b07
Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1429
diff
changeset
|
956 { |
ad94a3583b07
Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1429
diff
changeset
|
957 ASSERT_TRUE(Toolbox::StartsWith("hello world", "")); |
ad94a3583b07
Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1429
diff
changeset
|
958 ASSERT_TRUE(Toolbox::StartsWith("hello world", "hello")); |
ad94a3583b07
Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1429
diff
changeset
|
959 ASSERT_TRUE(Toolbox::StartsWith("hello world", "h")); |
ad94a3583b07
Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1429
diff
changeset
|
960 ASSERT_FALSE(Toolbox::StartsWith("hello world", "H")); |
ad94a3583b07
Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1429
diff
changeset
|
961 ASSERT_FALSE(Toolbox::StartsWith("h", "hello")); |
ad94a3583b07
Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1429
diff
changeset
|
962 ASSERT_TRUE(Toolbox::StartsWith("h", "h")); |
ad94a3583b07
Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1429
diff
changeset
|
963 ASSERT_FALSE(Toolbox::StartsWith("", "h")); |
ad94a3583b07
Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1429
diff
changeset
|
964 } |
ad94a3583b07
Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1429
diff
changeset
|
965 |
ad94a3583b07
Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1429
diff
changeset
|
966 |
2043
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
967 TEST(Toolbox, UriEncode) |
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
968 { |
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
969 std::string s; |
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
970 |
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
971 // Unreserved characters must not be modified |
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
972 std::string t = "aAzZ09.-~_"; |
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
973 Toolbox::UriEncode(s, t); |
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
974 ASSERT_EQ(t, s); |
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
975 |
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
976 Toolbox::UriEncode(s, "!#$&'()*+,/:;=?@[]"); ASSERT_EQ("%21%23%24%26%27%28%29%2A%2B%2C%2F%3A%3B%3D%3F%40%5B%5D", s); |
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
977 Toolbox::UriEncode(s, "%"); ASSERT_EQ("%25", s); |
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
978 |
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
979 // Encode characters from UTF-8. This is the test string from the |
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
980 // file "../Resources/EncodingTests.py" |
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
981 Toolbox::UriEncode(s, "\x54\x65\x73\x74\xc3\xa9\xc3\xa4\xc3\xb6\xc3\xb2\xd0\x94\xce\x98\xc4\x9d\xd7\x93\xd8\xb5\xc4\xb7\xd1\x9b\xe0\xb9\x9b\xef\xbe\x88\xc4\xb0"); |
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
982 ASSERT_EQ("Test%C3%A9%C3%A4%C3%B6%C3%B2%D0%94%CE%98%C4%9D%D7%93%D8%B5%C4%B7%D1%9B%E0%B9%9B%EF%BE%88%C4%B0", s); |
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
983 } |
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
984 |
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
985 |
2071 | 986 TEST(Toolbox, AccessJson) |
987 { | |
988 Json::Value v = Json::arrayValue; | |
989 ASSERT_EQ("nope", Toolbox::GetJsonStringField(v, "hello", "nope")); | |
990 | |
991 v = Json::objectValue; | |
992 ASSERT_EQ("nope", Toolbox::GetJsonStringField(v, "hello", "nope")); | |
993 ASSERT_EQ(-10, Toolbox::GetJsonIntegerField(v, "hello", -10)); | |
2411
82d5e305fbd9
fix gcc warnings in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2364
diff
changeset
|
994 ASSERT_EQ(10u, Toolbox::GetJsonUnsignedIntegerField(v, "hello", 10)); |
2071 | 995 ASSERT_TRUE(Toolbox::GetJsonBooleanField(v, "hello", true)); |
996 | |
997 v["hello"] = "world"; | |
998 ASSERT_EQ("world", Toolbox::GetJsonStringField(v, "hello", "nope")); | |
999 ASSERT_THROW(Toolbox::GetJsonIntegerField(v, "hello", -10), OrthancException); | |
1000 ASSERT_THROW(Toolbox::GetJsonUnsignedIntegerField(v, "hello", 10), OrthancException); | |
1001 ASSERT_THROW(Toolbox::GetJsonBooleanField(v, "hello", true), OrthancException); | |
1002 | |
1003 v["hello"] = -42; | |
1004 ASSERT_THROW(Toolbox::GetJsonStringField(v, "hello", "nope"), OrthancException); | |
1005 ASSERT_EQ(-42, Toolbox::GetJsonIntegerField(v, "hello", -10)); | |
1006 ASSERT_THROW(Toolbox::GetJsonUnsignedIntegerField(v, "hello", 10), OrthancException); | |
1007 ASSERT_THROW(Toolbox::GetJsonBooleanField(v, "hello", true), OrthancException); | |
1008 | |
1009 v["hello"] = 42; | |
1010 ASSERT_THROW(Toolbox::GetJsonStringField(v, "hello", "nope"), OrthancException); | |
1011 ASSERT_EQ(42, Toolbox::GetJsonIntegerField(v, "hello", -10)); | |
2411
82d5e305fbd9
fix gcc warnings in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2364
diff
changeset
|
1012 ASSERT_EQ(42u, Toolbox::GetJsonUnsignedIntegerField(v, "hello", 10)); |
2071 | 1013 ASSERT_THROW(Toolbox::GetJsonBooleanField(v, "hello", true), OrthancException); |
1014 | |
1015 v["hello"] = false; | |
1016 ASSERT_THROW(Toolbox::GetJsonStringField(v, "hello", "nope"), OrthancException); | |
1017 ASSERT_THROW(Toolbox::GetJsonIntegerField(v, "hello", -10), OrthancException); | |
1018 ASSERT_THROW(Toolbox::GetJsonUnsignedIntegerField(v, "hello", 10), OrthancException); | |
1019 ASSERT_FALSE(Toolbox::GetJsonBooleanField(v, "hello", true)); | |
1020 } | |
1021 | |
1022 | |
0 | 1023 int main(int argc, char **argv) |
1024 { | |
1485
27661b33f624
Creation of Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1441
diff
changeset
|
1025 Logging::Initialize(); |
27661b33f624
Creation of Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1441
diff
changeset
|
1026 Logging::EnableInfoLevel(true); |
27661b33f624
Creation of Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1441
diff
changeset
|
1027 Toolbox::DetectEndianness(); |
2140 | 1028 SystemToolbox::MakeDirectory("UnitTestsResults"); |
1485
27661b33f624
Creation of Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1441
diff
changeset
|
1029 OrthancInitialize(); |
159
c08fbad40ddd
less verbosity in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
137
diff
changeset
|
1030 |
0 | 1031 ::testing::InitGoogleTest(&argc, argv); |
1032 int result = RUN_ALL_TESTS(); | |
1485
27661b33f624
Creation of Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1441
diff
changeset
|
1033 |
63 | 1034 OrthancFinalize(); |
1485
27661b33f624
Creation of Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1441
diff
changeset
|
1035 Logging::Finalize(); |
27661b33f624
Creation of Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1441
diff
changeset
|
1036 |
0 | 1037 return result; |
1038 } |