Mercurial > hg > orthanc
annotate UnitTestsSources/UnitTestsMain.cpp @ 2944:f395460af74d
simplifying OrthancConfiguration for modalities/peers
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 29 Nov 2018 16:31:20 +0100 |
| parents | 4a38d7d4f0e0 |
| children | db8f360fcb41 |
| 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 { | |
|
2512
4dcafa8d6633
SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2499
diff
changeset
|
57 std::string s = Toolbox::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 { | |
|
2908
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
304 ASSERT_EQ(MimeType_Binary, SystemToolbox::AutodetectMimeType("../NOTES")); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
305 ASSERT_EQ(MimeType_Binary, SystemToolbox::AutodetectMimeType("")); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
306 ASSERT_EQ(MimeType_Binary, SystemToolbox::AutodetectMimeType("/")); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
307 ASSERT_EQ(MimeType_Binary, SystemToolbox::AutodetectMimeType("a/a")); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
308 ASSERT_EQ(MimeType_Binary, SystemToolbox::AutodetectMimeType("..\\a\\")); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
309 ASSERT_EQ(MimeType_Binary, SystemToolbox::AutodetectMimeType("..\\a\\a")); |
| 0 | 310 |
|
2908
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
311 ASSERT_EQ(MimeType_PlainText, SystemToolbox::AutodetectMimeType("../NOTES.txt")); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
312 ASSERT_EQ(MimeType_PlainText, SystemToolbox::AutodetectMimeType("../coucou.xml/NOTES.txt")); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
313 ASSERT_EQ(MimeType_Xml, SystemToolbox::AutodetectMimeType("..\\coucou.\\NOTES.xml")); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
314 ASSERT_EQ(MimeType_Xml, SystemToolbox::AutodetectMimeType("../.xml")); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
315 ASSERT_EQ(MimeType_Xml, SystemToolbox::AutodetectMimeType("../.XmL")); |
|
2906
2a504fef4ed7
AutodetectMimeType() now using boost::filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2905
diff
changeset
|
316 |
|
2908
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
317 ASSERT_EQ(MimeType_JavaScript, SystemToolbox::AutodetectMimeType("NOTES.js")); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
318 ASSERT_EQ(MimeType_Json, SystemToolbox::AutodetectMimeType("NOTES.json")); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
319 ASSERT_EQ(MimeType_Pdf, SystemToolbox::AutodetectMimeType("NOTES.pdf")); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
320 ASSERT_EQ(MimeType_Css, SystemToolbox::AutodetectMimeType("NOTES.css")); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
321 ASSERT_EQ(MimeType_Html, SystemToolbox::AutodetectMimeType("NOTES.html")); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
322 ASSERT_EQ(MimeType_PlainText, SystemToolbox::AutodetectMimeType("NOTES.txt")); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
323 ASSERT_EQ(MimeType_Xml, SystemToolbox::AutodetectMimeType("NOTES.xml")); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
324 ASSERT_EQ(MimeType_Gif, SystemToolbox::AutodetectMimeType("NOTES.gif")); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
325 ASSERT_EQ(MimeType_Jpeg, SystemToolbox::AutodetectMimeType("NOTES.jpg")); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
326 ASSERT_EQ(MimeType_Jpeg, SystemToolbox::AutodetectMimeType("NOTES.jpeg")); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
327 ASSERT_EQ(MimeType_Png, SystemToolbox::AutodetectMimeType("NOTES.png")); |
| 0 | 328 } |
| 329 | |
| 22 | 330 TEST(Toolbox, ComputeMD5) |
| 331 { | |
| 332 std::string s; | |
| 333 | |
| 334 // # echo -n "Hello" | md5sum | |
| 335 | |
| 336 Toolbox::ComputeMD5(s, "Hello"); | |
| 337 ASSERT_EQ("8b1a9953c4611296a827abf8c47804d7", s); | |
| 338 Toolbox::ComputeMD5(s, ""); | |
| 339 ASSERT_EQ("d41d8cd98f00b204e9800998ecf8427e", s); | |
| 340 } | |
| 341 | |
| 177 | 342 TEST(Toolbox, ComputeSHA1) |
| 343 { | |
| 344 std::string s; | |
| 345 | |
| 346 Toolbox::ComputeSHA1(s, "The quick brown fox jumps over the lazy dog"); | |
| 347 ASSERT_EQ("2fd4e1c6-7a2d28fc-ed849ee1-bb76e739-1b93eb12", s); | |
| 348 Toolbox::ComputeSHA1(s, ""); | |
| 349 ASSERT_EQ("da39a3ee-5e6b4b0d-3255bfef-95601890-afd80709", s); | |
| 350 } | |
| 351 | |
| 352 | |
|
809
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
353 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
|
354 { |
|
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
355 std::string result; |
|
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
356 Toolbox::EncodeBase64(result, s); |
|
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
357 return result; |
|
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
358 } |
|
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
359 |
|
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
360 |
| 24 | 361 TEST(Toolbox, Base64) |
| 362 { | |
|
809
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
363 ASSERT_EQ("", EncodeBase64Bis("")); |
|
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
364 ASSERT_EQ("YQ==", EncodeBase64Bis("a")); |
|
707
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
365 |
|
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
366 const std::string hello = "SGVsbG8gd29ybGQ="; |
|
809
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
367 ASSERT_EQ(hello, EncodeBase64Bis("Hello world")); |
|
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
368 |
|
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
369 std::string decoded; |
|
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
370 Toolbox::DecodeBase64(decoded, hello); |
|
8ce2f69436ca
do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
371 ASSERT_EQ("Hello world", decoded); |
|
1988
e29aea2349b9
test validity of base64 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1976
diff
changeset
|
372 |
|
e29aea2349b9
test validity of base64 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1976
diff
changeset
|
373 // Invalid character |
|
e29aea2349b9
test validity of base64 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1976
diff
changeset
|
374 ASSERT_THROW(Toolbox::DecodeBase64(decoded, "?"), OrthancException); |
|
e29aea2349b9
test validity of base64 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1976
diff
changeset
|
375 |
|
e29aea2349b9
test validity of base64 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1976
diff
changeset
|
376 // All the allowed characters |
|
e29aea2349b9
test validity of base64 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1976
diff
changeset
|
377 Toolbox::DecodeBase64(decoded, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="); |
| 24 | 378 } |
| 379 | |
|
87
8517e2c44283
path to configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
63
diff
changeset
|
380 TEST(Toolbox, PathToExecutable) |
|
8517e2c44283
path to configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
63
diff
changeset
|
381 { |
| 2140 | 382 printf("[%s]\n", SystemToolbox::GetPathToExecutable().c_str()); |
| 383 printf("[%s]\n", SystemToolbox::GetDirectoryOfExecutable().c_str()); | |
|
87
8517e2c44283
path to configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
63
diff
changeset
|
384 } |
|
8517e2c44283
path to configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
63
diff
changeset
|
385 |
|
247
c9b3ba0fd140
path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
386 TEST(Toolbox, StripSpaces) |
|
c9b3ba0fd140
path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
387 { |
|
c9b3ba0fd140
path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
388 ASSERT_EQ("", Toolbox::StripSpaces(" \t \r \n ")); |
|
c9b3ba0fd140
path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
389 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
|
390 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
|
391 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
|
392 } |
|
100
27dc762e3dc8
getting rid of static dcmtk for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
393 |
|
707
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
394 TEST(Toolbox, Case) |
|
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
395 { |
|
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
396 std::string s = "CoU"; |
|
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
397 std::string ss; |
|
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
398 |
|
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
399 Toolbox::ToUpperCase(ss, s); |
|
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
400 ASSERT_EQ("COU", ss); |
|
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
401 Toolbox::ToLowerCase(ss, s); |
|
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
402 ASSERT_EQ("cou", ss); |
|
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::ToUpperCase(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 s = "CoU"; |
|
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
409 Toolbox::ToLowerCase(s); |
|
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
410 ASSERT_EQ("cou", s); |
|
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
411 } |
|
203157cb4fde
unit tests of httpclient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
674
diff
changeset
|
412 |
|
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 TEST(Logger, Basic) |
|
27dc762e3dc8
getting rid of static dcmtk for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
415 { |
|
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
416 LOG(INFO) << "I say hello"; |
|
100
27dc762e3dc8
getting rid of static dcmtk for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
417 } |
|
27dc762e3dc8
getting rid of static dcmtk for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
418 |
|
107
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
419 TEST(Toolbox, ConvertFromLatin1) |
|
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
420 { |
|
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
421 // 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
|
422 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
|
423 |
|
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
424 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
|
425 ASSERT_EQ("&abc", Toolbox::ConvertToAscii(s)); |
|
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
426 |
|
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
427 // 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
|
428 std::string utf8 = Toolbox::ConvertToUtf8(s, Encoding_Latin1); |
| 235 | 429 ASSERT_EQ(15u, utf8.size()); |
|
107
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[0])); |
|
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
431 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
|
432 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
|
433 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
|
434 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
|
435 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
|
436 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
|
437 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
|
438 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
|
439 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
|
440 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
|
441 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
|
442 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
|
443 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
|
444 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
|
445 } |
|
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
446 |
|
2907
0204af4ece6a
Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2906
diff
changeset
|
447 |
|
0204af4ece6a
Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2906
diff
changeset
|
448 TEST(Toolbox, FixUtf8) |
|
0204af4ece6a
Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2906
diff
changeset
|
449 { |
|
0204af4ece6a
Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2906
diff
changeset
|
450 // This is a Latin-1 test string: "crane" with a circumflex accent |
|
0204af4ece6a
Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2906
diff
changeset
|
451 const unsigned char latin1[] = { 0x63, 0x72, 0xe2, 0x6e, 0x65 }; |
|
0204af4ece6a
Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2906
diff
changeset
|
452 |
|
0204af4ece6a
Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2906
diff
changeset
|
453 std::string s((char*) &latin1[0], sizeof(latin1) / sizeof(char)); |
|
0204af4ece6a
Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2906
diff
changeset
|
454 |
|
0204af4ece6a
Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2906
diff
changeset
|
455 ASSERT_EQ(s, Toolbox::ConvertFromUtf8(Toolbox::ConvertToUtf8(s, Encoding_Latin1), Encoding_Latin1)); |
|
0204af4ece6a
Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2906
diff
changeset
|
456 ASSERT_EQ("cre", Toolbox::ConvertToUtf8(s, Encoding_Utf8)); |
|
0204af4ece6a
Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2906
diff
changeset
|
457 } |
|
0204af4ece6a
Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2906
diff
changeset
|
458 |
|
0204af4ece6a
Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2906
diff
changeset
|
459 |
| 336 | 460 TEST(Toolbox, UrlDecode) |
| 461 { | |
| 462 std::string s; | |
| 463 | |
| 464 s = "Hello%20World"; | |
| 465 Toolbox::UrlDecode(s); | |
| 466 ASSERT_EQ("Hello World", s); | |
| 467 | |
| 337 | 468 s = "%21%23%24%26%27%28%29%2A%2B%2c%2f%3A%3b%3d%3f%40%5B%5D%90%ff"; |
| 336 | 469 Toolbox::UrlDecode(s); |
| 337 | 470 std::string ss = "!#$&'()*+,/:;=?@[]"; |
| 471 ss.push_back((char) 144); | |
| 472 ss.push_back((char) 255); | |
| 473 ASSERT_EQ(ss, s); | |
| 336 | 474 |
| 475 s = "(2000%2C00A4)+Other"; | |
| 476 Toolbox::UrlDecode(s); | |
| 477 ASSERT_EQ("(2000,00A4) Other", s); | |
| 478 } | |
| 479 | |
|
100
27dc762e3dc8
getting rid of static dcmtk for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
480 |
|
2442
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
481 TEST(Toolbox, IsAsciiString) |
|
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
482 { |
|
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
483 std::string s = "Hello 12 /"; |
|
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
484 ASSERT_EQ(10u, s.size()); |
|
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
485 ASSERT_TRUE(Toolbox::IsAsciiString(s)); |
|
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
486 ASSERT_TRUE(Toolbox::IsAsciiString(s.c_str(), 10)); |
|
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
487 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
|
488 |
|
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
489 s[2] = '\0'; |
|
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
490 ASSERT_EQ(10u, s.size()); |
|
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
491 ASSERT_FALSE(Toolbox::IsAsciiString(s)); |
| 2900 | 492 |
| 493 ASSERT_TRUE(Toolbox::IsAsciiString("Hello\nworld")); | |
| 494 ASSERT_FALSE(Toolbox::IsAsciiString("Hello\rworld")); | |
| 495 | |
| 496 ASSERT_EQ("Hello\nworld", Toolbox::ConvertToAscii("Hello\nworld")); | |
| 497 ASSERT_EQ("Helloworld", Toolbox::ConvertToAscii("Hello\r\tworld")); | |
|
2442
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
498 } |
|
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
499 |
|
330349d712f9
fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2411
diff
changeset
|
500 |
|
1976
325772dadcd6
Macro "__linux" (now obsolete) replaced by macro "__linux__"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1971
diff
changeset
|
501 #if defined(__linux__) |
|
2933
4a38d7d4f0e0
new class: OrthancConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2921
diff
changeset
|
502 TEST(Toolbox, AbsoluteDirectory) |
|
429
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
402
diff
changeset
|
503 { |
|
2933
4a38d7d4f0e0
new class: OrthancConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2921
diff
changeset
|
504 ASSERT_EQ("/tmp/hello", SystemToolbox::InterpretRelativePath("/tmp", "hello")); |
|
4a38d7d4f0e0
new class: OrthancConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2921
diff
changeset
|
505 ASSERT_EQ("/tmp", SystemToolbox::InterpretRelativePath("/tmp", "/tmp")); |
|
429
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
402
diff
changeset
|
506 } |
|
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
402
diff
changeset
|
507 #endif |
|
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
402
diff
changeset
|
508 |
|
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
402
diff
changeset
|
509 |
|
434
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 #include "../OrthancServer/ServerEnumerations.h" |
|
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 TEST(EnumerationDictionary, Simple) |
|
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
514 { |
|
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
515 Toolbox::EnumerationDictionary<MetadataType> d; |
|
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
516 |
|
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
517 ASSERT_THROW(d.Translate("ReceptionDate"), OrthancException); |
|
435
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
518 ASSERT_EQ(MetadataType_ModifiedFrom, d.Translate("5")); |
|
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
435
diff
changeset
|
519 ASSERT_EQ(256, d.Translate("256")); |
|
434
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
520 |
|
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
521 d.Add(MetadataType_Instance_ReceptionDate, "ReceptionDate"); |
|
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_EQ(MetadataType_Instance_ReceptionDate, d.Translate("ReceptionDate")); |
|
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
524 ASSERT_EQ(MetadataType_Instance_ReceptionDate, d.Translate("2")); |
|
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
525 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
|
526 |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
527 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
|
528 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
|
529 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
|
530 d.Add(MetadataType_ModifiedFrom, "ModifiedFrom"); // ok |
|
434
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
531 } |
|
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
532 |
|
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
533 |
|
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
534 TEST(EnumerationDictionary, ServerEnumerations) |
|
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
535 { |
|
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
536 ASSERT_STREQ("Patient", EnumerationToString(ResourceType_Patient)); |
|
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
537 ASSERT_STREQ("Study", EnumerationToString(ResourceType_Study)); |
|
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
538 ASSERT_STREQ("Series", EnumerationToString(ResourceType_Series)); |
|
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
539 ASSERT_STREQ("Instance", EnumerationToString(ResourceType_Instance)); |
|
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
540 |
|
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
541 ASSERT_STREQ("ModifiedSeries", EnumerationToString(ChangeType_ModifiedSeries)); |
|
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
542 |
|
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
543 ASSERT_STREQ("Failure", EnumerationToString(StoreStatus_Failure)); |
|
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
544 ASSERT_STREQ("Success", EnumerationToString(StoreStatus_Success)); |
|
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
545 |
|
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
546 ASSERT_STREQ("CompletedSeries", EnumerationToString(ChangeType_CompletedSeries)); |
|
435
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
547 |
| 437 | 548 ASSERT_EQ("IndexInSeries", EnumerationToString(MetadataType_Instance_IndexInSeries)); |
| 549 ASSERT_EQ("LastUpdate", EnumerationToString(MetadataType_LastUpdate)); | |
|
435
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
550 |
| 559 | 551 ASSERT_EQ(ResourceType_Patient, StringToResourceType("PATienT")); |
| 552 ASSERT_EQ(ResourceType_Study, StringToResourceType("STudy")); | |
| 553 ASSERT_EQ(ResourceType_Series, StringToResourceType("SeRiEs")); | |
| 554 ASSERT_EQ(ResourceType_Instance, StringToResourceType("INStance")); | |
| 555 ASSERT_EQ(ResourceType_Instance, StringToResourceType("IMagE")); | |
| 556 ASSERT_THROW(StringToResourceType("heLLo"), OrthancException); | |
| 557 | |
|
435
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
558 ASSERT_EQ(2047, StringToMetadata("2047")); |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
559 ASSERT_THROW(StringToMetadata("Ceci est un test"), OrthancException); |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
560 ASSERT_THROW(RegisterUserMetadata(128, ""), OrthancException); // too low (< 1024) |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
561 ASSERT_THROW(RegisterUserMetadata(128000, ""), OrthancException); // too high (> 65535) |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
562 RegisterUserMetadata(2047, "Ceci est un test"); |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
563 ASSERT_EQ(2047, StringToMetadata("2047")); |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
564 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
|
565 |
|
7366a0bdda6a
attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1428
diff
changeset
|
566 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
|
567 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
|
568 ASSERT_STREQ("GenericNoUniversalWildcard", EnumerationToString(StringToModalityManufacturer("GenericNoUniversalWildcard"))); |
|
1429
7366a0bdda6a
attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1428
diff
changeset
|
569 ASSERT_STREQ("StoreScp", EnumerationToString(StringToModalityManufacturer("StoreScp"))); |
|
7366a0bdda6a
attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1428
diff
changeset
|
570 ASSERT_STREQ("ClearCanvas", EnumerationToString(StringToModalityManufacturer("ClearCanvas"))); |
|
7366a0bdda6a
attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1428
diff
changeset
|
571 ASSERT_STREQ("Dcm4Chee", EnumerationToString(StringToModalityManufacturer("Dcm4Chee"))); |
|
1852
efbc3afd6cd3
Efilm and Vitrea manufacturers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1846
diff
changeset
|
572 ASSERT_STREQ("Vitrea", EnumerationToString(StringToModalityManufacturer("Vitrea"))); |
|
2888
61a5667f37d9
New modality manufacturer: "GE" for GE Healthcare EA and AW
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2841
diff
changeset
|
573 ASSERT_STREQ("GE", EnumerationToString(StringToModalityManufacturer("GE"))); |
|
2319
ae6245053bcf
made some manufacturer obsolete: MedInria (that was not used), Syngovia & AgfaImpax (replaced by GenericNoWildcardInDates) + added 'GenericNoWildcards'
amazy
parents:
2313
diff
changeset
|
574 // 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
|
575 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
|
576 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
|
577 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
|
578 ASSERT_STREQ("GenericNoWildcardInDates", EnumerationToString(StringToModalityManufacturer("AgfaImpax"))); |
|
434
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
579 } |
|
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
580 |
|
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
581 |
| 450 | 582 |
|
483
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
583 TEST(Toolbox, WriteFile) |
|
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
584 { |
|
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
585 std::string path; |
|
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
586 |
|
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
587 { |
| 2140 | 588 TemporaryFile tmp; |
|
483
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
589 path = tmp.GetPath(); |
|
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
590 |
|
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
591 std::string s; |
|
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
592 s.append("Hello"); |
|
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
593 s.push_back('\0'); |
|
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
594 s.append("World"); |
|
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
595 ASSERT_EQ(11u, s.size()); |
|
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
596 |
| 2140 | 597 SystemToolbox::WriteFile(s, path.c_str()); |
|
483
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
598 |
|
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
599 std::string t; |
| 2140 | 600 SystemToolbox::ReadFile(t, path.c_str()); |
|
483
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
601 |
|
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
602 ASSERT_EQ(11u, t.size()); |
|
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
603 ASSERT_EQ(0, t[5]); |
|
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
604 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
|
605 |
|
ff11ba08e5d0
Toolbox::ReadHeader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
606 std::string h; |
| 2140 | 607 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
|
608 ASSERT_EQ(1u, h.size()); |
|
1933
ff11ba08e5d0
Toolbox::ReadHeader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
609 ASSERT_EQ('H', h[0]); |
| 2140 | 610 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
|
611 ASSERT_EQ(0u, h.size()); |
| 2140 | 612 ASSERT_FALSE(SystemToolbox::ReadHeader(h, path.c_str(), 32)); |
|
1933
ff11ba08e5d0
Toolbox::ReadHeader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
613 ASSERT_EQ(11u, h.size()); |
|
ff11ba08e5d0
Toolbox::ReadHeader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
614 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
|
615 } |
|
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
616 |
|
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
617 std::string u; |
| 2140 | 618 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
|
619 } |
|
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
620 |
|
8c3573d28868
export dicom instances to the filesystem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
621 |
| 608 | 622 TEST(Toolbox, Wildcard) |
| 623 { | |
| 624 ASSERT_EQ("abcd", Toolbox::WildcardToRegularExpression("abcd")); | |
| 625 ASSERT_EQ("ab.*cd", Toolbox::WildcardToRegularExpression("ab*cd")); | |
| 626 ASSERT_EQ("ab..cd", Toolbox::WildcardToRegularExpression("ab??cd")); | |
| 627 ASSERT_EQ("a.*b.c.*d", Toolbox::WildcardToRegularExpression("a*b?c*d")); | |
| 628 ASSERT_EQ("a\\{b\\]", Toolbox::WildcardToRegularExpression("a{b]")); | |
| 629 } | |
| 630 | |
| 631 | |
| 632 TEST(Toolbox, Tokenize) | |
| 633 { | |
| 634 std::vector<std::string> t; | |
| 635 | |
| 636 Toolbox::TokenizeString(t, "", ','); | |
| 1492 | 637 ASSERT_EQ(1u, t.size()); |
| 608 | 638 ASSERT_EQ("", t[0]); |
| 639 | |
| 640 Toolbox::TokenizeString(t, "abc", ','); | |
| 1492 | 641 ASSERT_EQ(1u, t.size()); |
| 608 | 642 ASSERT_EQ("abc", t[0]); |
| 643 | |
| 644 Toolbox::TokenizeString(t, "ab,cd,ef,", ','); | |
| 1492 | 645 ASSERT_EQ(4u, t.size()); |
| 608 | 646 ASSERT_EQ("ab", t[0]); |
| 647 ASSERT_EQ("cd", t[1]); | |
| 648 ASSERT_EQ("ef", t[2]); | |
| 649 ASSERT_EQ("", t[3]); | |
| 650 } | |
| 651 | |
|
1086
e56c3ed8d738
Parameter to set the default encoding for DICOM files without SpecificCharacterSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1050
diff
changeset
|
652 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
|
653 { |
|
e56c3ed8d738
Parameter to set the default encoding for DICOM files without SpecificCharacterSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1050
diff
changeset
|
654 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
|
655 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
|
656 ASSERT_EQ(Encoding_Latin1, StringToEncoding(EnumerationToString(Encoding_Latin1))); |
| 1087 | 657 ASSERT_EQ(Encoding_Latin2, StringToEncoding(EnumerationToString(Encoding_Latin2))); |
| 658 ASSERT_EQ(Encoding_Latin3, StringToEncoding(EnumerationToString(Encoding_Latin3))); | |
| 659 ASSERT_EQ(Encoding_Latin4, StringToEncoding(EnumerationToString(Encoding_Latin4))); | |
| 660 ASSERT_EQ(Encoding_Latin5, StringToEncoding(EnumerationToString(Encoding_Latin5))); | |
| 661 ASSERT_EQ(Encoding_Cyrillic, StringToEncoding(EnumerationToString(Encoding_Cyrillic))); | |
| 662 ASSERT_EQ(Encoding_Arabic, StringToEncoding(EnumerationToString(Encoding_Arabic))); | |
| 663 ASSERT_EQ(Encoding_Greek, StringToEncoding(EnumerationToString(Encoding_Greek))); | |
| 664 ASSERT_EQ(Encoding_Hebrew, StringToEncoding(EnumerationToString(Encoding_Hebrew))); | |
|
1090
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
665 ASSERT_EQ(Encoding_Japanese, StringToEncoding(EnumerationToString(Encoding_Japanese))); |
|
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
666 ASSERT_EQ(Encoding_Chinese, StringToEncoding(EnumerationToString(Encoding_Chinese))); |
|
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
667 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
|
668 |
|
e56c3ed8d738
Parameter to set the default encoding for DICOM files without SpecificCharacterSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1050
diff
changeset
|
669 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
|
670 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
|
671 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
|
672 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
|
673 |
|
e56c3ed8d738
Parameter to set the default encoding for DICOM files without SpecificCharacterSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1050
diff
changeset
|
674 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
|
675 |
|
e002430baa41
Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
676 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
|
677 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
|
678 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
|
679 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
|
680 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
|
681 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
|
682 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
|
683 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
|
684 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
|
685 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
|
686 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
|
687 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
|
688 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
|
689 |
|
e002430baa41
Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
690 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
|
691 ASSERT_THROW(StringToPhotometricInterpretation("Unknown"), OrthancException); |
|
2309
4dc313b9a20a
Argument "DicomVersion" in URIs "/{...}/{...}/anonymization"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2281
diff
changeset
|
692 |
|
4dc313b9a20a
Argument "DicomVersion" in URIs "/{...}/{...}/anonymization"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2281
diff
changeset
|
693 ASSERT_EQ(DicomVersion_2008, StringToDicomVersion(EnumerationToString(DicomVersion_2008))); |
|
4dc313b9a20a
Argument "DicomVersion" in URIs "/{...}/{...}/anonymization"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2281
diff
changeset
|
694 ASSERT_EQ(DicomVersion_2017c, StringToDicomVersion(EnumerationToString(DicomVersion_2017c))); |
|
2499
83b8b6743531
ITagVisitor - for anonymization relationships
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2475
diff
changeset
|
695 |
|
83b8b6743531
ITagVisitor - for anonymization relationships
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2475
diff
changeset
|
696 for (int i = static_cast<int>(ValueRepresentation_ApplicationEntity); |
|
83b8b6743531
ITagVisitor - for anonymization relationships
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2475
diff
changeset
|
697 i < static_cast<int>(ValueRepresentation_NotSupported); i += 1) |
|
83b8b6743531
ITagVisitor - for anonymization relationships
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2475
diff
changeset
|
698 { |
|
83b8b6743531
ITagVisitor - for anonymization relationships
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2475
diff
changeset
|
699 ValueRepresentation vr = static_cast<ValueRepresentation>(i); |
|
83b8b6743531
ITagVisitor - for anonymization relationships
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2475
diff
changeset
|
700 ASSERT_EQ(vr, StringToValueRepresentation(EnumerationToString(vr), true)); |
|
83b8b6743531
ITagVisitor - for anonymization relationships
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2475
diff
changeset
|
701 } |
|
83b8b6743531
ITagVisitor - for anonymization relationships
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2475
diff
changeset
|
702 |
|
83b8b6743531
ITagVisitor - for anonymization relationships
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2475
diff
changeset
|
703 ASSERT_THROW(StringToValueRepresentation("nope", true), OrthancException); |
| 2646 | 704 |
| 705 ASSERT_EQ(JobState_Pending, StringToJobState(EnumerationToString(JobState_Pending))); | |
| 706 ASSERT_EQ(JobState_Running, StringToJobState(EnumerationToString(JobState_Running))); | |
| 707 ASSERT_EQ(JobState_Success, StringToJobState(EnumerationToString(JobState_Success))); | |
| 708 ASSERT_EQ(JobState_Failure, StringToJobState(EnumerationToString(JobState_Failure))); | |
| 709 ASSERT_EQ(JobState_Paused, StringToJobState(EnumerationToString(JobState_Paused))); | |
| 710 ASSERT_EQ(JobState_Retry, StringToJobState(EnumerationToString(JobState_Retry))); | |
| 711 ASSERT_THROW(StringToJobState("nope"), OrthancException); | |
|
2908
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
712 |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
713 ASSERT_EQ(MimeType_Binary, StringToMimeType(EnumerationToString(MimeType_Binary))); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
714 ASSERT_EQ(MimeType_Dicom, StringToMimeType(EnumerationToString(MimeType_Dicom))); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
715 ASSERT_EQ(MimeType_Jpeg, StringToMimeType(EnumerationToString(MimeType_Jpeg))); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
716 ASSERT_EQ(MimeType_Jpeg2000, StringToMimeType(EnumerationToString(MimeType_Jpeg2000))); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
717 ASSERT_EQ(MimeType_Json, StringToMimeType(EnumerationToString(MimeType_Json))); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
718 ASSERT_EQ(MimeType_Pdf, StringToMimeType(EnumerationToString(MimeType_Pdf))); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
719 ASSERT_EQ(MimeType_Png, StringToMimeType(EnumerationToString(MimeType_Png))); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
720 ASSERT_EQ(MimeType_Xml, StringToMimeType(EnumerationToString(MimeType_Xml))); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
721 ASSERT_EQ(MimeType_Xml, StringToMimeType("application/xml")); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
722 ASSERT_EQ(MimeType_Xml, StringToMimeType("text/xml")); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
723 ASSERT_EQ(MimeType_PlainText, StringToMimeType(EnumerationToString(MimeType_PlainText))); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
724 ASSERT_EQ(MimeType_Pam, StringToMimeType(EnumerationToString(MimeType_Pam))); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
725 ASSERT_EQ(MimeType_Html, StringToMimeType(EnumerationToString(MimeType_Html))); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
726 ASSERT_EQ(MimeType_Gzip, StringToMimeType(EnumerationToString(MimeType_Gzip))); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
727 ASSERT_EQ(MimeType_JavaScript, StringToMimeType(EnumerationToString(MimeType_JavaScript))); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
728 ASSERT_EQ(MimeType_Gif, StringToMimeType(EnumerationToString(MimeType_Gif))); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
729 ASSERT_EQ(MimeType_WebAssembly, StringToMimeType(EnumerationToString(MimeType_WebAssembly))); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
730 ASSERT_EQ(MimeType_Css, StringToMimeType(EnumerationToString(MimeType_Css))); |
|
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2907
diff
changeset
|
731 ASSERT_THROW(StringToMimeType("nope"), OrthancException); |
|
1086
e56c3ed8d738
Parameter to set the default encoding for DICOM files without SpecificCharacterSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1050
diff
changeset
|
732 } |
|
e56c3ed8d738
Parameter to set the default encoding for DICOM files without SpecificCharacterSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1050
diff
changeset
|
733 |
| 608 | 734 |
|
674
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
735 |
| 2364 | 736 #if defined(__linux__) || defined(__OpenBSD__) |
|
674
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
737 #include <endian.h> |
| 1337 | 738 #elif defined(__FreeBSD__) |
| 739 #include <machine/endian.h> | |
|
674
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
740 #endif |
|
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
741 |
| 1337 | 742 |
| 637 | 743 TEST(Toolbox, Endianness) |
| 744 { | |
|
674
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
745 // Parts of this test come from Adam Conrad |
|
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
746 // http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=728822#5 |
| 637 | 747 |
| 1337 | 748 |
| 749 /** | |
| 750 * Windows and OS X are assumed to always little-endian. | |
| 751 **/ | |
| 752 | |
| 753 #if defined(_WIN32) || defined(__APPLE__) | |
| 637 | 754 ASSERT_EQ(Endianness_Little, Toolbox::DetectEndianness()); |
|
674
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
755 |
| 2545 | 756 |
| 757 /** | |
| 758 * FreeBSD. | |
| 759 **/ | |
| 760 | |
| 761 #elif defined(__FreeBSD__) || defined(__OpenBSD__) | |
| 762 # if _BYTE_ORDER == _BIG_ENDIAN | |
| 763 ASSERT_EQ(Endianness_Big, Toolbox::DetectEndianness()); | |
| 764 # else // _LITTLE_ENDIAN | |
| 765 ASSERT_EQ(Endianness_Little, Toolbox::DetectEndianness()); | |
| 766 # endif | |
| 767 | |
| 918 | 768 |
| 1337 | 769 /** |
| 770 * Linux. | |
| 771 **/ | |
| 772 | |
|
1976
325772dadcd6
Macro "__linux" (now obsolete) replaced by macro "__linux__"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1971
diff
changeset
|
773 #elif defined(__linux__) || defined(__FreeBSD_kernel__) |
|
674
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
774 |
|
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
775 #if !defined(__BYTE_ORDER) |
|
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
776 # error Support your platform here |
| 637 | 777 #endif |
| 778 | |
|
674
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
779 # if __BYTE_ORDER == __BIG_ENDIAN |
|
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
780 ASSERT_EQ(Endianness_Big, Toolbox::DetectEndianness()); |
|
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
781 # else // __LITTLE_ENDIAN |
| 637 | 782 ASSERT_EQ(Endianness_Little, Toolbox::DetectEndianness()); |
|
674
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
783 # endif |
|
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
784 |
|
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
785 #else |
|
d76b747aec1b
improved check for big endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
786 #error Support your platform here |
| 637 | 787 #endif |
| 788 } | |
| 789 | |
| 790 | |
| 1938 | 791 #include "../Core/Endianness.h" |
| 792 | |
| 793 static void ASSERT_EQ16(uint16_t a, uint16_t b) | |
| 794 { | |
|
1939
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
795 #ifdef __MINGW32__ |
| 1938 | 796 // This cast solves a linking problem with MinGW |
| 797 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
|
798 #else |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
799 ASSERT_EQ(a, b); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
800 #endif |
| 1938 | 801 } |
| 802 | |
| 803 static void ASSERT_NE16(uint16_t a, uint16_t b) | |
| 804 { | |
|
1939
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
805 #ifdef __MINGW32__ |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
806 // This cast solves a linking problem with MinGW |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
807 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
|
808 #else |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
809 ASSERT_NE(a, b); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
810 #endif |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
811 } |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
812 |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
813 static void ASSERT_EQ32(uint32_t a, uint32_t b) |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
814 { |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
815 #ifdef __MINGW32__ |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
816 // This cast solves a linking problem with MinGW |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
817 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
|
818 #else |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
819 ASSERT_EQ(a, b); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
820 #endif |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
821 } |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
822 |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
823 static void ASSERT_NE32(uint32_t a, uint32_t b) |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
824 { |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
825 #ifdef __MINGW32__ |
| 1938 | 826 // This cast solves a linking problem with MinGW |
| 827 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
|
828 #else |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
829 ASSERT_NE(a, b); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
830 #endif |
| 1938 | 831 } |
| 832 | |
|
1939
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
833 static void ASSERT_EQ64(uint64_t a, uint64_t b) |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
834 { |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
835 #ifdef __MINGW32__ |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
836 // This cast solves a linking problem with MinGW |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
837 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
|
838 #else |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
839 ASSERT_EQ(a, b); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
840 #endif |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
841 } |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
842 |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
843 static void ASSERT_NE64(uint64_t a, uint64_t b) |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
844 { |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
845 #ifdef __MINGW32__ |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
846 // This cast solves a linking problem with MinGW |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
847 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
|
848 #else |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
849 ASSERT_NE(a, b); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
850 #endif |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
851 } |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
852 |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
853 |
| 1938 | 854 |
| 855 TEST(Toolbox, EndiannessConversions16) | |
| 856 { | |
| 857 Endianness e = Toolbox::DetectEndianness(); | |
| 858 | |
|
1939
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
859 for (unsigned int i = 0; i < 65536; i += 17) |
| 1938 | 860 { |
| 861 uint16_t v = static_cast<uint16_t>(i); | |
| 862 ASSERT_EQ16(v, be16toh(htobe16(v))); | |
| 863 ASSERT_EQ16(v, le16toh(htole16(v))); | |
| 864 | |
| 865 const uint8_t* bytes = reinterpret_cast<const uint8_t*>(&v); | |
| 866 if (bytes[0] != bytes[1]) | |
| 867 { | |
| 868 ASSERT_NE16(v, le16toh(htobe16(v))); | |
| 869 ASSERT_NE16(v, be16toh(htole16(v))); | |
| 870 } | |
| 871 else | |
| 872 { | |
| 873 ASSERT_EQ16(v, le16toh(htobe16(v))); | |
| 874 ASSERT_EQ16(v, be16toh(htole16(v))); | |
| 875 } | |
| 876 | |
| 877 switch (e) | |
| 878 { | |
| 879 case Endianness_Little: | |
| 880 ASSERT_EQ16(v, htole16(v)); | |
| 881 if (bytes[0] != bytes[1]) | |
| 882 { | |
| 883 ASSERT_NE16(v, htobe16(v)); | |
| 884 } | |
| 885 else | |
| 886 { | |
| 887 ASSERT_EQ16(v, htobe16(v)); | |
| 888 } | |
| 889 break; | |
| 890 | |
| 891 case Endianness_Big: | |
| 892 ASSERT_EQ16(v, htobe16(v)); | |
| 893 if (bytes[0] != bytes[1]) | |
| 894 { | |
| 895 ASSERT_NE16(v, htole16(v)); | |
| 896 } | |
| 897 else | |
| 898 { | |
| 899 ASSERT_EQ16(v, htole16(v)); | |
| 900 } | |
| 901 break; | |
| 902 | |
| 903 default: | |
| 904 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 905 } | |
| 906 } | |
| 907 } | |
| 908 | |
| 909 | |
|
1939
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
910 TEST(Toolbox, EndiannessConversions32) |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
911 { |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
912 const uint32_t v = 0xff010203u; |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
913 const uint32_t r = 0x030201ffu; |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
914 ASSERT_EQ32(v, be32toh(htobe32(v))); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
915 ASSERT_EQ32(v, le32toh(htole32(v))); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
916 ASSERT_NE32(v, be32toh(htole32(v))); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
917 ASSERT_NE32(v, le32toh(htobe32(v))); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
918 |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
919 switch (Toolbox::DetectEndianness()) |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
920 { |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
921 case Endianness_Little: |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
922 ASSERT_EQ32(r, htobe32(v)); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
923 ASSERT_EQ32(v, htole32(v)); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
924 ASSERT_EQ32(r, be32toh(v)); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
925 ASSERT_EQ32(v, le32toh(v)); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
926 break; |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
927 |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
928 case Endianness_Big: |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
929 ASSERT_EQ32(v, htobe32(v)); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
930 ASSERT_EQ32(r, htole32(v)); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
931 ASSERT_EQ32(v, be32toh(v)); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
932 ASSERT_EQ32(r, le32toh(v)); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
933 break; |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
934 |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
935 default: |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
936 throw OrthancException(ErrorCode_ParameterOutOfRange); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
937 } |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
938 } |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
939 |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
940 |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
941 TEST(Toolbox, EndiannessConversions64) |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
942 { |
| 1942 | 943 const uint64_t v = 0xff01020304050607LL; |
| 944 const uint64_t r = 0x07060504030201ffLL; | |
|
1939
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
945 ASSERT_EQ64(v, be64toh(htobe64(v))); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
946 ASSERT_EQ64(v, le64toh(htole64(v))); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
947 ASSERT_NE64(v, be64toh(htole64(v))); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
948 ASSERT_NE64(v, le64toh(htobe64(v))); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
949 |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
950 switch (Toolbox::DetectEndianness()) |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
951 { |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
952 case Endianness_Little: |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
953 ASSERT_EQ64(r, htobe64(v)); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
954 ASSERT_EQ64(v, htole64(v)); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
955 ASSERT_EQ64(r, be64toh(v)); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
956 ASSERT_EQ64(v, le64toh(v)); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
957 break; |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
958 |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
959 case Endianness_Big: |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
960 ASSERT_EQ64(v, htobe64(v)); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
961 ASSERT_EQ64(r, htole64(v)); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
962 ASSERT_EQ64(v, be64toh(v)); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
963 ASSERT_EQ64(r, le64toh(v)); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
964 break; |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
965 |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
966 default: |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
967 throw OrthancException(ErrorCode_ParameterOutOfRange); |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
968 } |
|
d80a4fe8ffcc
tests EndiannessConversions32/64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1938
diff
changeset
|
969 } |
| 1938 | 970 |
| 971 | |
|
2475
8cc3ca64a534
Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
972 TEST(Toolbox, Now) |
|
8cc3ca64a534
Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
973 { |
|
8cc3ca64a534
Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
974 LOG(WARNING) << "Local time: " << SystemToolbox::GetNowIsoString(false); |
|
8cc3ca64a534
Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
975 LOG(WARNING) << "Universal time: " << SystemToolbox::GetNowIsoString(true); |
|
8cc3ca64a534
Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
976 |
|
8cc3ca64a534
Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
977 std::string date, time; |
|
8cc3ca64a534
Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
978 SystemToolbox::GetNowDicom(date, time, false); |
|
8cc3ca64a534
Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
979 LOG(WARNING) << "Local DICOM time: [" << date << "] [" << time << "]"; |
|
8cc3ca64a534
Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
980 |
|
8cc3ca64a534
Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
981 SystemToolbox::GetNowDicom(date, time, true); |
|
8cc3ca64a534
Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
982 LOG(WARNING) << "Universal DICOM time: [" << date << "] [" << time << "]"; |
|
8cc3ca64a534
Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
983 } |
|
8cc3ca64a534
Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
984 |
|
8cc3ca64a534
Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
985 |
| 1938 | 986 |
|
2136
dd609a99d39a
uniformization of the macro naming
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2071
diff
changeset
|
987 #if ORTHANC_ENABLE_PUGIXML == 1 |
|
1045
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
988 TEST(Toolbox, Xml) |
|
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
989 { |
|
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
990 Json::Value a; |
|
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
991 a["hello"] = "world"; |
|
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
992 a["42"] = 43; |
|
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
993 a["b"] = Json::arrayValue; |
|
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
994 a["b"].append("test"); |
|
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
995 a["b"].append("test2"); |
|
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
996 |
|
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
997 std::string s; |
|
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
998 Toolbox::JsonToXml(s, a); |
|
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
999 |
|
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
1000 std::cout << s; |
|
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
1001 } |
|
1050
64f1842aae2e
Toolbox::ExecuteSystemCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1045
diff
changeset
|
1002 #endif |
|
1045
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
1003 |
|
1050
64f1842aae2e
Toolbox::ExecuteSystemCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1045
diff
changeset
|
1004 |
|
64f1842aae2e
Toolbox::ExecuteSystemCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1045
diff
changeset
|
1005 #if !defined(_WIN32) |
|
64f1842aae2e
Toolbox::ExecuteSystemCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1045
diff
changeset
|
1006 TEST(Toolbox, ExecuteSystemCommand) |
|
64f1842aae2e
Toolbox::ExecuteSystemCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1045
diff
changeset
|
1007 { |
|
64f1842aae2e
Toolbox::ExecuteSystemCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1045
diff
changeset
|
1008 std::vector<std::string> args(2); |
|
64f1842aae2e
Toolbox::ExecuteSystemCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1045
diff
changeset
|
1009 args[0] = "Hello"; |
|
64f1842aae2e
Toolbox::ExecuteSystemCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1045
diff
changeset
|
1010 args[1] = "World"; |
|
64f1842aae2e
Toolbox::ExecuteSystemCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1045
diff
changeset
|
1011 |
| 2140 | 1012 SystemToolbox::ExecuteSystemCommand("echo", args); |
|
1050
64f1842aae2e
Toolbox::ExecuteSystemCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1045
diff
changeset
|
1013 } |
|
1045
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
1014 #endif |
|
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
1015 |
|
0bfeeb6d340f
json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
971
diff
changeset
|
1016 |
|
1102
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
1017 TEST(Toolbox, IsInteger) |
|
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
1018 { |
|
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
1019 ASSERT_TRUE(Toolbox::IsInteger("00236")); |
|
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
1020 ASSERT_TRUE(Toolbox::IsInteger("-0042")); |
|
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
1021 ASSERT_TRUE(Toolbox::IsInteger("0")); |
|
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
1022 ASSERT_TRUE(Toolbox::IsInteger("-0")); |
|
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
1023 |
|
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
1024 ASSERT_FALSE(Toolbox::IsInteger("")); |
|
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
1025 ASSERT_FALSE(Toolbox::IsInteger("42a")); |
|
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
1026 ASSERT_FALSE(Toolbox::IsInteger("42-")); |
|
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
1027 } |
|
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
1028 |
|
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
1029 |
|
1430
ad94a3583b07
Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1429
diff
changeset
|
1030 TEST(Toolbox, StartsWith) |
|
ad94a3583b07
Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1429
diff
changeset
|
1031 { |
|
ad94a3583b07
Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1429
diff
changeset
|
1032 ASSERT_TRUE(Toolbox::StartsWith("hello world", "")); |
|
ad94a3583b07
Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1429
diff
changeset
|
1033 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
|
1034 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
|
1035 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
|
1036 ASSERT_FALSE(Toolbox::StartsWith("h", "hello")); |
|
ad94a3583b07
Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1429
diff
changeset
|
1037 ASSERT_TRUE(Toolbox::StartsWith("h", "h")); |
|
ad94a3583b07
Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1429
diff
changeset
|
1038 ASSERT_FALSE(Toolbox::StartsWith("", "h")); |
|
ad94a3583b07
Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1429
diff
changeset
|
1039 } |
|
ad94a3583b07
Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1429
diff
changeset
|
1040 |
|
ad94a3583b07
Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1429
diff
changeset
|
1041 |
|
2043
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
1042 TEST(Toolbox, UriEncode) |
|
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
1043 { |
|
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
1044 std::string s; |
|
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
1045 |
|
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
1046 // Unreserved characters must not be modified |
|
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
1047 std::string t = "aAzZ09.-~_"; |
|
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
1048 Toolbox::UriEncode(s, t); |
|
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
1049 ASSERT_EQ(t, s); |
|
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
1050 |
|
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
1051 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
|
1052 Toolbox::UriEncode(s, "%"); ASSERT_EQ("%25", s); |
|
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
1053 |
|
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
1054 // 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
|
1055 // file "../Resources/EncodingTests.py" |
|
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
1056 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
|
1057 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
|
1058 } |
|
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
1059 |
|
35ccba7adae9
Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2017
diff
changeset
|
1060 |
| 2071 | 1061 TEST(Toolbox, AccessJson) |
| 1062 { | |
| 1063 Json::Value v = Json::arrayValue; | |
| 1064 ASSERT_EQ("nope", Toolbox::GetJsonStringField(v, "hello", "nope")); | |
| 1065 | |
| 1066 v = Json::objectValue; | |
| 1067 ASSERT_EQ("nope", Toolbox::GetJsonStringField(v, "hello", "nope")); | |
| 1068 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
|
1069 ASSERT_EQ(10u, Toolbox::GetJsonUnsignedIntegerField(v, "hello", 10)); |
| 2071 | 1070 ASSERT_TRUE(Toolbox::GetJsonBooleanField(v, "hello", true)); |
| 1071 | |
| 1072 v["hello"] = "world"; | |
| 1073 ASSERT_EQ("world", Toolbox::GetJsonStringField(v, "hello", "nope")); | |
| 1074 ASSERT_THROW(Toolbox::GetJsonIntegerField(v, "hello", -10), OrthancException); | |
| 1075 ASSERT_THROW(Toolbox::GetJsonUnsignedIntegerField(v, "hello", 10), OrthancException); | |
| 1076 ASSERT_THROW(Toolbox::GetJsonBooleanField(v, "hello", true), OrthancException); | |
| 1077 | |
| 1078 v["hello"] = -42; | |
| 1079 ASSERT_THROW(Toolbox::GetJsonStringField(v, "hello", "nope"), OrthancException); | |
| 1080 ASSERT_EQ(-42, Toolbox::GetJsonIntegerField(v, "hello", -10)); | |
| 1081 ASSERT_THROW(Toolbox::GetJsonUnsignedIntegerField(v, "hello", 10), OrthancException); | |
| 1082 ASSERT_THROW(Toolbox::GetJsonBooleanField(v, "hello", true), OrthancException); | |
| 1083 | |
| 1084 v["hello"] = 42; | |
| 1085 ASSERT_THROW(Toolbox::GetJsonStringField(v, "hello", "nope"), OrthancException); | |
| 1086 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
|
1087 ASSERT_EQ(42u, Toolbox::GetJsonUnsignedIntegerField(v, "hello", 10)); |
| 2071 | 1088 ASSERT_THROW(Toolbox::GetJsonBooleanField(v, "hello", true), OrthancException); |
| 1089 | |
| 1090 v["hello"] = false; | |
| 1091 ASSERT_THROW(Toolbox::GetJsonStringField(v, "hello", "nope"), OrthancException); | |
| 1092 ASSERT_THROW(Toolbox::GetJsonIntegerField(v, "hello", -10), OrthancException); | |
| 1093 ASSERT_THROW(Toolbox::GetJsonUnsignedIntegerField(v, "hello", 10), OrthancException); | |
| 1094 ASSERT_FALSE(Toolbox::GetJsonBooleanField(v, "hello", true)); | |
| 1095 } | |
| 1096 | |
| 1097 | |
|
2513
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1098 TEST(Toolbox, LinesIterator) |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1099 { |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1100 std::string s; |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1101 |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1102 { |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1103 std::string content; |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1104 Toolbox::LinesIterator it(content); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1105 ASSERT_FALSE(it.GetLine(s)); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1106 } |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1107 |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1108 { |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1109 std::string content = "\n\r"; |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1110 Toolbox::LinesIterator it(content); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1111 ASSERT_TRUE(it.GetLine(s)); it.Next(); ASSERT_EQ("", s); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1112 ASSERT_FALSE(it.GetLine(s)); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1113 } |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1114 |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1115 { |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1116 std::string content = "\n Hello \n\nWorld\n\n"; |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1117 Toolbox::LinesIterator it(content); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1118 ASSERT_TRUE(it.GetLine(s)); it.Next(); ASSERT_EQ("", s); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1119 ASSERT_TRUE(it.GetLine(s)); it.Next(); ASSERT_EQ(" Hello ", s); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1120 ASSERT_TRUE(it.GetLine(s)); it.Next(); ASSERT_EQ("", s); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1121 ASSERT_TRUE(it.GetLine(s)); it.Next(); ASSERT_EQ("World", s); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1122 ASSERT_TRUE(it.GetLine(s)); it.Next(); ASSERT_EQ("", s); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1123 ASSERT_FALSE(it.GetLine(s)); it.Next(); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1124 ASSERT_FALSE(it.GetLine(s)); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1125 } |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1126 |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1127 { |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1128 std::string content = "\r Hello \r\rWorld\r\r"; |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1129 Toolbox::LinesIterator it(content); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1130 ASSERT_TRUE(it.GetLine(s)); it.Next(); ASSERT_EQ("", s); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1131 ASSERT_TRUE(it.GetLine(s)); it.Next(); ASSERT_EQ(" Hello ", s); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1132 ASSERT_TRUE(it.GetLine(s)); it.Next(); ASSERT_EQ("", s); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1133 ASSERT_TRUE(it.GetLine(s)); it.Next(); ASSERT_EQ("World", s); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1134 ASSERT_TRUE(it.GetLine(s)); it.Next(); ASSERT_EQ("", s); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1135 ASSERT_FALSE(it.GetLine(s)); it.Next(); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1136 ASSERT_FALSE(it.GetLine(s)); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1137 } |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1138 |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1139 { |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1140 std::string content = "\n\r Hello \n\r\n\rWorld\n\r\n\r"; |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1141 Toolbox::LinesIterator it(content); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1142 ASSERT_TRUE(it.GetLine(s)); it.Next(); ASSERT_EQ("", s); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1143 ASSERT_TRUE(it.GetLine(s)); it.Next(); ASSERT_EQ(" Hello ", s); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1144 ASSERT_TRUE(it.GetLine(s)); it.Next(); ASSERT_EQ("", s); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1145 ASSERT_TRUE(it.GetLine(s)); it.Next(); ASSERT_EQ("World", s); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1146 ASSERT_TRUE(it.GetLine(s)); it.Next(); ASSERT_EQ("", s); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1147 ASSERT_FALSE(it.GetLine(s)); it.Next(); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1148 ASSERT_FALSE(it.GetLine(s)); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1149 } |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1150 |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1151 { |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1152 std::string content = "\r\n Hello \r\n\r\nWorld\r\n\r\n"; |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1153 Toolbox::LinesIterator it(content); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1154 ASSERT_TRUE(it.GetLine(s)); it.Next(); ASSERT_EQ("", s); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1155 ASSERT_TRUE(it.GetLine(s)); it.Next(); ASSERT_EQ(" Hello ", s); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1156 ASSERT_TRUE(it.GetLine(s)); it.Next(); ASSERT_EQ("", s); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1157 ASSERT_TRUE(it.GetLine(s)); it.Next(); ASSERT_EQ("World", s); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1158 ASSERT_TRUE(it.GetLine(s)); it.Next(); ASSERT_EQ("", s); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1159 ASSERT_FALSE(it.GetLine(s)); it.Next(); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1160 ASSERT_FALSE(it.GetLine(s)); |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1161 } |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1162 } |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1163 |
|
97a74f0eac7a
loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
1164 |
|
2920
ad0e7def3338
Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2908
diff
changeset
|
1165 TEST(Toolbox, SubstituteVariables) |
|
ad0e7def3338
Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2908
diff
changeset
|
1166 { |
|
ad0e7def3338
Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2908
diff
changeset
|
1167 std::map<std::string, std::string> env; |
|
ad0e7def3338
Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2908
diff
changeset
|
1168 env["NOPE"] = "nope"; |
|
ad0e7def3338
Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2908
diff
changeset
|
1169 env["WORLD"] = "world"; |
|
ad0e7def3338
Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2908
diff
changeset
|
1170 |
|
ad0e7def3338
Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2908
diff
changeset
|
1171 ASSERT_EQ("Hello world\r\nWorld \r\nDone world\r\n", |
|
ad0e7def3338
Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2908
diff
changeset
|
1172 Toolbox::SubstituteVariables( |
|
ad0e7def3338
Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2908
diff
changeset
|
1173 "Hello ${WORLD}\r\nWorld ${HELLO}\r\nDone ${WORLD}\r\n", |
|
ad0e7def3338
Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2908
diff
changeset
|
1174 env)); |
|
ad0e7def3338
Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2908
diff
changeset
|
1175 |
|
2921
0a4428aad512
variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2920
diff
changeset
|
1176 ASSERT_EQ("world A a B world C 'c' D {\"a\":\"b\"} E ", |
|
0a4428aad512
variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2920
diff
changeset
|
1177 Toolbox::SubstituteVariables( |
|
0a4428aad512
variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2920
diff
changeset
|
1178 "${WORLD} A ${WORLD2:-a} B ${WORLD:-b} C ${WORLD2:-\"'c'\"} D ${WORLD2:-'{\"a\":\"b\"}'} E ${WORLD2:-}", |
|
0a4428aad512
variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2920
diff
changeset
|
1179 env)); |
|
0a4428aad512
variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2920
diff
changeset
|
1180 |
|
2920
ad0e7def3338
Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2908
diff
changeset
|
1181 SystemToolbox::GetEnvironmentVariables(env); |
|
ad0e7def3338
Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2908
diff
changeset
|
1182 ASSERT_TRUE(env.find("NOPE") == env.end()); |
|
ad0e7def3338
Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2908
diff
changeset
|
1183 |
|
ad0e7def3338
Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2908
diff
changeset
|
1184 // The "PATH" environment variable should always be available on |
|
ad0e7def3338
Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2908
diff
changeset
|
1185 // machines running the unit tests |
|
ad0e7def3338
Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2908
diff
changeset
|
1186 ASSERT_TRUE(env.find("PATH") != env.end()); |
|
2921
0a4428aad512
variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2920
diff
changeset
|
1187 |
|
0a4428aad512
variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2920
diff
changeset
|
1188 ASSERT_EQ("A" + env["PATH"] + "B", |
|
0a4428aad512
variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2920
diff
changeset
|
1189 Toolbox::SubstituteVariables("A${PATH}B", env)); |
|
2920
ad0e7def3338
Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2908
diff
changeset
|
1190 } |
|
ad0e7def3338
Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2908
diff
changeset
|
1191 |
|
ad0e7def3338
Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2908
diff
changeset
|
1192 |
| 0 | 1193 int main(int argc, char **argv) |
| 1194 { | |
|
1485
27661b33f624
Creation of Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1441
diff
changeset
|
1195 Logging::Initialize(); |
|
27661b33f624
Creation of Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1441
diff
changeset
|
1196 Logging::EnableInfoLevel(true); |
|
27661b33f624
Creation of Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1441
diff
changeset
|
1197 Toolbox::DetectEndianness(); |
| 2140 | 1198 SystemToolbox::MakeDirectory("UnitTestsResults"); |
|
1485
27661b33f624
Creation of Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1441
diff
changeset
|
1199 OrthancInitialize(); |
|
159
c08fbad40ddd
less verbosity in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
137
diff
changeset
|
1200 |
| 0 | 1201 ::testing::InitGoogleTest(&argc, argv); |
| 1202 int result = RUN_ALL_TESTS(); | |
|
1485
27661b33f624
Creation of Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1441
diff
changeset
|
1203 |
| 63 | 1204 OrthancFinalize(); |
|
1485
27661b33f624
Creation of Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1441
diff
changeset
|
1205 Logging::Finalize(); |
|
27661b33f624
Creation of Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1441
diff
changeset
|
1206 |
| 0 | 1207 return result; |
| 1208 } |