orthanc: UnitTestsSources/RestApiTests.cpp annotate

annotate UnitTestsSources/RestApiTests.cpp @ 3783:c1a180539fee TomasZubiri/minor-typo-in-comments-1553026669603

closing pull request

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 19 Mar 2020 09:36:41 +0100
parents	4e43e67f8ecf
children	4acd1431e603

rev	line source
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 diff changeset	1 /**
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1783 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1064 diff changeset	4 * Department, University Hospital of Liege, Belgium
3060 4e43e67f8ecf preparing for 2019 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2924 diff changeset	5 * Copyright (C) 2017-2019 Osimis S.A., Belgium
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 diff changeset	6 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 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: 707 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: 707 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: 707 diff changeset	10 * License, or (at your option) any later version.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 diff changeset	11 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 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: 707 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: 707 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: 707 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: 707 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: 707 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: 707 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: 707 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: 707 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: 707 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: 707 diff changeset	22 * in the program, then also delete it here.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 diff changeset	23 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 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: 707 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: 707 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: 707 diff changeset	27 * General Public License for more details.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 diff changeset	28 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 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: 707 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: 707 diff changeset	31 **/
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 diff changeset	32
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 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"
209 9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35 #include "gtest/gtest.h"
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	37 #include <ctype.h>
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	38 #include <boost/lexical_cast.hpp>
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	39 #include <algorithm>
209 9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	40
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	41 #include "../Core/ChunkedBuffer.h"
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	42 #include "../Core/HttpClient.h"
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	43 #include "../Core/Logging.h"
2143 fd5875662670 creation of namespace SystemToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	44 #include "../Core/SystemToolbox.h"
209 9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45 #include "../Core/RestApi/RestApi.h"
221 e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	46 #include "../Core/OrthancException.h"
e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	47 #include "../Core/Compression/ZlibCompressor.h"
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	48 #include "../Core/RestApi/RestApiHierarchy.h"
1783 dbb07eb1a2f3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1782 diff changeset	49 #include "../Core/HttpServer/HttpContentNegociation.h"
209 9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	51 using namespace Orthanc;
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	52
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	53 #if !defined(UNIT_TESTS_WITH_HTTP_CONNEXIONS)
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	54 #error "Please set UNIT_TESTS_WITH_HTTP_CONNEXIONS"
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	55 #endif
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	56
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	57
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	58
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	59 TEST(HttpClient, Basic)
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	60 {
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	61 HttpClient c;
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	62 ASSERT_FALSE(c.IsVerbose());
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	63 c.SetVerbose(true);
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	64 ASSERT_TRUE(c.IsVerbose());
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	65 c.SetVerbose(false);
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	66 ASSERT_FALSE(c.IsVerbose());
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	67
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	68 #if UNIT_TESTS_WITH_HTTP_CONNEXIONS == 1
2386 883387e2b379 remove dependendy upon ULg Montefiore Web server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2363 diff changeset	69 // The "http://www.orthanc-server.com/downloads/third-party/" does
883387e2b379 remove dependendy upon ULg Montefiore Web server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2363 diff changeset	70 // not automatically redirect to HTTPS, so we cas use it even if the
883387e2b379 remove dependendy upon ULg Montefiore Web server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2363 diff changeset	71 // OpenSSL/HTTPS support is disabled in curl
883387e2b379 remove dependendy upon ULg Montefiore Web server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2363 diff changeset	72 const std::string BASE = "http://www.orthanc-server.com/downloads/third-party/";
2363 f8ef157f2d73 fix unit tests given www.orthanc-server.com now mandatory uses HTTPS Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	73
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	74 Json::Value v;
2363 f8ef157f2d73 fix unit tests given www.orthanc-server.com now mandatory uses HTTPS Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	75 c.SetUrl(BASE + "Product.json");
f8ef157f2d73 fix unit tests given www.orthanc-server.com now mandatory uses HTTPS Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	76
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	77 c.Apply(v);
2187 ad72fbd700b7 move of third party downloads to the main server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	78 ASSERT_TRUE(v.type() == Json::objectValue);
ad72fbd700b7 move of third party downloads to the main server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	79 ASSERT_TRUE(v.isMember("Description"));
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	80 #endif
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	81 }
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	82
1532 b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	83
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	84 #if UNIT_TESTS_WITH_HTTP_CONNEXIONS == 1 && ORTHANC_ENABLE_SSL == 1
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	85
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	86 /**
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	87 The HTTPS CA certificates for BitBucket were extracted as follows:
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	88
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	89 (1) We retrieve the certification chain of BitBucket:
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	90
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	91 # echo \| openssl s_client -showcerts -connect www.bitbucket.org:443
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	92
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	93 (2) We see that the certification authority (CA) is
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	94 "www.digicert.com", and the root certificate is "DigiCert High
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	95 Assurance EV Root CA". As a consequence, we navigate to DigiCert to
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	96 find the URL to this CA certificate:
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	97
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	98 firefox https://www.digicert.com/digicert-root-certificates.htm
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	99
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	100 (3) Once we get the URL to the CA certificate, we convert it to a C
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	101 macro that can be used by libcurl:
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	102
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	103 # cd UnitTestsSources
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	104 # ../Resources/RetrieveCACertificates.py BITBUCKET_CERTIFICATES https://www.digicert.com/CACerts/DigiCertHighAssuranceEVRootCA.crt > BitbucketCACertificates.h
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	105 **/
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	106
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	107 #include "BitbucketCACertificates.h"
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	108
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1532 diff changeset	109 TEST(HttpClient, Ssl)
1532 b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	110 {
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	111 SystemToolbox::WriteFile(BITBUCKET_CERTIFICATES, "UnitTestsResults/bitbucket.cert");
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	112
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	113 /*{
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	114 std::string s;
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	115 SystemToolbox::ReadFile(s, "/usr/share/ca-certificates/mozilla/WoSign.crt");
aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	116 SystemToolbox::WriteFile(s, "UnitTestsResults/bitbucket.cert");
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	117 }*/
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	118
1532 b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	119 HttpClient c;
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	120 c.SetHttpsVerifyPeers(true);
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	121 c.SetHttpsCACertificates("UnitTestsResults/bitbucket.cert");
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1532 diff changeset	122 c.SetUrl("https://bitbucket.org/sjodogne/orthanc/raw/Orthanc-0.9.3/Resources/Configuration.json");
1532 b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	123
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	124 Json::Value v;
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	125 c.Apply(v);
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	126 ASSERT_TRUE(v.isMember("LuaScripts"));
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	127 }
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1532 diff changeset	128
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	129 TEST(HttpClient, SslNoVerification)
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	130 {
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	131 HttpClient c;
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	132 c.SetHttpsVerifyPeers(false);
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	133 c.SetUrl("https://bitbucket.org/sjodogne/orthanc/raw/Orthanc-0.9.3/Resources/Configuration.json");
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	134
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	135 Json::Value v;
1532 b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	136 c.Apply(v);
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	137 ASSERT_TRUE(v.isMember("LuaScripts"));
1532 b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	138 }
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	139
1532 b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	140 #endif
b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	141
b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	142
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	143 TEST(RestApi, ChunkedBuffer)
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	144 {
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	145 ChunkedBuffer b;
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1486 diff changeset	146 ASSERT_EQ(0u, b.GetNumBytes());
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	147
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	148 b.AddChunk("hello", 5);
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1486 diff changeset	149 ASSERT_EQ(5u, b.GetNumBytes());
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	150
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	151 b.AddChunk("world", 5);
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1486 diff changeset	152 ASSERT_EQ(10u, b.GetNumBytes());
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	153
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	154 std::string s;
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	155 b.Flatten(s);
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	156 ASSERT_EQ("helloworld", s);
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	157 }
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	158
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	159 TEST(RestApi, ParseCookies)
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	160 {
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1419 diff changeset	161 IHttpHandler::Arguments headers;
f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1419 diff changeset	162 IHttpHandler::Arguments cookies;
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	163
332 c51c9ed603e6 fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 330 diff changeset	164 headers["cookie"] = "a=b;c=d;;;e=f;;g=h;";
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1419 diff changeset	165 HttpToolbox::ParseCookies(cookies, headers);
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	166 ASSERT_EQ(4u, cookies.size());
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	167 ASSERT_EQ("b", cookies["a"]);
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	168 ASSERT_EQ("d", cookies["c"]);
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	169 ASSERT_EQ("f", cookies["e"]);
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	170 ASSERT_EQ("h", cookies["g"]);
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	171
332 c51c9ed603e6 fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 330 diff changeset	172 headers["cookie"] = " name = value ; name2=value2";
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1419 diff changeset	173 HttpToolbox::ParseCookies(cookies, headers);
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	174 ASSERT_EQ(2u, cookies.size());
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	175 ASSERT_EQ("value", cookies["name"]);
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	176 ASSERT_EQ("value2", cookies["name2"]);
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	177
332 c51c9ed603e6 fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 330 diff changeset	178 headers["cookie"] = " ;;; ";
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1419 diff changeset	179 HttpToolbox::ParseCookies(cookies, headers);
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	180 ASSERT_EQ(0u, cookies.size());
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	181
332 c51c9ed603e6 fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 330 diff changeset	182 headers["cookie"] = " ; n=v ;; ";
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1419 diff changeset	183 HttpToolbox::ParseCookies(cookies, headers);
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	184 ASSERT_EQ(1u, cookies.size());
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	185 ASSERT_EQ("v", cookies["n"]);
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	186 }
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	187
209 9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	188 TEST(RestApi, RestApiPath)
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	189 {
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1419 diff changeset	190 IHttpHandler::Arguments args;
209 9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	191 UriComponents trail;
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	192
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	193 {
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	194 RestApiPath uri("/coucou/{abc}/d/*");
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	195 ASSERT_TRUE(uri.Match(args, trail, "/coucou/moi/d/e/f/g"));
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	196 ASSERT_EQ(1u, args.size());
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	197 ASSERT_EQ(3u, trail.size());
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	198 ASSERT_EQ("moi", args["abc"]);
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	199 ASSERT_EQ("e", trail[0]);
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	200 ASSERT_EQ("f", trail[1]);
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	201 ASSERT_EQ("g", trail[2]);
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	202
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	203 ASSERT_FALSE(uri.Match(args, trail, "/coucou/moi/f"));
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	204 ASSERT_TRUE(uri.Match(args, trail, "/coucou/moi/d/"));
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	205 ASSERT_FALSE(uri.Match(args, trail, "/a/moi/d"));
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	206 ASSERT_FALSE(uri.Match(args, trail, "/coucou/moi"));
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	207
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	208 ASSERT_EQ(3u, uri.GetLevelCount());
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	209 ASSERT_TRUE(uri.IsUniversalTrailing());
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	210
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	211 ASSERT_EQ("coucou", uri.GetLevelName(0));
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	212 ASSERT_THROW(uri.GetWildcardName(0), OrthancException);
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	213
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	214 ASSERT_EQ("abc", uri.GetWildcardName(1));
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	215 ASSERT_THROW(uri.GetLevelName(1), OrthancException);
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	216
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	217 ASSERT_EQ("d", uri.GetLevelName(2));
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	218 ASSERT_THROW(uri.GetWildcardName(2), OrthancException);
209 9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	219 }
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	220
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	221 {
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	222 RestApiPath uri("/coucou/{abc}/d");
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	223 ASSERT_FALSE(uri.Match(args, trail, "/coucou/moi/d/e/f/g"));
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	224 ASSERT_TRUE(uri.Match(args, trail, "/coucou/moi/d"));
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	225 ASSERT_EQ(1u, args.size());
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	226 ASSERT_EQ(0u, trail.size());
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	227 ASSERT_EQ("moi", args["abc"]);
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	228
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	229 ASSERT_EQ(3u, uri.GetLevelCount());
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	230 ASSERT_FALSE(uri.IsUniversalTrailing());
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	231
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	232 ASSERT_EQ("coucou", uri.GetLevelName(0));
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	233 ASSERT_THROW(uri.GetWildcardName(0), OrthancException);
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	234
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	235 ASSERT_EQ("abc", uri.GetWildcardName(1));
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	236 ASSERT_THROW(uri.GetLevelName(1), OrthancException);
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	237
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	238 ASSERT_EQ("d", uri.GetLevelName(2));
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	239 ASSERT_THROW(uri.GetWildcardName(2), OrthancException);
209 9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	240 }
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	241
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	242 {
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	243 RestApiPath uri("/*");
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	244 ASSERT_TRUE(uri.Match(args, trail, "/a/b/c"));
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	245 ASSERT_EQ(0u, args.size());
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	246 ASSERT_EQ(3u, trail.size());
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	247 ASSERT_EQ("a", trail[0]);
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	248 ASSERT_EQ("b", trail[1]);
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	249 ASSERT_EQ("c", trail[2]);
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	250
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	251 ASSERT_EQ(0u, uri.GetLevelCount());
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	252 ASSERT_TRUE(uri.IsUniversalTrailing());
209 9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	253 }
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	254 }
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	255
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	256
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	257
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	258
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	259
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	260
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	261 static int testValue;
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	262
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	263 template <int value>
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 970 diff changeset	264 static void SetValue(RestApiGetCall& get)
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	265 {
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	266 testValue = value;
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	267 }
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	268
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	269
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	270 static bool GetDirectory(Json::Value& target,
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	271 RestApiHierarchy& hierarchy,
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	272 const std::string& uri)
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	273 {
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	274 UriComponents p;
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	275 Toolbox::SplitUriComponents(p, uri);
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	276 return hierarchy.GetDirectory(target, p);
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	277 }
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	278
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	279
978 ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	280
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	281 namespace
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	282 {
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	283 class MyVisitor : public RestApiHierarchy::IVisitor
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	284 {
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	285 public:
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	286 virtual bool Visit(const RestApiHierarchy::Resource& resource,
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	287 const UriComponents& uri,
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1419 diff changeset	288 const IHttpHandler::Arguments& components,
2924 22524fd06225 macros ORTHANC_OVERRIDE and ORTHANC_FINAL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2824 diff changeset	289 const UriComponents& trailing) ORTHANC_OVERRIDE
978 ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	290 {
2543 6c72ef308cb3 fix openbsd Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	291 return resource.Handle((RestApiGetCall) NULL);
978 ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	292 }
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	293 };
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	294 }
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	295
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	296
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	297 static bool HandleGet(RestApiHierarchy& hierarchy,
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	298 const std::string& uri)
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	299 {
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	300 UriComponents p;
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	301 Toolbox::SplitUriComponents(p, uri);
978 ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	302 MyVisitor visitor;
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	303 return hierarchy.LookupResource(p, visitor);
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	304 }
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	305
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	306
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	307 TEST(RestApi, RestApiHierarchy)
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	308 {
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	309 RestApiHierarchy root;
970 1a3817d84f39 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 969 diff changeset	310 root.Register("/hello/world/test", SetValue<1>);
1a3817d84f39 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 969 diff changeset	311 root.Register("/hello/world/test2", SetValue<2>);
1a3817d84f39 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 969 diff changeset	312 root.Register("/hello/{world}/test3/test4", SetValue<3>);
1a3817d84f39 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 969 diff changeset	313 root.Register("/hello2/*", SetValue<4>);
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	314
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	315 Json::Value m;
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	316 root.CreateSiteMap(m);
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	317 std::cout << m;
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	318
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	319 Json::Value d;
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	320 ASSERT_FALSE(GetDirectory(d, root, "/hello"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	321
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	322 ASSERT_TRUE(GetDirectory(d, root, "/hello/a"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	323 ASSERT_EQ(1u, d.size());
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	324 ASSERT_EQ("test3", d[0].asString());
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	325
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	326 ASSERT_TRUE(GetDirectory(d, root, "/hello/world"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	327 ASSERT_EQ(2u, d.size());
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	328
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	329 ASSERT_TRUE(GetDirectory(d, root, "/hello/a/test3"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	330 ASSERT_EQ(1u, d.size());
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	331 ASSERT_EQ("test4", d[0].asString());
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	332
1064 cd20e2568fc2 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 978 diff changeset	333 ASSERT_TRUE(GetDirectory(d, root, "/hello/world/test"));
cd20e2568fc2 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 978 diff changeset	334 ASSERT_TRUE(GetDirectory(d, root, "/hello/world/test2"));
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	335 ASSERT_FALSE(GetDirectory(d, root, "/hello2"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	336
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	337 testValue = 0;
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	338 ASSERT_TRUE(HandleGet(root, "/hello/world/test"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	339 ASSERT_EQ(testValue, 1);
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	340 ASSERT_TRUE(HandleGet(root, "/hello/world/test2"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	341 ASSERT_EQ(testValue, 2);
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	342 ASSERT_TRUE(HandleGet(root, "/hello/b/test3/test4"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	343 ASSERT_EQ(testValue, 3);
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	344 ASSERT_FALSE(HandleGet(root, "/hello/b/test3/test"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	345 ASSERT_EQ(testValue, 3);
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	346 ASSERT_TRUE(HandleGet(root, "/hello2/a/b"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	347 ASSERT_EQ(testValue, 4);
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	348 }
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	349
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	350
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	351
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	352
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	353
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	354 namespace
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	355 {
1782 9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	356 class AcceptHandler : public Orthanc::HttpContentNegociation::IHandler
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	357 {
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	358 private:
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	359 std::string type_;
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	360 std::string subtype_;
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	361
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	362 public:
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	363 AcceptHandler()
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	364 {
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	365 Reset();
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	366 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	367
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	368 void Reset()
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	369 {
1782 9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	370 Handle("nope", "nope");
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	371 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	372
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	373 const std::string& GetType() const
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	374 {
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	375 return type_;
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	376 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	377
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	378 const std::string& GetSubType() const
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	379 {
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	380 return subtype_;
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	381 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	382
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	383 virtual void Handle(const std::string& type,
2924 22524fd06225 macros ORTHANC_OVERRIDE and ORTHANC_FINAL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2824 diff changeset	384 const std::string& subtype) ORTHANC_OVERRIDE
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	385 {
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	386 type_ = type;
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	387 subtype_ = subtype;
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	388 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	389 };
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	390 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	391
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	392
1782 9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	393 TEST(RestApi, HttpContentNegociation)
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	394 {
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	395 // Reference: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	396
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	397 AcceptHandler h;
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	398
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	399 {
1782 9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	400 Orthanc::HttpContentNegociation d;
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	401 d.Register("audio/mp3", h);
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	402 d.Register("audio/basic", h);
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	403
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	404 ASSERT_TRUE(d.Apply("audio/*; q=0.2, audio/basic"));
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	405 ASSERT_EQ("audio", h.GetType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	406 ASSERT_EQ("basic", h.GetSubType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	407
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	408 ASSERT_TRUE(d.Apply("audio/*; q=0.2, audio/nope"));
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	409 ASSERT_EQ("audio", h.GetType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	410 ASSERT_EQ("mp3", h.GetSubType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	411
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	412 ASSERT_FALSE(d.Apply("application/*; q=0.2, application/pdf"));
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	413
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	414 ASSERT_TRUE(d.Apply("/; application/*; q=0.2, application/pdf"));
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	415 ASSERT_EQ("audio", h.GetType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	416 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	417
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	418 // "This would be interpreted as "text/html and text/x-c are the
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	419 // preferred media types, but if they do not exist, then send the
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	420 // text/x-dvi entity, and if that does not exist, send the
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	421 // text/plain entity.""
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	422 const std::string T1 = "text/plain; q=0.5, text/html, text/x-dvi; q=0.8, text/x-c";
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	423
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	424 {
1782 9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	425 Orthanc::HttpContentNegociation d;
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	426 d.Register("text/plain", h);
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	427 d.Register("text/html", h);
1782 9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	428 d.Register("text/x-dvi", h);
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	429 ASSERT_TRUE(d.Apply(T1));
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	430 ASSERT_EQ("text", h.GetType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	431 ASSERT_EQ("html", h.GetSubType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	432 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	433
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	434 {
1782 9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	435 Orthanc::HttpContentNegociation d;
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	436 d.Register("text/plain", h);
1782 9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	437 d.Register("text/x-dvi", h);
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	438 d.Register("text/x-c", h);
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	439 ASSERT_TRUE(d.Apply(T1));
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	440 ASSERT_EQ("text", h.GetType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	441 ASSERT_EQ("x-c", h.GetSubType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	442 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	443
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	444 {
1782 9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	445 Orthanc::HttpContentNegociation d;
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	446 d.Register("text/plain", h);
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	447 d.Register("text/x-dvi", h);
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	448 d.Register("text/x-c", h);
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	449 d.Register("text/html", h);
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	450 ASSERT_TRUE(d.Apply(T1));
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	451 ASSERT_EQ("text", h.GetType());
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	452 ASSERT_TRUE(h.GetSubType() == "x-c" \|\| h.GetSubType() == "html");
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	453 }
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	454
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	455 {
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	456 Orthanc::HttpContentNegociation d;
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	457 d.Register("text/plain", h);
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	458 d.Register("text/x-dvi", h);
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	459 ASSERT_TRUE(d.Apply(T1));
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	460 ASSERT_EQ("text", h.GetType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	461 ASSERT_EQ("x-dvi", h.GetSubType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	462 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	463
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	464 {
1782 9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	465 Orthanc::HttpContentNegociation d;
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	466 d.Register("text/plain", h);
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	467 ASSERT_TRUE(d.Apply(T1));
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	468 ASSERT_EQ("text", h.GetType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	469 ASSERT_EQ("plain", h.GetSubType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	470 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	471 }
2800 dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	472
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	473
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	474 TEST(WebServiceParameters, Serialization)
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	475 {
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	476 {
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	477 Json::Value v = Json::arrayValue;
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	478 v.append("http://localhost:8042/");
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	479
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	480 WebServiceParameters p(v);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	481 ASSERT_FALSE(p.IsAdvancedFormatNeeded());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	482
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	483 Json::Value v2;
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	484 p.Serialize(v2, false, true);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	485 ASSERT_EQ(v, v2);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	486
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	487 WebServiceParameters p2(v2);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	488 ASSERT_EQ("http://localhost:8042/", p2.GetUrl());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	489 ASSERT_TRUE(p2.GetUsername().empty());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	490 ASSERT_TRUE(p2.GetPassword().empty());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	491 ASSERT_TRUE(p2.GetCertificateFile().empty());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	492 ASSERT_TRUE(p2.GetCertificateKeyFile().empty());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	493 ASSERT_TRUE(p2.GetCertificateKeyPassword().empty());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	494 ASSERT_FALSE(p2.IsPkcs11Enabled());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	495 }
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	496
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	497 {
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	498 Json::Value v = Json::arrayValue;
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	499 v.append("http://localhost:8042/");
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	500 v.append("user");
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	501 v.append("pass");
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	502
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	503 WebServiceParameters p(v);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	504 ASSERT_FALSE(p.IsAdvancedFormatNeeded());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	505 ASSERT_EQ("http://localhost:8042/", p.GetUrl());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	506 ASSERT_EQ("user", p.GetUsername());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	507 ASSERT_EQ("pass", p.GetPassword());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	508 ASSERT_TRUE(p.GetCertificateFile().empty());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	509 ASSERT_TRUE(p.GetCertificateKeyFile().empty());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	510 ASSERT_TRUE(p.GetCertificateKeyPassword().empty());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	511 ASSERT_FALSE(p.IsPkcs11Enabled());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	512
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	513 Json::Value v2;
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	514 p.Serialize(v2, false, true);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	515 ASSERT_EQ(v, v2);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	516
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	517 p.Serialize(v2, false, false /* no password */);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	518 WebServiceParameters p2(v2);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	519 ASSERT_EQ(Json::arrayValue, v2.type());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	520 ASSERT_EQ(3u, v2.size());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	521 ASSERT_EQ("http://localhost:8042/", v2[0u].asString());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	522 ASSERT_EQ("user", v2[1u].asString());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	523 ASSERT_TRUE(v2[2u].asString().empty());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	524 }
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	525
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	526 {
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	527 Json::Value v = Json::arrayValue;
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	528 v.append("http://localhost:8042/");
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	529
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	530 WebServiceParameters p(v);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	531 ASSERT_FALSE(p.IsAdvancedFormatNeeded());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	532 p.SetPkcs11Enabled(true);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	533 ASSERT_TRUE(p.IsAdvancedFormatNeeded());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	534
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	535 Json::Value v2;
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	536 p.Serialize(v2, false, true);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	537 WebServiceParameters p2(v2);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	538
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	539 ASSERT_EQ(Json::objectValue, v2.type());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	540 ASSERT_EQ(3u, v2.size());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	541 ASSERT_EQ("http://localhost:8042/", v2["Url"].asString());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	542 ASSERT_TRUE(v2["Pkcs11"].asBool());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	543 ASSERT_EQ(Json::objectValue, v2["HttpHeaders"].type());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	544 ASSERT_EQ(0u, v2["HttpHeaders"].size());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	545 }
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	546
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	547 {
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	548 Json::Value v = Json::arrayValue;
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	549 v.append("http://localhost:8042/");
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	550
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	551 WebServiceParameters p(v);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	552 ASSERT_FALSE(p.IsAdvancedFormatNeeded());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	553 p.SetClientCertificate("a", "b", "c");
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	554 ASSERT_TRUE(p.IsAdvancedFormatNeeded());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	555
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	556 Json::Value v2;
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	557 p.Serialize(v2, false, true);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	558 WebServiceParameters p2(v2);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	559
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	560 ASSERT_EQ(Json::objectValue, v2.type());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	561 ASSERT_EQ(6u, v2.size());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	562 ASSERT_EQ("http://localhost:8042/", v2["Url"].asString());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	563 ASSERT_EQ("a", v2["CertificateFile"].asString());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	564 ASSERT_EQ("b", v2["CertificateKeyFile"].asString());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	565 ASSERT_EQ("c", v2["CertificateKeyPassword"].asString());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	566 ASSERT_FALSE(v2["Pkcs11"].asBool());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	567 ASSERT_EQ(Json::objectValue, v2["HttpHeaders"].type());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	568 ASSERT_EQ(0u, v2["HttpHeaders"].size());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	569 }
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	570
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	571 {
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	572 Json::Value v = Json::arrayValue;
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	573 v.append("http://localhost:8042/");
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	574
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	575 WebServiceParameters p(v);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	576 ASSERT_FALSE(p.IsAdvancedFormatNeeded());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	577 p.AddHttpHeader("a", "b");
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	578 p.AddHttpHeader("c", "d");
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	579 ASSERT_TRUE(p.IsAdvancedFormatNeeded());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	580
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	581 Json::Value v2;
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	582 p.Serialize(v2, false, true);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	583 WebServiceParameters p2(v2);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	584
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	585 ASSERT_EQ(Json::objectValue, v2.type());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	586 ASSERT_EQ(3u, v2.size());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	587 ASSERT_EQ("http://localhost:8042/", v2["Url"].asString());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	588 ASSERT_FALSE(v2["Pkcs11"].asBool());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	589 ASSERT_EQ(Json::objectValue, v2["HttpHeaders"].type());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	590 ASSERT_EQ(2u, v2["HttpHeaders"].size());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	591 ASSERT_EQ("b", v2["HttpHeaders"]["a"].asString());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	592 ASSERT_EQ("d", v2["HttpHeaders"]["c"].asString());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	593
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	594 std::set<std::string> a;
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	595 p2.ListHttpHeaders(a);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	596 ASSERT_EQ(2u, a.size());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	597 ASSERT_TRUE(a.find("a") != a.end());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	598 ASSERT_TRUE(a.find("c") != a.end());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	599
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	600 std::string s;
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	601 ASSERT_TRUE(p2.LookupHttpHeader(s, "a")); ASSERT_EQ("b", s);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	602 ASSERT_TRUE(p2.LookupHttpHeader(s, "c")); ASSERT_EQ("d", s);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	603 ASSERT_FALSE(p2.LookupHttpHeader(s, "nope"));
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	604 }
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	605 }
2823 807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	606
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	607
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	608 TEST(WebServiceParameters, UserProperties)
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	609 {
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	610 Json::Value v = Json::nullValue;
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	611
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	612 {
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	613 WebServiceParameters p;
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	614 p.SetUrl("http://localhost:8042/");
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	615 ASSERT_FALSE(p.IsAdvancedFormatNeeded());
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	616
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	617 ASSERT_THROW(p.AddUserProperty("Url", "nope"), OrthancException);
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	618 p.AddUserProperty("Hello", "world");
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	619 p.AddUserProperty("a", "b");
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	620 ASSERT_TRUE(p.IsAdvancedFormatNeeded());
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	621
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	622 p.Serialize(v, false, true);
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	623
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	624 p.ClearUserProperties();
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	625 ASSERT_FALSE(p.IsAdvancedFormatNeeded());
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	626 }
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	627
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	628 {
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	629 WebServiceParameters p(v);
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	630 ASSERT_TRUE(p.IsAdvancedFormatNeeded());
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	631 ASSERT_TRUE(p.GetHttpHeaders().empty());
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	632
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	633 std::set<std::string> tmp;
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	634 p.ListUserProperties(tmp);
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	635 ASSERT_EQ(2u, tmp.size());
2824 0e1b79bc4a2d fix for msvc Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	636 ASSERT_TRUE(tmp.find("a") != tmp.end());
0e1b79bc4a2d fix for msvc Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	637 ASSERT_TRUE(tmp.find("Hello") != tmp.end());
0e1b79bc4a2d fix for msvc Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	638 ASSERT_TRUE(tmp.find("hello") == tmp.end());
2823 807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	639
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	640 std::string s;
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	641 ASSERT_TRUE(p.LookupUserProperty(s, "a")); ASSERT_TRUE(s == "b");
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	642 ASSERT_TRUE(p.LookupUserProperty(s, "Hello")); ASSERT_TRUE(s == "world");
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	643 ASSERT_FALSE(p.LookupUserProperty(s, "hello"));
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	644 }
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	645 }

Mercurial > hg > orthanc

annotate UnitTestsSources/RestApiTests.cpp @ 3783:c1a180539fee TomasZubiri/minor-typo-in-comments-1553026669603