orthanc: OrthancFramework/UnitTestsSources/RestApiTests.cpp annotate

annotate OrthancFramework/UnitTestsSources/RestApiTests.cpp @ 5320:e4c3950345e9

remove NEWS from reverted commits 5306:155637655710 and 5308:1e23bfb0f732

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Sat, 24 Jun 2023 12:21:26 +0200
parents	143b45791233
children	78c59b02b121

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
5185 0ea402b4d901 upgrade to year 2023 Sebastien Jodogne <s.jodogne@gmail.com> parents: 5000 diff changeset	5 * Copyright (C) 2017-2023 Osimis S.A., Belgium
0ea402b4d901 upgrade to year 2023 Sebastien Jodogne <s.jodogne@gmail.com> parents: 5000 diff changeset	6 * Copyright (C) 2021-2023 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 diff changeset	7 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 diff changeset	8 * This program is free software: you can redistribute it and/or
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4072 diff changeset	9 * modify it under the terms of the GNU Lesser General Public License
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4072 diff changeset	10 * as published by the Free Software Foundation, either version 3 of
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4072 diff changeset	11 * the License, or (at your option) any later version.
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 diff changeset	12 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 diff changeset	13 * 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	14 * 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	15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4072 diff changeset	16 * Lesser General Public License for more details.
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 diff changeset	17 *
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4072 diff changeset	18 * You should have received a copy of the GNU Lesser General Public
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4072 diff changeset	19 * License along with this program. If not, see
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4072 diff changeset	20 * <http://www.gnu.org/licenses/>.
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 diff changeset	21 **/
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 diff changeset	22
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 diff changeset	23
3992 f9863630ec7f working on the shared library for Orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 3853 diff changeset	24 #if ORTHANC_UNIT_TESTS_LINK_FRAMEWORK == 1
4063 e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	25 // Must be the first to be sure to use the Orthanc framework shared library
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 3992 diff changeset	26 # include <OrthancFramework.h>
3992 f9863630ec7f working on the shared library for Orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 3853 diff changeset	27 #endif
f9863630ec7f working on the shared library for Orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 3853 diff changeset	28
4062 0953b3dc3261 pretty-printing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	29 #include <gtest/gtest.h>
209 9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30
4045 05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	31 #include "../Sources/ChunkedBuffer.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	32 #include "../Sources/Compression/ZlibCompressor.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	33 #include "../Sources/HttpServer/HttpContentNegociation.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	34 #include "../Sources/HttpServer/MultipartStreamReader.h"
4652 0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	35 #include "../Sources/HttpServer/StringMatcher.h"
4325 b96aedfa8cc1 unit tests now running in WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	36 #include "../Sources/Logging.h"
b96aedfa8cc1 unit tests now running in WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	37 #include "../Sources/OrthancException.h"
b96aedfa8cc1 unit tests now running in WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	38 #include "../Sources/RestApi/RestApiHierarchy.h"
b96aedfa8cc1 unit tests now running in WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	39 #include "../Sources/WebServiceParameters.h"
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	40
4062 0953b3dc3261 pretty-printing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	41 #include <ctype.h>
0953b3dc3261 pretty-printing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	42 #include <boost/lexical_cast.hpp>
0953b3dc3261 pretty-printing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	43 #include <algorithm>
0953b3dc3261 pretty-printing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	44
4330 a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4327 diff changeset	45 #if ORTHANC_SANDBOXED != 1
a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4327 diff changeset	46 # include "../Sources/RestApi/RestApi.h"
a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4327 diff changeset	47 #endif
a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4327 diff changeset	48
209 9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50 using namespace Orthanc;
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	51
4325 b96aedfa8cc1 unit tests now running in WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	52 #if !defined(UNIT_TESTS_WITH_HTTP_CONNEXIONS) && (ORTHANC_SANDBOXED != 1)
4063 e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	53 # error UNIT_TESTS_WITH_HTTP_CONNEXIONS is not defined
e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	54 #endif
e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	55
e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	56 #if !defined(ORTHANC_ENABLE_SSL)
e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	57 # error ORTHANC_ENABLE_SSL is not defined
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	58 #endif
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	59
4325 b96aedfa8cc1 unit tests now running in WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	60 #if ORTHANC_SANDBOXED != 1
b96aedfa8cc1 unit tests now running in WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	61 # include "../Sources/HttpClient.h"
b96aedfa8cc1 unit tests now running in WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	62 # include "../Sources/SystemToolbox.h"
b96aedfa8cc1 unit tests now running in WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	63 #endif
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	64
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	65
4325 b96aedfa8cc1 unit tests now running in WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	66 #if ORTHANC_SANDBOXED != 1
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	67 TEST(HttpClient, Basic)
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	68 {
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	69 HttpClient c;
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	70 ASSERT_FALSE(c.IsVerbose());
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	71 c.SetVerbose(true);
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	72 ASSERT_TRUE(c.IsVerbose());
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	73 c.SetVerbose(false);
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	74 ASSERT_FALSE(c.IsVerbose());
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	75
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	76 #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	77 // 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	78 // 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	79 // 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	80 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	81
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	82 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	83 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	84
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	85 c.Apply(v);
2187 ad72fbd700b7 move of third party downloads to the main server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	86 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	87 ASSERT_TRUE(v.isMember("Description"));
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	88 #endif
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	89 }
4325 b96aedfa8cc1 unit tests now running in WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	90 #endif
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	91
1532 b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	92
4325 b96aedfa8cc1 unit tests now running in WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	93 #if (UNIT_TESTS_WITH_HTTP_CONNEXIONS == 1) && (ORTHANC_ENABLE_SSL == 1) && (ORTHANC_SANDBOXED != 1)
1534 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 /**
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	96 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	97
5292 143b45791233 fix SSL unit tests Alain Mazy <am@osimis.io> parents: 5185 diff changeset	98 (1) We retrieve the URI of the root CA of BitBucket:
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	99
5292 143b45791233 fix SSL unit tests Alain Mazy <am@osimis.io> parents: 5185 diff changeset	100 # echo \| openssl s_client -servername bitbucket.org -connect bitbucket.org:443 2>/dev/null \| openssl x509 -text \| grep "CA Issuers"
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	101
5292 143b45791233 fix SSL unit tests Alain Mazy <am@osimis.io> parents: 5185 diff changeset	102 (2) Once we get the URL to the CA certificate, we convert it to a C
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	103 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	104
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	105 # cd UnitTestsSources
5292 143b45791233 fix SSL unit tests Alain Mazy <am@osimis.io> parents: 5185 diff changeset	106 # python2 ../Resources/RetrieveCACertificates.py BITBUCKET_CERTIFICATES http://cacerts.digicert.com/DigiCertSHA2ExtendedValidationServerCA.crt > BitbucketCACertificates.h
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	107 **/
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 #include "BitbucketCACertificates.h"
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	110
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1532 diff changeset	111 TEST(HttpClient, Ssl)
1532 b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	112 {
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	113 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	114
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	115 /*{
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	116 std::string s;
5000 e56a6beb454e fix unit tests HttpClient.Ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 4998 diff changeset	117 SystemToolbox::ReadFile(s, "/etc/ssl/certs/ca-certificates.crt");
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	118 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	119 }*/
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	120
1532 b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	121 HttpClient c;
5000 e56a6beb454e fix unit tests HttpClient.Ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 4998 diff changeset	122 //c.SetVerbose(true);
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	123 c.SetHttpsVerifyPeers(true);
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	124 c.SetHttpsCACertificates("UnitTestsResults/bitbucket.cert");
3853 ba53d51ffa9a leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	125
ba53d51ffa9a leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	126 // 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	127 // repository on BitBucket instead of a Mercurial repository
ba53d51ffa9a leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	128 // (because Mercurial support disappears on 2020-05-31)
ba53d51ffa9a leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	129 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	130
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	131 Json::Value v;
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	132 c.Apply(v);
3853 ba53d51ffa9a leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	133 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	134 }
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1532 diff changeset	135
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	136 TEST(HttpClient, SslNoVerification)
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	137 {
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	138 HttpClient c;
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	139 c.SetHttpsVerifyPeers(false);
3853 ba53d51ffa9a leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	140 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	141
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	142 Json::Value v;
1532 b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	143 c.Apply(v);
3853 ba53d51ffa9a leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	144 ASSERT_TRUE(v.isMember("ServeFolders"));
1532 b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	145 }
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	146
1532 b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	147 #endif
b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	148
b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	149
4150 b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	150 TEST(ChunkedBuffer, Basic)
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	151 {
4150 b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	152 for (unsigned int i = 0; i < 2; i++)
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	153 {
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	154 ChunkedBuffer b;
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	155
4150 b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	156 if (i == 0)
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	157 {
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	158 b.SetPendingBufferSize(0);
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	159 ASSERT_EQ(0u, b.GetPendingBufferSize());
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	160 }
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	161 else
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	162 {
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	163 ASSERT_EQ(16u * 1024u, b.GetPendingBufferSize());
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	164 }
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	165
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	166 ASSERT_EQ(0u, b.GetNumBytes());
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	167
4150 b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	168 b.AddChunk("hello", 5);
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	169 ASSERT_EQ(5u, b.GetNumBytes());
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	170
4150 b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	171 b.AddChunk("world", 5);
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	172 ASSERT_EQ(10u, b.GetNumBytes());
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	173
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	174 std::string s;
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	175 b.Flatten(s);
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	176 ASSERT_EQ("helloworld", s);
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	177 }
707 203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	178 }
203157cb4fde unit tests of httpclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	179
4148 732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	180
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	181 TEST(RestApi, ParseCookies)
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	182 {
4330 a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4327 diff changeset	183 HttpToolbox::Arguments headers;
a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4327 diff changeset	184 HttpToolbox::Arguments cookies;
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	185
332 c51c9ed603e6 fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 330 diff changeset	186 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	187 HttpToolbox::ParseCookies(cookies, headers);
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	188 ASSERT_EQ(4u, cookies.size());
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	189 ASSERT_EQ("b", cookies["a"]);
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	190 ASSERT_EQ("d", cookies["c"]);
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	191 ASSERT_EQ("f", cookies["e"]);
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	192 ASSERT_EQ("h", cookies["g"]);
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	193
332 c51c9ed603e6 fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 330 diff changeset	194 headers["cookie"] = " name = value ; name2=value2";
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1419 diff changeset	195 HttpToolbox::ParseCookies(cookies, headers);
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	196 ASSERT_EQ(2u, cookies.size());
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	197 ASSERT_EQ("value", cookies["name"]);
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	198 ASSERT_EQ("value2", cookies["name2"]);
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	199
332 c51c9ed603e6 fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 330 diff changeset	200 headers["cookie"] = " ;;; ";
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1419 diff changeset	201 HttpToolbox::ParseCookies(cookies, headers);
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	202 ASSERT_EQ(0u, cookies.size());
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	203
332 c51c9ed603e6 fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 330 diff changeset	204 headers["cookie"] = " ; n=v ;; ";
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1419 diff changeset	205 HttpToolbox::ParseCookies(cookies, headers);
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	206 ASSERT_EQ(1u, cookies.size());
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	207 ASSERT_EQ("v", cookies["n"]);
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	208 }
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	209
4326 83c5bd439fcc fix for stone Sebastien Jodogne <s.jodogne@gmail.com> parents: 4325 diff changeset	210
209 9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	211 TEST(RestApi, RestApiPath)
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	212 {
4330 a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4327 diff changeset	213 HttpToolbox::Arguments args;
209 9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	214 UriComponents trail;
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	215
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	216 {
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	217 RestApiPath uri("/coucou/{abc}/d/*");
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	218 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	219 ASSERT_EQ(1u, args.size());
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	220 ASSERT_EQ(3u, trail.size());
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	221 ASSERT_EQ("moi", args["abc"]);
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	222 ASSERT_EQ("e", trail[0]);
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	223 ASSERT_EQ("f", trail[1]);
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	224 ASSERT_EQ("g", trail[2]);
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	225
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	226 ASSERT_FALSE(uri.Match(args, trail, "/coucou/moi/f"));
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	227 ASSERT_TRUE(uri.Match(args, trail, "/coucou/moi/d/"));
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	228 ASSERT_FALSE(uri.Match(args, trail, "/a/moi/d"));
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	229 ASSERT_FALSE(uri.Match(args, trail, "/coucou/moi"));
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	230
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	231 ASSERT_EQ(3u, uri.GetLevelCount());
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	232 ASSERT_TRUE(uri.IsUniversalTrailing());
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	233
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	234 ASSERT_EQ("coucou", uri.GetLevelName(0));
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	235 ASSERT_THROW(uri.GetWildcardName(0), OrthancException);
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	236
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	237 ASSERT_EQ("abc", uri.GetWildcardName(1));
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	238 ASSERT_THROW(uri.GetLevelName(1), OrthancException);
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	239
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	240 ASSERT_EQ("d", uri.GetLevelName(2));
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	241 ASSERT_THROW(uri.GetWildcardName(2), OrthancException);
209 9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	242 }
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	243
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	244 {
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	245 RestApiPath uri("/coucou/{abc}/d");
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	246 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	247 ASSERT_TRUE(uri.Match(args, trail, "/coucou/moi/d"));
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	248 ASSERT_EQ(1u, args.size());
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	249 ASSERT_EQ(0u, trail.size());
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	250 ASSERT_EQ("moi", args["abc"]);
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	251
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	252 ASSERT_EQ(3u, uri.GetLevelCount());
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	253 ASSERT_FALSE(uri.IsUniversalTrailing());
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	254
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	255 ASSERT_EQ("coucou", uri.GetLevelName(0));
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	256 ASSERT_THROW(uri.GetWildcardName(0), OrthancException);
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	257
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	258 ASSERT_EQ("abc", uri.GetWildcardName(1));
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	259 ASSERT_THROW(uri.GetLevelName(1), OrthancException);
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("d", uri.GetLevelName(2));
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	262 ASSERT_THROW(uri.GetWildcardName(2), OrthancException);
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
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	265 {
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	266 RestApiPath uri("/*");
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	267 ASSERT_TRUE(uri.Match(args, trail, "/a/b/c"));
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	268 ASSERT_EQ(0u, args.size());
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	269 ASSERT_EQ(3u, trail.size());
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	270 ASSERT_EQ("a", trail[0]);
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	271 ASSERT_EQ("b", trail[1]);
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	272 ASSERT_EQ("c", trail[2]);
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	273
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	274 ASSERT_EQ(0u, uri.GetLevelCount());
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	275 ASSERT_TRUE(uri.IsUniversalTrailing());
209 9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	276 }
9960642f0f45 abstraction of RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	277 }
966 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
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	280
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	281
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	282
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	283
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	284 static int testValue;
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	285
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	286 template <int value>
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 970 diff changeset	287 static void SetValue(RestApiGetCall& get)
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	288 {
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	289 testValue = value;
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	290 }
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	291
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	292
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	293 static bool GetDirectory(Json::Value& target,
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	294 RestApiHierarchy& hierarchy,
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	295 const std::string& uri)
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	296 {
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	297 UriComponents p;
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	298 Toolbox::SplitUriComponents(p, uri);
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	299 return hierarchy.GetDirectory(target, p);
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	300 }
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	301
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	302
978 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 namespace
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 class MyVisitor : public RestApiHierarchy::IVisitor
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	307 {
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	308 public:
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	309 virtual bool Visit(const RestApiHierarchy::Resource& resource,
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	310 const UriComponents& uri,
4399 80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4394 diff changeset	311 bool hasTrailing,
4330 a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4327 diff changeset	312 const HttpToolbox::Arguments& components,
2924 22524fd06225 macros ORTHANC_OVERRIDE and ORTHANC_FINAL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2824 diff changeset	313 const UriComponents& trailing) ORTHANC_OVERRIDE
978 ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	314 {
2543 6c72ef308cb3 fix openbsd Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	315 return resource.Handle((RestApiGetCall) NULL);
978 ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	316 }
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	317 };
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	318 }
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	319
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	320
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	321 static bool HandleGet(RestApiHierarchy& hierarchy,
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	322 const std::string& uri)
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	323 {
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	324 UriComponents p;
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	325 Toolbox::SplitUriComponents(p, uri);
978 ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	326 MyVisitor visitor;
ce3106e5843f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 975 diff changeset	327 return hierarchy.LookupResource(p, visitor);
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	328 }
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	329
3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	330
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	331 TEST(RestApi, RestApiHierarchy)
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	332 {
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	333 RestApiHierarchy root;
970 1a3817d84f39 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 969 diff changeset	334 root.Register("/hello/world/test", SetValue<1>);
1a3817d84f39 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 969 diff changeset	335 root.Register("/hello/world/test2", SetValue<2>);
1a3817d84f39 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 969 diff changeset	336 root.Register("/hello/{world}/test3/test4", SetValue<3>);
1a3817d84f39 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 969 diff changeset	337 root.Register("/hello2/*", SetValue<4>);
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	338
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	339 Json::Value m;
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	340 root.CreateSiteMap(m);
4392 3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4333 diff changeset	341
3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4333 diff changeset	342 std::string s;
4394 f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	343 Toolbox::WriteStyledJson(s, m);
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	344
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	345 Json::Value d;
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	346 ASSERT_FALSE(GetDirectory(d, root, "/hello"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	347
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	348 ASSERT_TRUE(GetDirectory(d, root, "/hello/a"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	349 ASSERT_EQ(1u, d.size());
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	350 ASSERT_EQ("test3", d[0].asString());
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	351
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	352 ASSERT_TRUE(GetDirectory(d, root, "/hello/world"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	353 ASSERT_EQ(2u, d.size());
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	354
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	355 ASSERT_TRUE(GetDirectory(d, root, "/hello/a/test3"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	356 ASSERT_EQ(1u, d.size());
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	357 ASSERT_EQ("test4", d[0].asString());
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	358
1064 cd20e2568fc2 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 978 diff changeset	359 ASSERT_TRUE(GetDirectory(d, root, "/hello/world/test"));
cd20e2568fc2 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 978 diff changeset	360 ASSERT_TRUE(GetDirectory(d, root, "/hello/world/test2"));
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	361 ASSERT_FALSE(GetDirectory(d, root, "/hello2"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	362
8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	363 testValue = 0;
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	364 ASSERT_TRUE(HandleGet(root, "/hello/world/test"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	365 ASSERT_EQ(testValue, 1);
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	366 ASSERT_TRUE(HandleGet(root, "/hello/world/test2"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	367 ASSERT_EQ(testValue, 2);
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	368 ASSERT_TRUE(HandleGet(root, "/hello/b/test3/test4"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	369 ASSERT_EQ(testValue, 3);
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	370 ASSERT_FALSE(HandleGet(root, "/hello/b/test3/test"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	371 ASSERT_EQ(testValue, 3);
969 3dce528b0cc2 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 968 diff changeset	372 ASSERT_TRUE(HandleGet(root, "/hello2/a/b"));
968 8ed284e79850 RestApiHierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	373 ASSERT_EQ(testValue, 4);
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	374 }
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	375
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
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	379
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	380 namespace
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	381 {
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	382 class AcceptHandler : public HttpContentNegociation::IHandler
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	383 {
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	384 private:
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	385 std::string type_;
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	386 std::string subtype_;
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 public:
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	389 AcceptHandler()
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	390 {
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	391 Reset();
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
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	394 void Reset()
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	395 {
1782 9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	396 Handle("nope", "nope");
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	397 }
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 const std::string& GetType() const
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 return type_;
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	402 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	403
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	404 const std::string& GetSubType() const
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	405 {
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	406 return subtype_;
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	407 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	408
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	409 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	410 const std::string& subtype) ORTHANC_OVERRIDE
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	411 {
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	412 type_ = type;
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	413 subtype_ = subtype;
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	414 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	415 };
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	416 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	417
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	418
1782 9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	419 TEST(RestApi, HttpContentNegociation)
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	420 {
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	421 // 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	422
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	423 AcceptHandler h;
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	424
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	425 {
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	426 HttpContentNegociation d;
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	427 d.Register("audio/mp3", h);
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	428 d.Register("audio/basic", h);
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	429
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	430 ASSERT_TRUE(d.Apply("audio/*; q=0.2, audio/basic"));
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	431 ASSERT_EQ("audio", h.GetType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	432 ASSERT_EQ("basic", h.GetSubType());
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 ASSERT_TRUE(d.Apply("audio/*; q=0.2, audio/nope"));
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	435 ASSERT_EQ("audio", h.GetType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	436 ASSERT_EQ("mp3", h.GetSubType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	437
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	438 ASSERT_FALSE(d.Apply("application/*; q=0.2, application/pdf"));
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	439
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	440 ASSERT_TRUE(d.Apply("/; application/*; q=0.2, application/pdf"));
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	441 ASSERT_EQ("audio", h.GetType());
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 // "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	445 // 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	446 // 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	447 // text/plain entity.""
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	448 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	449
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	450 {
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	451 HttpContentNegociation d;
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	452 d.Register("text/plain", h);
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	453 d.Register("text/html", h);
1782 9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	454 d.Register("text/x-dvi", h);
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	455 ASSERT_TRUE(d.Apply(T1));
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	456 ASSERT_EQ("text", h.GetType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	457 ASSERT_EQ("html", h.GetSubType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	458 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	459
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	460 {
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	461 HttpContentNegociation d;
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	462 d.Register("text/plain", h);
1782 9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	463 d.Register("text/x-dvi", h);
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	464 d.Register("text/x-c", h);
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	465 ASSERT_TRUE(d.Apply(T1));
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	466 ASSERT_EQ("text", h.GetType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	467 ASSERT_EQ("x-c", h.GetSubType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	468 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	469
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	470 {
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	471 HttpContentNegociation d;
1782 9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	472 d.Register("text/plain", h);
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	473 d.Register("text/x-dvi", h);
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	474 d.Register("text/x-c", h);
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	475 d.Register("text/html", h);
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	476 ASSERT_TRUE(d.Apply(T1));
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	477 ASSERT_EQ("text", h.GetType());
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	478 ASSERT_TRUE(h.GetSubType() == "x-c" \|\| h.GetSubType() == "html");
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	479 }
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	480
9f2df9bb2cdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	481 {
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	482 HttpContentNegociation d;
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	483 d.Register("text/plain", h);
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	484 d.Register("text/x-dvi", h);
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	485 ASSERT_TRUE(d.Apply(T1));
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	486 ASSERT_EQ("text", h.GetType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	487 ASSERT_EQ("x-dvi", h.GetSubType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	488 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	489
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	490 {
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	491 HttpContentNegociation d;
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	492 d.Register("text/plain", h);
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	493 ASSERT_TRUE(d.Apply(T1));
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	494 ASSERT_EQ("text", h.GetType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	495 ASSERT_EQ("plain", h.GetSubType());
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	496 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	497 }
2800 dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	498
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	499
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	500 TEST(WebServiceParameters, Serialization)
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	501 {
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	502 {
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	503 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	504 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	505
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	506 WebServiceParameters p(v);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	507 ASSERT_FALSE(p.IsAdvancedFormatNeeded());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	508
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	509 Json::Value v2;
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	510 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	511 ASSERT_EQ(v, v2);
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 p2(v2);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	514 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	515 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	516 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	517 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	518 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	519 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	520 ASSERT_FALSE(p2.IsPkcs11Enabled());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	521 }
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 {
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	524 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	525 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	526 v.append("user");
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	527 v.append("pass");
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	528
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	529 WebServiceParameters p(v);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	530 ASSERT_FALSE(p.IsAdvancedFormatNeeded());
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/", p.GetUrl());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	532 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	533 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	534 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	535 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	536 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	537 ASSERT_FALSE(p.IsPkcs11Enabled());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	538
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	539 Json::Value v2;
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	540 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	541 ASSERT_EQ(v, v2);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	542
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	543 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	544 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	545 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	546 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	547 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	548 ASSERT_TRUE(v2[2u].asString().empty());
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4158 diff changeset	549
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4158 diff changeset	550 WebServiceParameters p2(v2); // Test decoding
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4158 diff changeset	551 ASSERT_EQ("http://localhost:8042/", p2.GetUrl());
2800 dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	552 }
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	553
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	554 {
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	555 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	556 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	557
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	558 WebServiceParameters p(v);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	559 ASSERT_FALSE(p.IsAdvancedFormatNeeded());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	560 p.SetPkcs11Enabled(true);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	561 ASSERT_TRUE(p.IsAdvancedFormatNeeded());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	562
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	563 Json::Value v2;
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	564 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	565
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	566 ASSERT_EQ(Json::objectValue, v2.type());
4522 017ab543e6ef added field "Timeout" in "OrthancPeers" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 4453 diff changeset	567 ASSERT_EQ(4u, v2.size());
2800 dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	568 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	569 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	570 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	571 ASSERT_EQ(0u, v2["HttpHeaders"].size());
4522 017ab543e6ef added field "Timeout" in "OrthancPeers" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 4453 diff changeset	572 ASSERT_EQ(0, v2["Timeout"].asInt());
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4158 diff changeset	573
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4158 diff changeset	574 WebServiceParameters p2(v2); // Test decoding
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4158 diff changeset	575 ASSERT_EQ("http://localhost:8042/", p2.GetUrl());
2800 dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	576 }
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	577
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	578 {
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	579 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	580 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	581
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	582 WebServiceParameters p(v);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	583 ASSERT_FALSE(p.IsAdvancedFormatNeeded());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	584 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	585 ASSERT_TRUE(p.IsAdvancedFormatNeeded());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	586
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	587 Json::Value v2;
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	588 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	589
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	590 ASSERT_EQ(Json::objectValue, v2.type());
4522 017ab543e6ef added field "Timeout" in "OrthancPeers" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 4453 diff changeset	591 ASSERT_EQ(7u, v2.size());
2800 dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	592 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	593 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	594 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	595 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	596 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	597 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	598 ASSERT_EQ(0u, v2["HttpHeaders"].size());
4522 017ab543e6ef added field "Timeout" in "OrthancPeers" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 4453 diff changeset	599 ASSERT_EQ(0, v2["Timeout"].asInt());
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4158 diff changeset	600
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4158 diff changeset	601 WebServiceParameters p2(v2); // Test decoding
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4158 diff changeset	602 ASSERT_EQ("http://localhost:8042/", p2.GetUrl());
2800 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
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	605 {
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	606 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	607 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	608
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	609 WebServiceParameters p(v);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	610 ASSERT_FALSE(p.IsAdvancedFormatNeeded());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	611 p.AddHttpHeader("a", "b");
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	612 p.AddHttpHeader("c", "d");
4522 017ab543e6ef added field "Timeout" in "OrthancPeers" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 4453 diff changeset	613 p.SetTimeout(42);
2800 dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	614 ASSERT_TRUE(p.IsAdvancedFormatNeeded());
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	615
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	616 Json::Value v2;
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	617 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	618 WebServiceParameters p2(v2);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	619
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	620 ASSERT_EQ(Json::objectValue, v2.type());
4522 017ab543e6ef added field "Timeout" in "OrthancPeers" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 4453 diff changeset	621 ASSERT_EQ(4u, v2.size());
2800 dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	622 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	623 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	624 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	625 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	626 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	627 ASSERT_EQ("d", v2["HttpHeaders"]["c"].asString());
4522 017ab543e6ef added field "Timeout" in "OrthancPeers" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 4453 diff changeset	628 ASSERT_EQ(42, v2["Timeout"].asInt());
2800 dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	629
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	630 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	631 p2.ListHttpHeaders(a);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	632 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	633 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	634 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	635
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	636 std::string s;
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	637 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	638 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	639 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	640 }
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2543 diff changeset	641 }
2823 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
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	644 TEST(WebServiceParameters, UserProperties)
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	645 {
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	646 Json::Value v = Json::nullValue;
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	647
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	648 {
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	649 WebServiceParameters p;
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	650 p.SetUrl("http://localhost:8042/");
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	651 ASSERT_FALSE(p.IsAdvancedFormatNeeded());
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	652
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	653 ASSERT_THROW(p.AddUserProperty("Url", "nope"), OrthancException);
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	654 p.AddUserProperty("Hello", "world");
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	655 p.AddUserProperty("a", "b");
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	656 ASSERT_TRUE(p.IsAdvancedFormatNeeded());
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	657
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	658 p.Serialize(v, false, true);
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	659
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	660 p.ClearUserProperties();
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	661 ASSERT_FALSE(p.IsAdvancedFormatNeeded());
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	662 }
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	663
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	664 {
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	665 WebServiceParameters p(v);
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	666 ASSERT_TRUE(p.IsAdvancedFormatNeeded());
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	667 ASSERT_TRUE(p.GetHttpHeaders().empty());
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	668
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	669 std::set<std::string> tmp;
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	670 p.ListUserProperties(tmp);
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	671 ASSERT_EQ(2u, tmp.size());
2824 0e1b79bc4a2d fix for msvc Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	672 ASSERT_TRUE(tmp.find("a") != tmp.end());
0e1b79bc4a2d fix for msvc Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	673 ASSERT_TRUE(tmp.find("Hello") != tmp.end());
0e1b79bc4a2d fix for msvc Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	674 ASSERT_TRUE(tmp.find("hello") == tmp.end());
2823 807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	675
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	676 std::string s;
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	677 ASSERT_TRUE(p.LookupUserProperty(s, "a")); ASSERT_TRUE(s == "b");
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	678 ASSERT_TRUE(p.LookupUserProperty(s, "Hello")); ASSERT_TRUE(s == "world");
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	679 ASSERT_FALSE(p.LookupUserProperty(s, "hello"));
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	680 }
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	681 }
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	682
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 TEST(StringMatcher, Basic)
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 StringMatcher matcher("---");
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	687
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
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 const std::string s = "";
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	692 ASSERT_FALSE(matcher.Apply(s));
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	693 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	694
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	695 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	696 const std::string s = "abc----def";
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	697 ASSERT_TRUE(matcher.Apply(s));
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	698 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	699 ASSERT_EQ("---", std::string(matcher.GetMatchBegin(), matcher.GetMatchEnd()));
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
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	702 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	703 const std::string s = "abc---";
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	704 ASSERT_TRUE(matcher.Apply(s));
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	705 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	706 ASSERT_EQ(s.end(), matcher.GetMatchEnd());
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	707 ASSERT_EQ("---", std::string(matcher.GetMatchBegin(), matcher.GetMatchEnd()));
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	708 ASSERT_EQ("", std::string(matcher.GetMatchEnd(), s.end()));
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	709 }
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 const std::string s = "abc--def";
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	713 ASSERT_FALSE(matcher.Apply(s));
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	714 ASSERT_THROW(matcher.GetMatchBegin(), OrthancException);
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	715 ASSERT_THROW(matcher.GetMatchEnd(), OrthancException);
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
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	718 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	719 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	720 ASSERT_EQ(10u, s.size());
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	721 ASSERT_FALSE(matcher.Apply(s));
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 s[9] = '-';
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	724 ASSERT_FALSE(matcher.Apply(s));
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	725
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	726 s[8] = '-';
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	727 ASSERT_FALSE(matcher.Apply(s));
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 s[7] = '-';
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	730 ASSERT_TRUE(matcher.Apply(s));
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	731 ASSERT_EQ(s.c_str() + 7, matcher.GetPointerBegin());
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	732 ASSERT_EQ(s.c_str() + 10, matcher.GetPointerEnd());
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	733 ASSERT_EQ(s.end() - 3, matcher.GetMatchBegin());
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	734 ASSERT_EQ(s.end(), matcher.GetMatchEnd());
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	735 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	736 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	737
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	738
4652 0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	739 TEST(CStringMatcher, Basic)
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	740 {
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	741 CStringMatcher matcher("---");
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	742
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	743 ASSERT_THROW(matcher.GetMatchBegin(), OrthancException);
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	744
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	745 {
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	746 ASSERT_FALSE(matcher.Apply(NULL, 0));
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	747
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	748 const std::string s = "";
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	749 ASSERT_FALSE(matcher.Apply(s));
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	750 }
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	751
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	752 {
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	753 const char* s = "abc---def";
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	754 ASSERT_TRUE(matcher.Apply(s, s + 9));
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	755
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	756 ASSERT_EQ('a', matcher.GetMatchBegin()[-3]);
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	757 ASSERT_EQ('b', matcher.GetMatchBegin()[-2]);
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	758 ASSERT_EQ('c', matcher.GetMatchBegin()[-1]);
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	759 ASSERT_EQ('-', matcher.GetMatchBegin()[0]);
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	760 ASSERT_EQ('-', matcher.GetMatchBegin()[1]);
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	761 ASSERT_EQ('-', matcher.GetMatchBegin()[2]);
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	762 ASSERT_EQ('d', matcher.GetMatchBegin()[3]);
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	763 ASSERT_EQ('e', matcher.GetMatchBegin()[4]);
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	764 ASSERT_EQ('f', matcher.GetMatchBegin()[5]);
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	765 ASSERT_EQ('\0', matcher.GetMatchBegin()[6]);
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	766
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	767 ASSERT_EQ('a', matcher.GetMatchEnd()[-6]);
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	768 ASSERT_EQ('b', matcher.GetMatchEnd()[-5]);
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	769 ASSERT_EQ('c', matcher.GetMatchEnd()[-4]);
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	770 ASSERT_EQ('-', matcher.GetMatchEnd()[-3]);
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	771 ASSERT_EQ('-', matcher.GetMatchEnd()[-2]);
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	772 ASSERT_EQ('-', matcher.GetMatchEnd()[-1]);
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	773 ASSERT_EQ('d', matcher.GetMatchEnd()[0]);
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	774 ASSERT_EQ('e', matcher.GetMatchEnd()[1]);
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	775 ASSERT_EQ('f', matcher.GetMatchEnd()[2]);
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	776 ASSERT_EQ('\0', matcher.GetMatchEnd()[3]);
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	777 }
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	778
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	779 {
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	780 const std::string s = "abc----def";
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	781 ASSERT_TRUE(matcher.Apply(s));
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	782 ASSERT_EQ(3, std::distance(s.c_str(), matcher.GetMatchBegin()));
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	783 ASSERT_EQ("---", std::string(matcher.GetMatchBegin(), matcher.GetMatchEnd()));
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	784 }
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	785
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	786 {
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	787 const std::string s = "abc---";
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	788 ASSERT_TRUE(matcher.Apply(s));
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	789 ASSERT_EQ(3, std::distance(s.c_str(), matcher.GetMatchBegin()));
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	790 ASSERT_EQ(s.c_str() + s.size(), matcher.GetMatchEnd());
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	791 ASSERT_EQ("---", std::string(matcher.GetMatchBegin(), matcher.GetMatchEnd()));
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	792 ASSERT_EQ("", std::string(matcher.GetMatchEnd(), s.c_str() + s.size()));
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	793 }
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	794
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	795 {
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	796 const std::string s = "abc--def";
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	797 ASSERT_FALSE(matcher.Apply(s));
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	798 ASSERT_THROW(matcher.GetMatchBegin(), OrthancException);
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	799 ASSERT_THROW(matcher.GetMatchEnd(), OrthancException);
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	800 }
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	801
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	802 {
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	803 std::string s(10u, '\0'); // String with null values
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	804 ASSERT_EQ(10u, s.size());
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	805 ASSERT_FALSE(matcher.Apply(s));
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	806
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	807 s[9] = '-';
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	808 ASSERT_FALSE(matcher.Apply(s));
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	809
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	810 s[8] = '-';
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	811 ASSERT_FALSE(matcher.Apply(s));
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	812
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	813 s[7] = '-';
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	814 ASSERT_TRUE(matcher.Apply(s));
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	815 ASSERT_EQ(s.c_str() + 7, matcher.GetMatchBegin());
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	816 ASSERT_EQ(s.c_str() + 10, matcher.GetMatchEnd());
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	817 ASSERT_EQ(s.c_str() + s.size() - 3, matcher.GetMatchBegin());
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	818 ASSERT_EQ(s.c_str() + s.size(), matcher.GetMatchEnd());
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	819 }
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	820 }
0ad5736c8d62 use plain C strings in MultipartStreamReader instead of std::string to allow further optimizations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4522 diff changeset	821
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	822
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	823 class MultipartTester : public MultipartStreamReader::IHandler
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	824 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	825 private:
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	826 struct Part
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	827 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	828 MultipartStreamReader::HttpHeaders headers_;
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	829 std::string data_;
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 Part(const MultipartStreamReader::HttpHeaders& headers,
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	832 const void* part,
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	833 size_t size) :
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	834 headers_(headers),
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	835 data_(reinterpret_cast<const char*>(part), size)
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 }
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
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	840 std::vector<Part> parts_;
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	841
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	842 public:
3399 4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	843 virtual void HandlePart(const MultipartStreamReader::HttpHeaders& headers,
4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	844 const void* part,
4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	845 size_t size)
3398 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 parts_.push_back(Part(headers, part, size));
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 unsigned int GetCount() const
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 return parts_.size();
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 MultipartStreamReader::HttpHeaders& GetHeaders(size_t i)
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 return parts_[i].headers_;
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
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	860 const std::string& GetData(size_t i) const
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	861 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	862 return parts_[i].data_;
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 };
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
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	867 TEST(MultipartStreamReader, ParseHeaders)
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	868 {
3399 4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	869 std::string ct, b, st, header;
3398 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 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	872 MultipartStreamReader::HttpHeaders h;
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	873 h["hello"] = "world";
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	874 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	875 h["CONTENT-type"] = "world"; // Should be in lower-case
3399 4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	876 ASSERT_FALSE(MultipartStreamReader::GetMainContentType(header, h));
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	877 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	878
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	879 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	880 MultipartStreamReader::HttpHeaders h;
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	881 h["content-type"] = "world";
3399 4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	882 ASSERT_TRUE(MultipartStreamReader::GetMainContentType(header, h));
4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	883 ASSERT_EQ(header, "world");
4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	884 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	885 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	886
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	887 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	888 MultipartStreamReader::HttpHeaders h;
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	889 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	890 ASSERT_TRUE(MultipartStreamReader::GetMainContentType(header, h));
4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	891 ASSERT_EQ(header, h["content-type"]);
4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	892 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	893 ASSERT_EQ(ct, "multipart/related");
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	894 ASSERT_EQ(b, "1234");
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	895 ASSERT_TRUE(st.empty());
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	896 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	897
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	898 {
3399 4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	899 ASSERT_FALSE(MultipartStreamReader::ParseMultipartContentType
4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	900 (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	901 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	902
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	903 {
3399 4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	904 ASSERT_TRUE(MultipartStreamReader::ParseMultipartContentType
4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	905 (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	906 ASSERT_EQ(ct, "multipart/related");
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	907 ASSERT_EQ(b, "heLLO");
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	908 ASSERT_EQ(st, "application/dicom");
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	909 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	910
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	911 {
3399 4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	912 ASSERT_TRUE(MultipartStreamReader::ParseMultipartContentType
4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3398 diff changeset	913 (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	914 ASSERT_EQ(ct, "multipart/related");
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	915 ASSERT_EQ(b, "a");
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	916 ASSERT_EQ(st, "application/dicom");
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	917 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	918 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	919
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	920
4453 4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	921 TEST(MultipartStreamReader, ParseHeaders2)
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	922 {
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	923 std::string main;
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	924 std::map<std::string, std::string> args;
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	925
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	926 ASSERT_FALSE(MultipartStreamReader::ParseHeaderArguments(main, args, ""));
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	927 ASSERT_FALSE(MultipartStreamReader::ParseHeaderArguments(main, args, " "));
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	928 ASSERT_FALSE(MultipartStreamReader::ParseHeaderArguments(main, args, " ; "));
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	929
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	930 ASSERT_TRUE(MultipartStreamReader::ParseHeaderArguments(main, args, "hello"));
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	931 ASSERT_EQ("hello", main);
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	932 ASSERT_TRUE(args.empty());
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	933
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	934 ASSERT_TRUE(MultipartStreamReader::ParseHeaderArguments(main, args, "hello ; a = \" b \";c=d ; e=f;"));
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	935 ASSERT_EQ("hello", main);
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	936 ASSERT_EQ(3u, args.size());
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	937 ASSERT_EQ(" b ", args["a"]);
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	938 ASSERT_EQ("d", args["c"]);
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	939 ASSERT_EQ("f", args["e"]);
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	940
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	941 ASSERT_TRUE(MultipartStreamReader::ParseHeaderArguments(main, args, " hello ;;;; ; "));
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	942 ASSERT_EQ("hello", main);
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	943 ASSERT_TRUE(args.empty());
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	944
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	945 ASSERT_FALSE(MultipartStreamReader::ParseHeaderArguments(main, args, "hello;a=b;c=d;a=f"));
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	946
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	947 ASSERT_TRUE(MultipartStreamReader::ParseHeaderArguments(main, args, "multipart/related; dummy=value; boundary=1234; hello=world"));
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	948 ASSERT_EQ("multipart/related", main);
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	949 ASSERT_EQ(3u, args.size());
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	950 ASSERT_EQ("value", args["dummy"]);
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	951 ASSERT_EQ("1234", args["boundary"]);
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	952 ASSERT_EQ("world", args["hello"]);
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	953
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	954 ASSERT_TRUE(MultipartStreamReader::ParseHeaderArguments(main, args, "multipart/related; boundary="));
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	955 ASSERT_EQ("multipart/related", main);
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	956 ASSERT_EQ(1u, args.size());
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	957 ASSERT_EQ("", args["boundary"]);
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	958
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	959 ASSERT_TRUE(MultipartStreamReader::ParseHeaderArguments(main, args, "multipart/related; boundary"));
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	960 ASSERT_EQ("multipart/related", main);
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	961 ASSERT_EQ(1u, args.size());
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	962 ASSERT_EQ("", args["boundary"]);
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	963
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	964 ASSERT_TRUE(MultipartStreamReader::ParseHeaderArguments(main, args, "Multipart/Related; TYPE=Application/Dicom; Boundary=heLLO"));
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	965 ASSERT_EQ("multipart/related", main);
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	966 ASSERT_EQ(2u, args.size());
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	967 ASSERT_EQ("Application/Dicom", args["type"]);
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	968 ASSERT_EQ("heLLO", args["boundary"]);
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	969
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	970 ASSERT_TRUE(MultipartStreamReader::ParseHeaderArguments(main, args, "Multipart/Related; type=\"application/DICOM\"; Boundary=a"));
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	971 ASSERT_EQ("multipart/related", main);
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	972 ASSERT_EQ(2u, args.size());
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	973 ASSERT_EQ("application/DICOM", args["type"]);
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	974 ASSERT_EQ("a", args["boundary"]);
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	975 }
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	976
4f8e77c650e8 new function MultipartStreamReader::ParseHeaderArguments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	977
3398 4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	978 TEST(MultipartStreamReader, BytePerByte)
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	979 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	980 std::string stream = "GARBAGE";
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	981
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	982 std::string boundary = "123456789123456789";
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	983
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	984 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	985 for (size_t i = 0; i < 10; i++)
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	986 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	987 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	988
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	989 stream += "\r\n--" + boundary + "\r\n";
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	990 if (i % 2 == 0)
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	991 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	992 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	993 stream += f;
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	994 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	995
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	996 stream += "\r\n--" + boundary + "--";
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	997 stream += "GARBAGE";
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	998 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	999
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1000 for (unsigned int k = 0; k < 2; k++)
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1001 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1002 MultipartTester decoded;
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1003
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1004 MultipartStreamReader reader(boundary);
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1005 reader.SetBlockSize(1);
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1006 reader.SetHandler(decoded);
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1007
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1008 if (k == 0)
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1009 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1010 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	1011 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1012 reader.AddChunk(&stream[i], 1);
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1013 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1014 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1015 else
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1016 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1017 reader.AddChunk(stream);
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1018 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1019
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1020 reader.CloseStream();
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1021
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1022 ASSERT_EQ(10u, decoded.GetCount());
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1023
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1024 for (size_t i = 0; i < 10; i++)
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1025 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1026 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	1027 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	1028
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1029 if (i % 2 == 0)
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1030 {
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1031 ASSERT_EQ(2u, decoded.GetHeaders(i).size());
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1032 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	1033 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1034 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1035 }
4acd1431e603 new classes: StringMatcher and MultipartStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1036 }
4072 3dda0d73193c fix doxygen, more tolerant WebServiceParameters::SetUrl() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	1037
3dda0d73193c fix doxygen, more tolerant WebServiceParameters::SetUrl() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	1038
4333 a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1039 TEST(MultipartStreamReader, Issue190)
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1040 {
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1041 // https://bugs.orthanc-server.com/show_bug.cgi?id=190
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1042 // https://hg.orthanc-server.com/orthanc-dicomweb/rev/6dc2f79b5579
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1043
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1044 std::map<std::string, std::string> headers;
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1045 headers["content-type"] = "multipart/related; type=application/dicom; boundary=0f3cf5c0-70e0-41ef-baef-c6f9f65ec3e1";
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1046
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1047 {
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1048 std::string tmp, contentType, subType, boundary;
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1049 ASSERT_TRUE(Orthanc::MultipartStreamReader::GetMainContentType(tmp, headers));
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1050 ASSERT_TRUE(Orthanc::MultipartStreamReader::ParseMultipartContentType(contentType, subType, boundary, tmp));
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1051 ASSERT_EQ("multipart/related", contentType);
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1052 ASSERT_EQ("application/dicom", subType);
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1053 ASSERT_EQ("0f3cf5c0-70e0-41ef-baef-c6f9f65ec3e1", boundary);
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1054 }
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1055
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1056 headers["content-type"] = "multipart/related; type=\"application/dicom\"; boundary=\"0f3cf5c0-70e0-41ef-baef-c6f9f65ec3e1\"";
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1057
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1058 {
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1059 std::string tmp, contentType, subType, boundary;
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1060 ASSERT_TRUE(Orthanc::MultipartStreamReader::GetMainContentType(tmp, headers));
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1061 ASSERT_TRUE(Orthanc::MultipartStreamReader::ParseMultipartContentType(contentType, subType, boundary, tmp));
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1062 ASSERT_EQ("multipart/related", contentType);
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1063 ASSERT_EQ("application/dicom", subType);
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1064 ASSERT_EQ("0f3cf5c0-70e0-41ef-baef-c6f9f65ec3e1", boundary);
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1065 }
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1066 }
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1067
a85e74235a78 fix parsing of multipart boundaries, to resolve issue #190 in STOW-RS of DICOMweb plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 4331 diff changeset	1068
4072 3dda0d73193c fix doxygen, more tolerant WebServiceParameters::SetUrl() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	1069 TEST(WebServiceParameters, Url)
3dda0d73193c fix doxygen, more tolerant WebServiceParameters::SetUrl() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	1070 {
3dda0d73193c fix doxygen, more tolerant WebServiceParameters::SetUrl() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	1071 WebServiceParameters w;
3dda0d73193c fix doxygen, more tolerant WebServiceParameters::SetUrl() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	1072
3dda0d73193c fix doxygen, more tolerant WebServiceParameters::SetUrl() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	1073 ASSERT_THROW(w.SetUrl("ssh://coucou"), OrthancException);
3dda0d73193c fix doxygen, more tolerant WebServiceParameters::SetUrl() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	1074 w.SetUrl("http://coucou");
3dda0d73193c fix doxygen, more tolerant WebServiceParameters::SetUrl() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	1075 w.SetUrl("https://coucou");
3dda0d73193c fix doxygen, more tolerant WebServiceParameters::SetUrl() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	1076 ASSERT_THROW(w.SetUrl("httpss://coucou"), OrthancException);
3dda0d73193c fix doxygen, more tolerant WebServiceParameters::SetUrl() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	1077 ASSERT_THROW(w.SetUrl(""), OrthancException);
3dda0d73193c fix doxygen, more tolerant WebServiceParameters::SetUrl() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	1078
3dda0d73193c fix doxygen, more tolerant WebServiceParameters::SetUrl() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	1079 // New in Orthanc 1.7.2: Allow relative URLs (for DICOMweb in Stone)
3dda0d73193c fix doxygen, more tolerant WebServiceParameters::SetUrl() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	1080 w.SetUrl("coucou");
3dda0d73193c fix doxygen, more tolerant WebServiceParameters::SetUrl() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	1081 w.SetUrl("/coucou");
3dda0d73193c fix doxygen, more tolerant WebServiceParameters::SetUrl() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	1082 }
4148 732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1083
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1084
4150 b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1085 TEST(ChunkedBuffer, DISABLED_Large)
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1086 {
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1087 const size_t LARGE = 60 * 1024 * 1024;
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1088
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1089 ChunkedBuffer b;
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1090 for (size_t i = 0; i < LARGE; i++)
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1091 {
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1092 b.AddChunk(boost::lexical_cast<std::string>(i % 10));
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1093 }
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1094
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1095 std::string s;
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1096 b.Flatten(s);
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1097 ASSERT_EQ(LARGE, s.size());
4157 86e99e08ba52 fix compiler warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 4151 diff changeset	1098 ASSERT_EQ(0u, b.GetNumBytes());
4150 b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1099
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1100 for (size_t i = 0; i < LARGE; i++)
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1101 {
4157 86e99e08ba52 fix compiler warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 4151 diff changeset	1102 ASSERT_EQ(static_cast<char>('0' + (i % 10)), s[i]);
4150 b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1103 }
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1104
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1105 b.Flatten(s);
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1106 ASSERT_EQ(0u, s.size());
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1107 }
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1108
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1109
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1110 TEST(ChunkedBuffer, Pending)
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1111 {
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1112 ChunkedBuffer b;
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1113
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1114 for (size_t pendingSize = 0; pendingSize < 16; pendingSize++)
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1115 {
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1116 b.SetPendingBufferSize(pendingSize);
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1117 ASSERT_EQ(pendingSize, b.GetPendingBufferSize());
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1118
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1119 unsigned int pos = 0;
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1120 unsigned int iteration = 0;
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1121
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1122 while (pos < 1024)
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1123 {
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1124 size_t chunkSize = (iteration % 17);
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1125
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1126 std::string chunk;
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1127 chunk.resize(chunkSize);
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1128 for (size_t i = 0; i < chunkSize; i++)
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1129 {
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1130 chunk[i] = '0' + (pos % 10);
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1131 pos++;
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1132 }
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1133
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1134 b.AddChunk(chunk);
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1135
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1136 iteration ++;
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1137 }
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1138
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1139 std::string s;
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1140 b.Flatten(s);
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1141 ASSERT_EQ(0u, b.GetNumBytes());
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1142 ASSERT_EQ(pos, s.size());
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1143
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1144 for (size_t i = 0; i < s.size(); i++)
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1145 {
4157 86e99e08ba52 fix compiler warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 4151 diff changeset	1146 ASSERT_EQ(static_cast<char>('0' + (i % 10)), s[i]);
4150 b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1147 }
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1148 }
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1149 }
b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1150
4148 732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1151
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1152
4325 b96aedfa8cc1 unit tests now running in WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	1153 #if ORTHANC_SANDBOXED != 1
b96aedfa8cc1 unit tests now running in WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	1154
4330 a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4327 diff changeset	1155
4148 732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1156 namespace
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1157 {
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1158 class TotoBody : public HttpClient::IRequestBody
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1159 {
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1160 private:
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1161 size_t size_;
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1162 size_t chunkSize_;
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1163 size_t pos_;
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1164
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1165 public:
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1166 TotoBody(size_t size,
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1167 size_t chunkSize) :
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1168 size_(size),
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1169 chunkSize_(chunkSize),
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1170 pos_(0)
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1171 {
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1172 }
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1173
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4158 diff changeset	1174 virtual bool ReadNextChunk(std::string& chunk) ORTHANC_OVERRIDE
4148 732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1175 {
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1176 if (pos_ == size_)
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1177 {
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1178 return false;
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1179 }
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1180
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1181 chunk.clear();
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1182 chunk.resize(chunkSize_);
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1183
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1184 size_t i = 0;
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1185 while (pos_ < size_ &&
4150 b56f3a37a4a1 optimization of ChunkedBuffer if many small chunks are added Sebastien Jodogne <s.jodogne@gmail.com> parents: 4148 diff changeset	1186 i < chunk.size())
4148 732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1187 {
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1188 chunk[i] = '0' + (pos_ % 7);
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1189 pos_++;
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1190 i++;
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1191 }
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1192
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1193 if (i < chunk.size())
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1194 {
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1195 chunk.erase(i, chunk.size());
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1196 }
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1197
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1198 return true;
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1199 }
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1200 };
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1201
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1202 class TotoServer : public IHttpHandler
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1203 {
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1204 public:
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1205 virtual bool CreateChunkedRequestReader(std::unique_ptr<IChunkedRequestReader>& target,
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1206 RequestOrigin origin,
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1207 const char* remoteIp,
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1208 const char* username,
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1209 HttpMethod method,
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1210 const UriComponents& uri,
4330 a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4327 diff changeset	1211 const HttpToolbox::Arguments& headers) ORTHANC_OVERRIDE
4148 732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1212 {
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1213 return false;
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1214 }
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1215
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1216 virtual bool Handle(HttpOutput& output,
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1217 RequestOrigin origin,
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1218 const char* remoteIp,
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1219 const char* username,
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1220 HttpMethod method,
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1221 const UriComponents& uri,
4330 a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4327 diff changeset	1222 const HttpToolbox::Arguments& headers,
a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4327 diff changeset	1223 const HttpToolbox::GetArguments& getArguments,
4148 732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1224 const void* bodyData,
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4158 diff changeset	1225 size_t bodySize) ORTHANC_OVERRIDE
4148 732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1226 {
4158 32ac045109a6 fix compiler warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 4157 diff changeset	1227 printf("received %d\n", static_cast<int>(bodySize));
4148 732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1228
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1229 const uint8_t* b = reinterpret_cast<const uint8_t*>(bodyData);
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1230
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1231 for (size_t i = 0; i < bodySize; i++)
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1232 {
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1233 if (b[i] != ('0' + i % 7))
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1234 {
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1235 throw;
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1236 }
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1237 }
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1238
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1239 output.Answer("ok");
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1240 return true;
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1241 }
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1242 };
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1243 }
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1244
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1245
4325 b96aedfa8cc1 unit tests now running in WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	1246
4148 732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1247 #include "../Sources/HttpServer/HttpServer.h"
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1248
4151 8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1249 TEST(HttpClient, DISABLED_Issue156_Slow)
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1250 {
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1251 // https://bugs.orthanc-server.com/show_bug.cgi?id=156
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1252
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1253 TotoServer handler;
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1254 HttpServer server;
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1255 server.SetPortNumber(5000);
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1256 server.Register(handler);
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1257 server.Start();
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1258
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1259 WebServiceParameters w;
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1260 w.SetUrl("http://localhost:5000");
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1261
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1262 // This is slow in Orthanc <= 1.5.8 (issue 156)
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1263 TotoBody body(600 * 1024 * 1024, 6 * 1024 * 1024 - 17);
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1264
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1265 HttpClient c(w, "toto");
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1266 c.SetMethod(HttpMethod_Post);
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1267 c.AddHeader("Expect", "");
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1268 c.AddHeader("Transfer-Encoding", "chunked");
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1269 c.SetBody(body);
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1270
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1271 std::string s;
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1272 ASSERT_TRUE(c.Apply(s));
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1273 ASSERT_EQ("ok", s);
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1274
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1275 server.Stop();
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1276 }
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1277
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1278
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1279 TEST(HttpClient, DISABLED_Issue156_Crash)
4148 732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1280 {
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1281 TotoServer handler;
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1282 HttpServer server;
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1283 server.SetPortNumber(5000);
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1284 server.Register(handler);
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1285 server.Start();
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1286
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1287 WebServiceParameters w;
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1288 w.SetUrl("http://localhost:5000");
4151 8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1289
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1290 // This crashes Orthanc 1.6.0 to 1.7.2
8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1291 TotoBody body(32 * 1024, 1);
4148 732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1292
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1293 HttpClient c(w, "toto");
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1294 c.SetMethod(HttpMethod_Post);
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1295 c.AddHeader("Expect", "");
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1296 c.AddHeader("Transfer-Encoding", "chunked");
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1297 c.SetBody(body);
4151 8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1298
4148 732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1299 std::string s;
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1300 ASSERT_TRUE(c.Apply(s));
4151 8c559dd5034b Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4150 diff changeset	1301 ASSERT_EQ("ok", s);
4148 732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1302
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1303 server.Stop();
732ad6c618ba removing ChunkedBuffer::AddChunkDestructive() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1304 }
4325 b96aedfa8cc1 unit tests now running in WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	1305 #endif

Mercurial > hg > orthanc

annotate OrthancFramework/UnitTestsSources/RestApiTests.cpp @ 5320:e4c3950345e9