orthanc: OrthancFramework/UnitTestsSources/RestApiTests.cpp annotate

annotate OrthancFramework/UnitTestsSources/RestApiTests.cpp @ 4044:d25f4c0fa160 framework

splitting code into OrthancFramework and OrthancServer

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 10 Jun 2020 20:30:34 +0200
parents	UnitTestsSources/RestApiTests.cpp@27628b0f6ada
children	05b8fd21089c

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
3640 94f4a18a79cc upgrade to year 2020 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3399 diff changeset	5 * Copyright (C) 2017-2020 Osimis S.A., Belgium
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 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
3992 f9863630ec7f working on the shared library for Orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 3853 diff changeset	34 #if ORTHANC_UNIT_TESTS_LINK_FRAMEWORK == 1
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 3992 diff changeset	35 # include <OrthancFramework.h>
3992 f9863630ec7f working on the shared library for Orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 3853 diff changeset	36 #endif
f9863630ec7f working on the shared library for Orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 3853 diff changeset	37
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 827 diff changeset	38 #include "PrecompiledHeadersUnitTests.h"
209 9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	39 #include "gtest/gtest.h"
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	40
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	41 #include <ctype.h>
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	42 #include <boost/lexical_cast.hpp>
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	43 #include <algorithm>
209 9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	45 #include "../Core/ChunkedBuffer.h"
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	46 #include "../Core/HttpClient.h"
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	47 #include "../Core/Logging.h"
2143 fd5875662670 creation of namespace SystemToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	48 #include "../Core/SystemToolbox.h"
209 9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49 #include "../Core/RestApi/RestApi.h"
221 e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	50 #include "../Core/OrthancException.h"
e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	51 #include "../Core/Compression/ZlibCompressor.h"
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	52 #include "../Core/RestApi/RestApiHierarchy.h"
1783 dbb07eb1a2f3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1782 diff changeset	53 #include "../Core/HttpServer/HttpContentNegociation.h"
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	54 #include "../Core/HttpServer/MultipartStreamReader.h"
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	55
209 9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	56
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57 using namespace Orthanc;
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	59 #if !defined(UNIT_TESTS_WITH_HTTP_CONNEXIONS)
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	60 #error "Please set UNIT_TESTS_WITH_HTTP_CONNEXIONS"
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	61 #endif
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	62
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	63
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	64
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	65 TEST(HttpClient, Basic)
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	66 {
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	67 HttpClient c;
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	68 ASSERT_FALSE(c.IsVerbose());
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	69 c.SetVerbose(true);
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	70 ASSERT_TRUE(c.IsVerbose());
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	71 c.SetVerbose(false);
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	72 ASSERT_FALSE(c.IsVerbose());
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	73
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	74 #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	75 // 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	76 // 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	77 // 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	78 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	79
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	80 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	81 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	82
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	83 c.Apply(v);
2187 ad72fbd700b7 move of third party downloads to the main server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	84 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	85 ASSERT_TRUE(v.isMember("Description"));
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	86 #endif
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	87 }
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	88
1532 b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	89
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	90 #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	91
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 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	94
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	95 (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	96
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	97 # 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	98
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	99 (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	100 "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	101 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	102 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	103
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	104 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	105
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	106 (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	107 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	108
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	109 # cd UnitTestsSources
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	110 # ../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	111 **/
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 #include "BitbucketCACertificates.h"
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	114
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1532 diff changeset	115 TEST(HttpClient, Ssl)
1532 b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	116 {
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	117 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	118
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	119 /*{
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	120 std::string s;
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	121 SystemToolbox::ReadFile(s, "/usr/share/ca-certificates/mozilla/WoSign.crt");
aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	122 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	123 }*/
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	124
1532 b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	125 HttpClient c;
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	126 c.SetHttpsVerifyPeers(true);
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	127 c.SetHttpsCACertificates("UnitTestsResults/bitbucket.cert");
3853 ba53d51ffa9a leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	128
ba53d51ffa9a leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	129 // Test file modified on 2020-04-20, in order to use a git
ba53d51ffa9a leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	130 // repository on BitBucket instead of a Mercurial repository
ba53d51ffa9a leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	131 // (because Mercurial support disappears on 2020-05-31)
ba53d51ffa9a leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	132 c.SetUrl("https://bitbucket.org/osimis/orthanc-setup-samples/raw/master/docker/serve-folders/orthanc/serve-folders.json");
1532 b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	133
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	134 Json::Value v;
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	135 c.Apply(v);
3853 ba53d51ffa9a leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	136 ASSERT_TRUE(v.isMember("ServeFolders"));
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	137 }
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1532 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 TEST(HttpClient, SslNoVerification)
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	140 {
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	141 HttpClient c;
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	142 c.SetHttpsVerifyPeers(false);
3853 ba53d51ffa9a leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	143 c.SetUrl("https://bitbucket.org/osimis/orthanc-setup-samples/raw/master/docker/serve-folders/orthanc/serve-folders.json");
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	144
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	145 Json::Value v;
1532 b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	146 c.Apply(v);
3853 ba53d51ffa9a leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	147 ASSERT_TRUE(v.isMember("ServeFolders"));
1532 b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	148 }
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	149
1532 b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	150 #endif
b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	151
b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	152
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	153 TEST(RestApi, ChunkedBuffer)
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	154 {
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	155 ChunkedBuffer b;
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1486 diff changeset	156 ASSERT_EQ(0u, b.GetNumBytes());
707 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 b.AddChunk("hello", 5);
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1486 diff changeset	159 ASSERT_EQ(5u, b.GetNumBytes());
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	160
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	161 b.AddChunk("world", 5);
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1486 diff changeset	162 ASSERT_EQ(10u, b.GetNumBytes());
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	163
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	164 std::string s;
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	165 b.Flatten(s);
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	166 ASSERT_EQ("helloworld", s);
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	167 }
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	168
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	169 TEST(RestApi, ParseCookies)
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	170 {
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1419 diff changeset	171 IHttpHandler::Arguments headers;
f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1419 diff changeset	172 IHttpHandler::Arguments cookies;
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	173
332 c51c9ed603e6 fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 330 diff changeset	174 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	175 HttpToolbox::ParseCookies(cookies, headers);
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	176 ASSERT_EQ(4u, cookies.size());
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	177 ASSERT_EQ("b", cookies["a"]);
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	178 ASSERT_EQ("d", cookies["c"]);
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	179 ASSERT_EQ("f", cookies["e"]);
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	180 ASSERT_EQ("h", cookies["g"]);
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"] = " name = value ; name2=value2";
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(2u, cookies.size());
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	185 ASSERT_EQ("value", cookies["name"]);
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	186 ASSERT_EQ("value2", cookies["name2"]);
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	187
332 c51c9ed603e6 fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 330 diff changeset	188 headers["cookie"] = " ;;; ";
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1419 diff changeset	189 HttpToolbox::ParseCookies(cookies, headers);
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	190 ASSERT_EQ(0u, cookies.size());
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	191
332 c51c9ed603e6 fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 330 diff changeset	192 headers["cookie"] = " ; n=v ;; ";
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1419 diff changeset	193 HttpToolbox::ParseCookies(cookies, headers);
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	194 ASSERT_EQ(1u, cookies.size());
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	195 ASSERT_EQ("v", cookies["n"]);
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	196 }
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	197
209 9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	198 TEST(RestApi, RestApiPath)
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	199 {
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1419 diff changeset	200 IHttpHandler::Arguments args;
209 9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	201 UriComponents trail;
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 {
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	204 RestApiPath uri("/coucou/{abc}/d/*");
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	205 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	206 ASSERT_EQ(1u, args.size());
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	207 ASSERT_EQ(3u, trail.size());
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	208 ASSERT_EQ("moi", args["abc"]);
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	209 ASSERT_EQ("e", trail[0]);
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	210 ASSERT_EQ("f", trail[1]);
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	211 ASSERT_EQ("g", trail[2]);
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	212
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	213 ASSERT_FALSE(uri.Match(args, trail, "/coucou/moi/f"));
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	214 ASSERT_TRUE(uri.Match(args, trail, "/coucou/moi/d/"));
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	215 ASSERT_FALSE(uri.Match(args, trail, "/a/moi/d"));
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	216 ASSERT_FALSE(uri.Match(args, trail, "/coucou/moi"));
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	217
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	218 ASSERT_EQ(3u, uri.GetLevelCount());
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	219 ASSERT_TRUE(uri.IsUniversalTrailing());
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	220
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	221 ASSERT_EQ("coucou", uri.GetLevelName(0));
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	222 ASSERT_THROW(uri.GetWildcardName(0), OrthancException);
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	223
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	224 ASSERT_EQ("abc", uri.GetWildcardName(1));
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	225 ASSERT_THROW(uri.GetLevelName(1), OrthancException);
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	226
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	227 ASSERT_EQ("d", uri.GetLevelName(2));
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	228 ASSERT_THROW(uri.GetWildcardName(2), OrthancException);
209 9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	229 }
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	230
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	231 {
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	232 RestApiPath uri("/coucou/{abc}/d");
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	233 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	234 ASSERT_TRUE(uri.Match(args, trail, "/coucou/moi/d"));
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	235 ASSERT_EQ(1u, args.size());
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	236 ASSERT_EQ(0u, trail.size());
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	237 ASSERT_EQ("moi", args["abc"]);
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	238
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	239 ASSERT_EQ(3u, uri.GetLevelCount());
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	240 ASSERT_FALSE(uri.IsUniversalTrailing());
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	241
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	242 ASSERT_EQ("coucou", uri.GetLevelName(0));
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	243 ASSERT_THROW(uri.GetWildcardName(0), OrthancException);
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	244
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	245 ASSERT_EQ("abc", uri.GetWildcardName(1));
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	246 ASSERT_THROW(uri.GetLevelName(1), OrthancException);
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	247
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	248 ASSERT_EQ("d", uri.GetLevelName(2));
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	249 ASSERT_THROW(uri.GetWildcardName(2), OrthancException);
209 9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	250 }
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	251
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	252 {
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	253 RestApiPath uri("/*");
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	254 ASSERT_TRUE(uri.Match(args, trail, "/a/b/c"));
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	255 ASSERT_EQ(0u, args.size());
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	256 ASSERT_EQ(3u, trail.size());
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	257 ASSERT_EQ("a", trail[0]);
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	258 ASSERT_EQ("b", trail[1]);
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	259 ASSERT_EQ("c", trail[2]);
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	260
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	261 ASSERT_EQ(0u, uri.GetLevelCount());
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	262 ASSERT_TRUE(uri.IsUniversalTrailing());
209 9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	263 }
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	264 }
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	265
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	266
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
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	270
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	271 static int testValue;
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	272
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	273 template <int value>
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 970 diff changeset	274 static void SetValue(RestApiGetCall& get)
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	275 {
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	276 testValue = value;
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	277 }
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	278
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	279
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	280 static bool GetDirectory(Json::Value& target,
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	281 RestApiHierarchy& hierarchy,
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	282 const std::string& uri)
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	283 {
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	284 UriComponents p;
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	285 Toolbox::SplitUriComponents(p, uri);
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	286 return hierarchy.GetDirectory(target, p);
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	287 }
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	288
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	289
978 ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	290
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	291 namespace
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 class MyVisitor : public RestApiHierarchy::IVisitor
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 public:
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	296 virtual bool Visit(const RestApiHierarchy::Resource& resource,
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	297 const UriComponents& uri,
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1419 diff changeset	298 const IHttpHandler::Arguments& components,
2924 22524fd06225 macros ORTHANC_OVERRIDE and ORTHANC_FINAL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2824 diff changeset	299 const UriComponents& trailing) ORTHANC_OVERRIDE
978 ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	300 {
2543 6c72ef308cb3 fix openbsd Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	301 return resource.Handle((RestApiGetCall) NULL);
978 ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	302 }
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	303 };
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	304 }
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	305
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	306
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	307 static bool HandleGet(RestApiHierarchy& hierarchy,
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	308 const std::string& uri)
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	309 {
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	310 UriComponents p;
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	311 Toolbox::SplitUriComponents(p, uri);
978 ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	312 MyVisitor visitor;
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	313 return hierarchy.LookupResource(p, visitor);
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	314 }
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	315
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	316
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	317 TEST(RestApi, RestApiHierarchy)
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	318 {
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	319 RestApiHierarchy root;
970 1a3817d84f39 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 969 diff changeset	320 root.Register("/hello/world/test", SetValue<1>);
1a3817d84f39 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 969 diff changeset	321 root.Register("/hello/world/test2", SetValue<2>);
1a3817d84f39 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 969 diff changeset	322 root.Register("/hello/{world}/test3/test4", SetValue<3>);
1a3817d84f39 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 969 diff changeset	323 root.Register("/hello2/*", SetValue<4>);
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	324
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	325 Json::Value m;
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	326 root.CreateSiteMap(m);
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	327 std::cout << m;
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	328
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	329 Json::Value d;
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	330 ASSERT_FALSE(GetDirectory(d, root, "/hello"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	331
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	332 ASSERT_TRUE(GetDirectory(d, root, "/hello/a"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	333 ASSERT_EQ(1u, d.size());
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	334 ASSERT_EQ("test3", d[0].asString());
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	335
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	336 ASSERT_TRUE(GetDirectory(d, root, "/hello/world"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	337 ASSERT_EQ(2u, d.size());
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	338
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	339 ASSERT_TRUE(GetDirectory(d, root, "/hello/a/test3"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	340 ASSERT_EQ(1u, d.size());
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	341 ASSERT_EQ("test4", d[0].asString());
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	342
1064 cd20e2568fc2 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 978 diff changeset	343 ASSERT_TRUE(GetDirectory(d, root, "/hello/world/test"));
cd20e2568fc2 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 978 diff changeset	344 ASSERT_TRUE(GetDirectory(d, root, "/hello/world/test2"));
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	345 ASSERT_FALSE(GetDirectory(d, root, "/hello2"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	346
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	347 testValue = 0;
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	348 ASSERT_TRUE(HandleGet(root, "/hello/world/test"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	349 ASSERT_EQ(testValue, 1);
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	350 ASSERT_TRUE(HandleGet(root, "/hello/world/test2"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	351 ASSERT_EQ(testValue, 2);
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	352 ASSERT_TRUE(HandleGet(root, "/hello/b/test3/test4"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	353 ASSERT_EQ(testValue, 3);
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	354 ASSERT_FALSE(HandleGet(root, "/hello/b/test3/test"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	355 ASSERT_EQ(testValue, 3);
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	356 ASSERT_TRUE(HandleGet(root, "/hello2/a/b"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	357 ASSERT_EQ(testValue, 4);
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	358 }
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	359
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	360
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
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	363
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	364 namespace
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	365 {
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	366 class AcceptHandler : public HttpContentNegociation::IHandler
1781 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 private:
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	369 std::string type_;
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	370 std::string subtype_;
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 public:
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	373 AcceptHandler()
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 Reset();
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 void Reset()
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	379 {
1782 9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	380 Handle("nope", "nope");
1781 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 const std::string& GetType() const
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	384 {
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	385 return type_;
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	386 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	387
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	388 const std::string& GetSubType() const
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 return subtype_;
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
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	393 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	394 const std::string& subtype) ORTHANC_OVERRIDE
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	395 {
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	396 type_ = type;
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	397 subtype_ = subtype;
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 };
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	400 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	401
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	402
1782 9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	403 TEST(RestApi, HttpContentNegociation)
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	404 {
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	405 // 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	406
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	407 AcceptHandler h;
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	408
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	409 {
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	410 HttpContentNegociation d;
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	411 d.Register("audio/mp3", h);
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	412 d.Register("audio/basic", h);
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("audio/*; q=0.2, audio/basic"));
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 ASSERT_EQ("basic", h.GetSubType());
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 ASSERT_TRUE(d.Apply("audio/*; q=0.2, audio/nope"));
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	419 ASSERT_EQ("audio", h.GetType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	420 ASSERT_EQ("mp3", h.GetSubType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	421
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	422 ASSERT_FALSE(d.Apply("application/*; q=0.2, application/pdf"));
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 ASSERT_TRUE(d.Apply("/; application/*; q=0.2, application/pdf"));
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	425 ASSERT_EQ("audio", h.GetType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	426 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	427
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	428 // "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	429 // 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	430 // 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	431 // text/plain entity.""
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	432 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	433
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	434 {
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	435 HttpContentNegociation d;
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	436 d.Register("text/plain", h);
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	437 d.Register("text/html", h);
1782 9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	438 d.Register("text/x-dvi", h);
1781 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("html", 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 {
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	445 HttpContentNegociation d;
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	446 d.Register("text/plain", h);
1782 9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	447 d.Register("text/x-dvi", h);
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	448 d.Register("text/x-c", h);
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	449 ASSERT_TRUE(d.Apply(T1));
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	450 ASSERT_EQ("text", h.GetType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	451 ASSERT_EQ("x-c", h.GetSubType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	452 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	453
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	454 {
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	455 HttpContentNegociation d;
1782 9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	456 d.Register("text/plain", h);
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	457 d.Register("text/x-dvi", h);
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	458 d.Register("text/x-c", h);
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	459 d.Register("text/html", h);
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	460 ASSERT_TRUE(d.Apply(T1));
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	461 ASSERT_EQ("text", h.GetType());
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	462 ASSERT_TRUE(h.GetSubType() == "x-c" \|\| h.GetSubType() == "html");
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	463 }
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	464
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	465 {
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	466 HttpContentNegociation d;
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	467 d.Register("text/plain", h);
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	468 d.Register("text/x-dvi", h);
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	469 ASSERT_TRUE(d.Apply(T1));
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	470 ASSERT_EQ("text", h.GetType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	471 ASSERT_EQ("x-dvi", h.GetSubType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	472 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	473
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	474 {
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	475 HttpContentNegociation d;
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	476 d.Register("text/plain", h);
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	477 ASSERT_TRUE(d.Apply(T1));
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	478 ASSERT_EQ("text", h.GetType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	479 ASSERT_EQ("plain", h.GetSubType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	480 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	481 }
2800 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
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	484 TEST(WebServiceParameters, Serialization)
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	485 {
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 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	488 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	489
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	490 WebServiceParameters p(v);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	491 ASSERT_FALSE(p.IsAdvancedFormatNeeded());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	492
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	493 Json::Value v2;
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	494 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	495 ASSERT_EQ(v, v2);
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 WebServiceParameters p2(v2);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	498 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	499 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	500 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	501 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	502 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	503 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	504 ASSERT_FALSE(p2.IsPkcs11Enabled());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	505 }
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	506
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	507 {
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	508 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	509 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	510 v.append("user");
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	511 v.append("pass");
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 WebServiceParameters p(v);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	514 ASSERT_FALSE(p.IsAdvancedFormatNeeded());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	515 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	516 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	517 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	518 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	519 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	520 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	521 ASSERT_FALSE(p.IsPkcs11Enabled());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	522
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	523 Json::Value v2;
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	524 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	525 ASSERT_EQ(v, v2);
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 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	528 WebServiceParameters p2(v2);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	529 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	530 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	531 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	532 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	533 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	534 }
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	535
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	536 {
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	537 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	538 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	539
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	540 WebServiceParameters p(v);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	541 ASSERT_FALSE(p.IsAdvancedFormatNeeded());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	542 p.SetPkcs11Enabled(true);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	543 ASSERT_TRUE(p.IsAdvancedFormatNeeded());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	544
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	545 Json::Value v2;
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	546 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	547 WebServiceParameters p2(v2);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	548
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	549 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	550 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	551 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	552 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	553 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	554 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	555 }
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	556
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	557 {
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	558 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	559 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	560
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	561 WebServiceParameters p(v);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	562 ASSERT_FALSE(p.IsAdvancedFormatNeeded());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	563 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	564 ASSERT_TRUE(p.IsAdvancedFormatNeeded());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	565
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	566 Json::Value v2;
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	567 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	568 WebServiceParameters p2(v2);
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 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	571 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	572 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	573 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	574 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	575 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	576 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	577 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	578 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	579 }
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 {
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	582 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	583 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	584
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	585 WebServiceParameters p(v);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	586 ASSERT_FALSE(p.IsAdvancedFormatNeeded());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	587 p.AddHttpHeader("a", "b");
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	588 p.AddHttpHeader("c", "d");
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	589 ASSERT_TRUE(p.IsAdvancedFormatNeeded());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	590
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	591 Json::Value v2;
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	592 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	593 WebServiceParameters p2(v2);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	594
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	595 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	596 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	597 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	598 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	599 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	600 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	601 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	602 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	603
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	604 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	605 p2.ListHttpHeaders(a);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	606 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	607 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	608 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	609
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	610 std::string s;
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	611 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	612 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	613 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	614 }
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	615 }
2823 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
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	618 TEST(WebServiceParameters, UserProperties)
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	619 {
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	620 Json::Value v = Json::nullValue;
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 {
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	623 WebServiceParameters p;
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	624 p.SetUrl("http://localhost:8042/");
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 ASSERT_THROW(p.AddUserProperty("Url", "nope"), OrthancException);
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	628 p.AddUserProperty("Hello", "world");
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	629 p.AddUserProperty("a", "b");
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
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	632 p.Serialize(v, false, true);
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	633
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	634 p.ClearUserProperties();
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	635 ASSERT_FALSE(p.IsAdvancedFormatNeeded());
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	636 }
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	637
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	638 {
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	639 WebServiceParameters p(v);
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	640 ASSERT_TRUE(p.IsAdvancedFormatNeeded());
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	641 ASSERT_TRUE(p.GetHttpHeaders().empty());
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	642
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	643 std::set<std::string> tmp;
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	644 p.ListUserProperties(tmp);
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	645 ASSERT_EQ(2u, tmp.size());
2824 0e1b79bc4a2d fix for msvc Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	646 ASSERT_TRUE(tmp.find("a") != tmp.end());
0e1b79bc4a2d fix for msvc Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	647 ASSERT_TRUE(tmp.find("Hello") != tmp.end());
0e1b79bc4a2d fix for msvc Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	648 ASSERT_TRUE(tmp.find("hello") == tmp.end());
2823 807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	649
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	650 std::string s;
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	651 ASSERT_TRUE(p.LookupUserProperty(s, "a")); ASSERT_TRUE(s == "b");
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	652 ASSERT_TRUE(p.LookupUserProperty(s, "Hello")); ASSERT_TRUE(s == "world");
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	653 ASSERT_FALSE(p.LookupUserProperty(s, "hello"));
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	654 }
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	655 }
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	656
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	657
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	658 TEST(StringMatcher, Basic)
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	659 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	660 StringMatcher matcher("---");
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	661
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	662 ASSERT_THROW(matcher.GetMatchBegin(), OrthancException);
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	663
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	664 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	665 const std::string s = "";
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	666 ASSERT_FALSE(matcher.Apply(s));
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	667 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	668
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	669 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	670 const std::string s = "abc----def";
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	671 ASSERT_TRUE(matcher.Apply(s));
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	672 ASSERT_EQ(3, std::distance(s.begin(), matcher.GetMatchBegin()));
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	673 ASSERT_EQ("---", std::string(matcher.GetMatchBegin(), matcher.GetMatchEnd()));
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	674 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	675
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	676 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	677 const std::string s = "abc---";
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	678 ASSERT_TRUE(matcher.Apply(s));
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	679 ASSERT_EQ(3, std::distance(s.begin(), matcher.GetMatchBegin()));
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	680 ASSERT_EQ(s.end(), matcher.GetMatchEnd());
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	681 ASSERT_EQ("---", std::string(matcher.GetMatchBegin(), matcher.GetMatchEnd()));
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	682 ASSERT_EQ("", std::string(matcher.GetMatchEnd(), s.end()));
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	683 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	684
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	685 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	686 const std::string s = "abc--def";
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	687 ASSERT_FALSE(matcher.Apply(s));
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	688 ASSERT_THROW(matcher.GetMatchBegin(), OrthancException);
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	689 ASSERT_THROW(matcher.GetMatchEnd(), OrthancException);
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	690 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	691
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	692 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	693 std::string s(10u, '\0'); // String with null values
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	694 ASSERT_EQ(10u, s.size());
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	695 ASSERT_EQ(10u, s.size());
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	696 ASSERT_FALSE(matcher.Apply(s));
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	697
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	698 s[9] = '-';
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	699 ASSERT_FALSE(matcher.Apply(s));
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	700
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	701 s[8] = '-';
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	702 ASSERT_FALSE(matcher.Apply(s));
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	703
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	704 s[7] = '-';
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	705 ASSERT_TRUE(matcher.Apply(s));
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	706 ASSERT_EQ(s.c_str() + 7, matcher.GetPointerBegin());
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	707 ASSERT_EQ(s.c_str() + 10, matcher.GetPointerEnd());
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	708 ASSERT_EQ(s.end() - 3, matcher.GetMatchBegin());
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	709 ASSERT_EQ(s.end(), matcher.GetMatchEnd());
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	710 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	711 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	712
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	713
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	714
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	715 class MultipartTester : public MultipartStreamReader::IHandler
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	716 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	717 private:
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	718 struct Part
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	719 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	720 MultipartStreamReader::HttpHeaders headers_;
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	721 std::string data_;
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	722
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	723 Part(const MultipartStreamReader::HttpHeaders& headers,
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	724 const void* part,
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	725 size_t size) :
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	726 headers_(headers),
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	727 data_(reinterpret_cast<const char*>(part), size)
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	728 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	729 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	730 };
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	731
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	732 std::vector<Part> parts_;
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	733
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	734 public:
3399 4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	735 virtual void HandlePart(const MultipartStreamReader::HttpHeaders& headers,
4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	736 const void* part,
4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	737 size_t size)
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	738 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	739 parts_.push_back(Part(headers, part, size));
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	740 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	741
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	742 unsigned int GetCount() const
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	743 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	744 return parts_.size();
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	745 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	746
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	747 MultipartStreamReader::HttpHeaders& GetHeaders(size_t i)
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	748 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	749 return parts_[i].headers_;
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	750 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	751
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	752 const std::string& GetData(size_t i) const
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	753 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	754 return parts_[i].data_;
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	755 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	756 };
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	757
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	758
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	759 TEST(MultipartStreamReader, ParseHeaders)
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	760 {
3399 4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	761 std::string ct, b, st, header;
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	762
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	763 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	764 MultipartStreamReader::HttpHeaders h;
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	765 h["hello"] = "world";
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	766 h["Content-Type"] = "world"; // Should be in lower-case
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	767 h["CONTENT-type"] = "world"; // Should be in lower-case
3399 4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	768 ASSERT_FALSE(MultipartStreamReader::GetMainContentType(header, h));
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	769 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	770
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	771 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	772 MultipartStreamReader::HttpHeaders h;
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	773 h["content-type"] = "world";
3399 4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	774 ASSERT_TRUE(MultipartStreamReader::GetMainContentType(header, h));
4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	775 ASSERT_EQ(header, "world");
4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	776 ASSERT_FALSE(MultipartStreamReader::ParseMultipartContentType(ct, st, b, header));
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	777 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	778
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	779 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	780 MultipartStreamReader::HttpHeaders h;
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	781 h["content-type"] = "multipart/related; dummy=value; boundary=1234; hello=world";
3399 4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	782 ASSERT_TRUE(MultipartStreamReader::GetMainContentType(header, h));
4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	783 ASSERT_EQ(header, h["content-type"]);
4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	784 ASSERT_TRUE(MultipartStreamReader::ParseMultipartContentType(ct, st, b, header));
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	785 ASSERT_EQ(ct, "multipart/related");
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	786 ASSERT_EQ(b, "1234");
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	787 ASSERT_TRUE(st.empty());
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	788 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	789
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	790 {
3399 4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	791 ASSERT_FALSE(MultipartStreamReader::ParseMultipartContentType
4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	792 (ct, st, b, "multipart/related; boundary=")); // Empty boundary
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	793 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	794
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	795 {
3399 4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	796 ASSERT_TRUE(MultipartStreamReader::ParseMultipartContentType
4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	797 (ct, st, b, "Multipart/Related; TYPE=Application/Dicom; Boundary=heLLO"));
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	798 ASSERT_EQ(ct, "multipart/related");
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	799 ASSERT_EQ(b, "heLLO");
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	800 ASSERT_EQ(st, "application/dicom");
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	801 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	802
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	803 {
3399 4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	804 ASSERT_TRUE(MultipartStreamReader::ParseMultipartContentType
4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	805 (ct, st, b, "Multipart/Related; type=\"application/DICOM\"; Boundary=a"));
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	806 ASSERT_EQ(ct, "multipart/related");
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	807 ASSERT_EQ(b, "a");
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	808 ASSERT_EQ(st, "application/dicom");
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	809 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	810 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	811
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	812
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	813 TEST(MultipartStreamReader, BytePerByte)
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	814 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	815 std::string stream = "GARBAGE";
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	816
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	817 std::string boundary = "123456789123456789";
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	818
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	819 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	820 for (size_t i = 0; i < 10; i++)
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	821 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	822 std::string f = "hello " + boost::lexical_cast<std::string>(i);
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	823
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	824 stream += "\r\n--" + boundary + "\r\n";
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	825 if (i % 2 == 0)
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	826 stream += "Content-Length: " + boost::lexical_cast<std::string>(f.size()) + "\r\n";
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	827 stream += "Content-Type: toto " + boost::lexical_cast<std::string>(i) + "\r\n\r\n";
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	828 stream += f;
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	829 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	830
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	831 stream += "\r\n--" + boundary + "--";
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	832 stream += "GARBAGE";
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	833 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	834
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	835 for (unsigned int k = 0; k < 2; k++)
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	836 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	837 MultipartTester decoded;
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	838
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	839 MultipartStreamReader reader(boundary);
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	840 reader.SetBlockSize(1);
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	841 reader.SetHandler(decoded);
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	842
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	843 if (k == 0)
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	844 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	845 for (size_t i = 0; i < stream.size(); i++)
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	846 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	847 reader.AddChunk(&stream[i], 1);
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	848 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	849 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	850 else
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	851 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	852 reader.AddChunk(stream);
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	853 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	854
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	855 reader.CloseStream();
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	856
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	857 ASSERT_EQ(10u, decoded.GetCount());
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	858
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	859 for (size_t i = 0; i < 10; i++)
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	860 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	861 ASSERT_EQ("hello " + boost::lexical_cast<std::string>(i), decoded.GetData(i));
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	862 ASSERT_EQ("toto " + boost::lexical_cast<std::string>(i), decoded.GetHeaders(i)["content-type"]);
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	863
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	864 if (i % 2 == 0)
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	865 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	866 ASSERT_EQ(2u, decoded.GetHeaders(i).size());
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	867 ASSERT_TRUE(decoded.GetHeaders(i).find("content-length") != decoded.GetHeaders(i).end());
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	868 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	869 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	870 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	871 }

Mercurial > hg > orthanc

annotate OrthancFramework/UnitTestsSources/RestApiTests.cpp @ 4044:d25f4c0fa160 framework