From 7169c057e56ac12e3f656978873a369ec40b1feb Mon Sep 17 00:00:00 2001 From: Zdenek Havlin Date: Thu, 3 Jan 2019 23:12:13 +0100 Subject: [PATCH 1/6] Update .gitignore --- .gitignore | 369 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 327 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index b8865cc..8336bde 100644 --- a/.gitignore +++ b/.gitignore @@ -1,56 +1,341 @@ -#OS junk files -[Tt]humbs.db -*.DS_Store +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore -#Visual Studio files -*.[Oo]bj +# User-specific files +*.rsuser +*.suo *.user -*.aps -*.pch -*.vspscc -*.vssscc +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio *_i.c *_p.c -*.ncb -*.suo +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr *.tlb +*.tli *.tlh -*.bak -*.[Cc]ache -*.ilk +*.tmp +*.tmp_proj +*_wpftmp.csproj *.log -*.lib -*.sbr -*.sdf -*.suo -*.opensdf -*.unsuccessfulbuild -*.user +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files ipch/ -obj/ -log4net/ -logging/ -packages/ -[Bb]in -[Dd]ebug*/ -[Rr]elease*/ -Ankh.NoLoad - -#Tooling +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in _ReSharper*/ -*.resharper -[Tt]est[Rr]esult* +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* -#Project files -[Bb]uild/ +# DotCover is a Code Coverage Tool +*.dotCover -#Subversion files -.svn +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json -# Office Temp Files +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ ~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ +# ASP.NET Core default setup: bower directory is configured as wwwroot/lib/ and bower restore is true +**/wwwroot/lib/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ -#runtime files -*.compile.css -*.compile.js -uploads/ +# BeatPulse healthcheck temp database +healthchecksdb From 8043dec64e90053d4d34859512e56fc37960caaa Mon Sep 17 00:00:00 2001 From: Zdenek Havlin Date: Thu, 3 Jan 2019 23:12:55 +0100 Subject: [PATCH 2/6] #40 Allow multiple query params of same name (and headers and cookies ... as RFC allows that) --- RestAssured.sln | 46 ++++++------- src/RA/ExecutionContext.cs | 26 +++++++- src/RA/SetupContext.cs | 132 ++++++++++++++++++++++++------------- 3 files changed, 133 insertions(+), 71 deletions(-) diff --git a/RestAssured.sln b/RestAssured.sln index d64a6ca..f453560 100644 --- a/RestAssured.sln +++ b/RestAssured.sln @@ -1,13 +1,12 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26124.0 MinimumVisualStudioVersion = 15.0.26124.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{778F0B90-7918-43A3-A2A8-22BC40BF4986}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RA", "src\RA\RestAssured.csproj", "{602D6232-1B1C-43A9-9F0D-5E2591F5022E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RestAssured", "src\RA\RestAssured.csproj", "{602D6232-1B1C-43A9-9F0D-5E2591F5022E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RA.Tests", "src\RA.Tests\RA.Tests.csproj", "{D56698D4-592D-472D-9B43-72FC85CADE61}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RA.Tests", "src\RA.Tests\RA.Tests.csproj", "{D56698D4-592D-472D-9B43-72FC85CADE61}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -18,37 +17,40 @@ Global Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Debug|x64.ActiveCfg = Debug|x64 - {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Debug|x64.Build.0 = Debug|x64 - {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Debug|x86.ActiveCfg = Debug|x86 - {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Debug|x86.Build.0 = Debug|x86 + {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Debug|x64.ActiveCfg = Debug|Any CPU + {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Debug|x64.Build.0 = Debug|Any CPU + {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Debug|x86.ActiveCfg = Debug|Any CPU + {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Debug|x86.Build.0 = Debug|Any CPU {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Release|Any CPU.ActiveCfg = Release|Any CPU {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Release|Any CPU.Build.0 = Release|Any CPU - {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Release|x64.ActiveCfg = Release|x64 - {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Release|x64.Build.0 = Release|x64 - {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Release|x86.ActiveCfg = Release|x86 - {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Release|x86.Build.0 = Release|x86 + {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Release|x64.ActiveCfg = Release|Any CPU + {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Release|x64.Build.0 = Release|Any CPU + {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Release|x86.ActiveCfg = Release|Any CPU + {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Release|x86.Build.0 = Release|Any CPU {D56698D4-592D-472D-9B43-72FC85CADE61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D56698D4-592D-472D-9B43-72FC85CADE61}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D56698D4-592D-472D-9B43-72FC85CADE61}.Debug|x64.ActiveCfg = Debug|x64 - {D56698D4-592D-472D-9B43-72FC85CADE61}.Debug|x64.Build.0 = Debug|x64 - {D56698D4-592D-472D-9B43-72FC85CADE61}.Debug|x86.ActiveCfg = Debug|x86 - {D56698D4-592D-472D-9B43-72FC85CADE61}.Debug|x86.Build.0 = Debug|x86 + {D56698D4-592D-472D-9B43-72FC85CADE61}.Debug|x64.ActiveCfg = Debug|Any CPU + {D56698D4-592D-472D-9B43-72FC85CADE61}.Debug|x64.Build.0 = Debug|Any CPU + {D56698D4-592D-472D-9B43-72FC85CADE61}.Debug|x86.ActiveCfg = Debug|Any CPU + {D56698D4-592D-472D-9B43-72FC85CADE61}.Debug|x86.Build.0 = Debug|Any CPU {D56698D4-592D-472D-9B43-72FC85CADE61}.Release|Any CPU.ActiveCfg = Release|Any CPU {D56698D4-592D-472D-9B43-72FC85CADE61}.Release|Any CPU.Build.0 = Release|Any CPU - {D56698D4-592D-472D-9B43-72FC85CADE61}.Release|x64.ActiveCfg = Release|x64 - {D56698D4-592D-472D-9B43-72FC85CADE61}.Release|x64.Build.0 = Release|x64 - {D56698D4-592D-472D-9B43-72FC85CADE61}.Release|x86.ActiveCfg = Release|x86 - {D56698D4-592D-472D-9B43-72FC85CADE61}.Release|x86.Build.0 = Release|x86 + {D56698D4-592D-472D-9B43-72FC85CADE61}.Release|x64.ActiveCfg = Release|Any CPU + {D56698D4-592D-472D-9B43-72FC85CADE61}.Release|x64.Build.0 = Release|Any CPU + {D56698D4-592D-472D-9B43-72FC85CADE61}.Release|x86.ActiveCfg = Release|Any CPU + {D56698D4-592D-472D-9B43-72FC85CADE61}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {602D6232-1B1C-43A9-9F0D-5E2591F5022E} = {778F0B90-7918-43A3-A2A8-22BC40BF4986} {D56698D4-592D-472D-9B43-72FC85CADE61} = {778F0B90-7918-43A3-A2A8-22BC40BF4986} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {DC7C71B1-6512-46EF-A810-38894ADA4CF8} + EndGlobalSection EndGlobal diff --git a/src/RA/ExecutionContext.cs b/src/RA/ExecutionContext.cs index d5c97d0..db55b93 100644 --- a/src/RA/ExecutionContext.cs +++ b/src/RA/ExecutionContext.cs @@ -151,7 +151,7 @@ private Uri BuildUri() foreach (var queryString in _setupContext.Queries()) { - query.Add(queryString.Key, queryString.Value); + query.Add(_setupContext.Queries()); } builder.Query = query.ToString(); @@ -164,12 +164,32 @@ private void AppendHeaders(HttpRequestMessage request) _setupContext.HeaderAccept().ForEach(x => _httpClient.DefaultRequestHeaders.Add(HeaderType.Accept.Value, x)); _setupContext.HeaderAcceptEncoding().ForEach(x => request.Headers.AcceptEncoding.Add(new StringWithQualityHeaderValue(x))); _setupContext.HeaderAcceptCharset().ForEach(x => request.Headers.AcceptCharset.Add(new StringWithQualityHeaderValue(x))); - _setupContext.HeaderForEverythingElse().ForEach(x => request.Headers.Add(x.Key, x.Value)); + + var headersForEverythingElse = _setupContext.HeaderForEverythingElse(); + foreach (string header in headersForEverythingElse) + { + request.Headers.Add(header, headersForEverythingElse.GetValues(header)); + } } private void AppendCookies(HttpRequestMessage request) { - request.Headers.Add("Cookie", string.Join(";", _setupContext.Cookies().Select(x => x.Key + "=" + x.Value))); + var cookies = _setupContext.Cookies(); + if (cookies.Count == 0) + { + return; + } + + var pairs = new List(); + foreach (string cookie in cookies) + { + foreach (var value in cookies.GetValues(cookie)) + { + pairs.Add($"{cookie}={value}"); + } + } + + request.Headers.Add("Cookie", string.Join("; ", pairs)); } private void SetTimeout() diff --git a/src/RA/SetupContext.cs b/src/RA/SetupContext.cs index 82783b5..2f79ffb 100644 --- a/src/RA/SetupContext.cs +++ b/src/RA/SetupContext.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Collections.Specialized; using System.Linq; using System.Net; using System.Net.Http; @@ -18,26 +19,22 @@ public class SetupContext private string _body; private HttpClient _httpClient; private bool _useHttps; - private readonly Dictionary _headers = new Dictionary(); private readonly Dictionary _parameters = new Dictionary(); - private readonly Dictionary _queryStrings = new Dictionary(); - private readonly Dictionary _cookies = new Dictionary(); + private readonly NameValueCollection _headers = new NameValueCollection(); + private readonly NameValueCollection _queryStrings = new NameValueCollection(); + private readonly NameValueCollection _cookies = new NameValueCollection(); private readonly List _files = new List(); private TimeSpan? _timeout = null; - private Func, List> GetHeaderFor = (filter, headers) => + private Func> GetHeaderFor = (filter, headers) => { - var value = - headers.Where(x => x.Key.Equals(filter, StringComparison.InvariantCultureIgnoreCase)) - .Select(x => x.Value) - .DefaultIfEmpty(string.Empty) - .First(); + var values = headers.GetValues(filter); - return !string.IsNullOrEmpty(value) ? value.Split(new[] { ',' }).Select(x => x.Trim()).ToList() : new List(); + return values != null + ? values.ToList() + : new List(0); }; - - /// /// Setup the name of the test suite. /// @@ -206,8 +203,7 @@ public List Files() /// public SetupContext Cookie(string name, string value) { - if(!_cookies.ContainsKey(name)) - _cookies.Add(name, value); + _cookies.Add(name, value); return this; } @@ -221,19 +217,31 @@ public SetupContext Cookies(Dictionary cookies) { foreach (var cookie in cookies) { - if (!_cookies.ContainsKey(cookie.Key)) - _cookies.Add(cookie.Key, cookie.Value); + _cookies.Add(cookie.Key, cookie.Value); } + return this; } + /// + /// Set cookie value pair. + /// eg: name : X-XSRF-TOKEN and value : 123456789 + /// + /// + /// + public SetupContext Cookies(NameValueCollection cookies) + { + _cookies.Add(cookies); + return this; + } + /// /// Return all cookies. /// /// - public Dictionary Cookies() + public NameValueCollection Cookies() { - return _cookies.Select(x => new KeyValuePair(x.Key, x.Value)).ToDictionary(x => x.Key, x => x.Value); + return new NameValueCollection(_cookies); } /// @@ -245,8 +253,7 @@ public Dictionary Cookies() /// public SetupContext Header(string key, string value) { - if (!_headers.ContainsKey(key)) - _headers.Add(key, value); + _headers.Add(key, value); return this; } @@ -259,20 +266,30 @@ public SetupContext Headers(Dictionary headers) { foreach (var header in headers) { - if (!_headers.ContainsKey(header.Key)) - _headers.Add(header.Key, header.Value); + _headers.Add(header.Key, header.Value); } return this; } - /// - /// Return all headers. - /// - /// - public Dictionary Headers() + /// + /// Sets multiple Http request header value pairs. + /// + /// + /// + public SetupContext Headers(NameValueCollection headers) + { + _headers.Add(headers); + return this; + } + + /// + /// Return all headers. + /// + /// + public NameValueCollection Headers() { - return _headers.Select(x => new KeyValuePair(x.Key, x.Value)).ToDictionary(x => x.Key, x => x.Value); + return new NameValueCollection(_headers); } /// @@ -315,14 +332,20 @@ public List HeaderAcceptCharset() /// Return all headers except for content-type, accept, accept-encoding and accept-charset /// /// - public Dictionary HeaderForEverythingElse() + public NameValueCollection HeaderForEverythingElse() { - return - _headers.Where( - x => - !HeaderType.GetAll() - .Any(y => y.Value.Equals(x.Key, StringComparison.InvariantCultureIgnoreCase))) - .ToDictionary(x => x.Key, x => x.Value); + var keepHeaders = _headers.AllKeys.Except(HeaderType.GetAll().Select(t => t.Value)); + + var headers = new NameValueCollection(); + foreach (var header in keepHeaders) + { + foreach (var value in _headers.GetValues(header)) + { + headers.Add(header, value); + } + } + + return headers; } /// @@ -373,13 +396,12 @@ public Dictionary Params() /// public SetupContext Query(string key, string value) { - if (!_queryStrings.ContainsKey(key)) - _queryStrings.Add(key, value); + _queryStrings.Add(key, value); return this; } /// - /// Set multiple Querystring value pairs. This is any key/value pairs that needs to go into the Url. This will be emitted with all Http verbs. + /// Set multiple Querystring value pairs. This is any key/value pairs that needs to go into the Url. This will be emitted with all Http verbs. /// /// /// @@ -388,19 +410,31 @@ public SetupContext Queries(Dictionary queries) { foreach (var query in queries) { - if (!_queryStrings.ContainsKey(query.Key)) - _queryStrings.Add(query.Key, query.Value); + _queryStrings.Add(query.Key, query.Value); } + return this; } + /// + /// Set multiple Querystring value pairs. This is any key/value pairs that needs to go into the Url. This will be emitted with all Http verbs. + /// + /// + /// + /// + public SetupContext Queries(NameValueCollection queries) + { + _queryStrings.Add(queries); + return this; + } + /// /// Return Querystring value pairs. /// /// - public Dictionary Queries() + public NameValueCollection Queries() { - return _queryStrings.Select(x => new KeyValuePair(x.Key, x.Value)).ToDictionary(x => x.Key, x => x.Value); + return new NameValueCollection(_queryStrings); } public SetupContext HttpClient(HttpClient client) @@ -490,15 +524,21 @@ public SetupContext Debug() "{0}\n".Write(_body); "request headers".WriteHeader(); - foreach (var header in _headers) + foreach (string key in _headers) { - "{0} : {1}".WriteLine(header.Key, header.Value); + "{0} : {1}".WriteLine(key, _headers[key].ToString()); } "querystrings".WriteHeader(); - foreach (var queryString in _queryStrings) + foreach (string queryString in _queryStrings) + { + "{0} : {1}".WriteLine(queryString, _queryStrings[queryString]); + } + + "cookies".WriteHeader(); + foreach (string cookie in _cookies) { - "{0} : {1}".WriteLine(queryString.Key, queryString.Value); + "{0} : {1}".WriteLine(cookie, _cookies[cookie]); } "parameters".WriteHeader(); From e434d36ab2edda6d63cc03a9f1cbb5e1364e6fda Mon Sep 17 00:00:00 2001 From: Zdenek Havlin Date: Thu, 3 Jan 2019 23:28:55 +0100 Subject: [PATCH 3/6] #40 Fix `GetHeaderFor` --- src/RA/SetupContext.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/RA/SetupContext.cs b/src/RA/SetupContext.cs index 2f79ffb..9b4e66c 100644 --- a/src/RA/SetupContext.cs +++ b/src/RA/SetupContext.cs @@ -28,7 +28,11 @@ public class SetupContext private Func> GetHeaderFor = (filter, headers) => { - var values = headers.GetValues(filter); + var values = headers + .GetValues(filter) + ?.First() + .Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries) + .Select(v => v.Trim()); return values != null ? values.ToList() From 82fd09531da762a034201475cf4c41f7c3140071 Mon Sep 17 00:00:00 2001 From: Zdenek Havlin Date: Fri, 4 Jan 2019 00:08:47 +0100 Subject: [PATCH 4/6] Revert changes in .sln done by VS accidentally (#40) --- RestAssured.sln | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/RestAssured.sln b/RestAssured.sln index f453560..d64a6ca 100644 --- a/RestAssured.sln +++ b/RestAssured.sln @@ -1,12 +1,13 @@ + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26124.0 MinimumVisualStudioVersion = 15.0.26124.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{778F0B90-7918-43A3-A2A8-22BC40BF4986}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RestAssured", "src\RA\RestAssured.csproj", "{602D6232-1B1C-43A9-9F0D-5E2591F5022E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RA", "src\RA\RestAssured.csproj", "{602D6232-1B1C-43A9-9F0D-5E2591F5022E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RA.Tests", "src\RA.Tests\RA.Tests.csproj", "{D56698D4-592D-472D-9B43-72FC85CADE61}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RA.Tests", "src\RA.Tests\RA.Tests.csproj", "{D56698D4-592D-472D-9B43-72FC85CADE61}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -17,40 +18,37 @@ Global Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Debug|x64.ActiveCfg = Debug|Any CPU - {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Debug|x64.Build.0 = Debug|Any CPU - {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Debug|x86.ActiveCfg = Debug|Any CPU - {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Debug|x86.Build.0 = Debug|Any CPU + {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Debug|x64.ActiveCfg = Debug|x64 + {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Debug|x64.Build.0 = Debug|x64 + {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Debug|x86.ActiveCfg = Debug|x86 + {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Debug|x86.Build.0 = Debug|x86 {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Release|Any CPU.ActiveCfg = Release|Any CPU {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Release|Any CPU.Build.0 = Release|Any CPU - {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Release|x64.ActiveCfg = Release|Any CPU - {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Release|x64.Build.0 = Release|Any CPU - {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Release|x86.ActiveCfg = Release|Any CPU - {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Release|x86.Build.0 = Release|Any CPU + {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Release|x64.ActiveCfg = Release|x64 + {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Release|x64.Build.0 = Release|x64 + {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Release|x86.ActiveCfg = Release|x86 + {602D6232-1B1C-43A9-9F0D-5E2591F5022E}.Release|x86.Build.0 = Release|x86 {D56698D4-592D-472D-9B43-72FC85CADE61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D56698D4-592D-472D-9B43-72FC85CADE61}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D56698D4-592D-472D-9B43-72FC85CADE61}.Debug|x64.ActiveCfg = Debug|Any CPU - {D56698D4-592D-472D-9B43-72FC85CADE61}.Debug|x64.Build.0 = Debug|Any CPU - {D56698D4-592D-472D-9B43-72FC85CADE61}.Debug|x86.ActiveCfg = Debug|Any CPU - {D56698D4-592D-472D-9B43-72FC85CADE61}.Debug|x86.Build.0 = Debug|Any CPU + {D56698D4-592D-472D-9B43-72FC85CADE61}.Debug|x64.ActiveCfg = Debug|x64 + {D56698D4-592D-472D-9B43-72FC85CADE61}.Debug|x64.Build.0 = Debug|x64 + {D56698D4-592D-472D-9B43-72FC85CADE61}.Debug|x86.ActiveCfg = Debug|x86 + {D56698D4-592D-472D-9B43-72FC85CADE61}.Debug|x86.Build.0 = Debug|x86 {D56698D4-592D-472D-9B43-72FC85CADE61}.Release|Any CPU.ActiveCfg = Release|Any CPU {D56698D4-592D-472D-9B43-72FC85CADE61}.Release|Any CPU.Build.0 = Release|Any CPU - {D56698D4-592D-472D-9B43-72FC85CADE61}.Release|x64.ActiveCfg = Release|Any CPU - {D56698D4-592D-472D-9B43-72FC85CADE61}.Release|x64.Build.0 = Release|Any CPU - {D56698D4-592D-472D-9B43-72FC85CADE61}.Release|x86.ActiveCfg = Release|Any CPU - {D56698D4-592D-472D-9B43-72FC85CADE61}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE + {D56698D4-592D-472D-9B43-72FC85CADE61}.Release|x64.ActiveCfg = Release|x64 + {D56698D4-592D-472D-9B43-72FC85CADE61}.Release|x64.Build.0 = Release|x64 + {D56698D4-592D-472D-9B43-72FC85CADE61}.Release|x86.ActiveCfg = Release|x86 + {D56698D4-592D-472D-9B43-72FC85CADE61}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(NestedProjects) = preSolution {602D6232-1B1C-43A9-9F0D-5E2591F5022E} = {778F0B90-7918-43A3-A2A8-22BC40BF4986} {D56698D4-592D-472D-9B43-72FC85CADE61} = {778F0B90-7918-43A3-A2A8-22BC40BF4986} EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {DC7C71B1-6512-46EF-A810-38894ADA4CF8} - EndGlobalSection EndGlobal From 849ca2734d18dcb1dca3924dea60d450b3d71cf6 Mon Sep 17 00:00:00 2001 From: DayneD89 Date: Tue, 20 Aug 2019 07:50:44 +0100 Subject: [PATCH 5/6] Fixed duplicate keys problem by creating an extension to the NameValueCollection class that prints the string correctly and added test to verify results. (#1) --- ...ockExecutionContextWithMulitipleQueries.cs | 45 +++++++++++++++++++ src/RA/ExecutionContext.cs | 7 +-- .../NameValueCollectionExtensions.cs | 29 ++++++++++++ 3 files changed, 76 insertions(+), 5 deletions(-) create mode 100644 src/RA.Tests/MockExecutionContextWithMulitipleQueries.cs create mode 100644 src/RA/Extensions/NameValueCollectionExtensions.cs diff --git a/src/RA.Tests/MockExecutionContextWithMulitipleQueries.cs b/src/RA.Tests/MockExecutionContextWithMulitipleQueries.cs new file mode 100644 index 0000000..d09739f --- /dev/null +++ b/src/RA.Tests/MockExecutionContextWithMulitipleQueries.cs @@ -0,0 +1,45 @@ +using System; +using System.IO; +using NUnit.Framework; + +namespace RA.Tests +{ + [TestFixture] + public class MockExecutionContextWithMulitipleQueries + { + private ExecutionContext _execution; + private string _key; + private string _val; + private string _val2; + + public MockExecutionContextWithMulitipleQueries() + { + _key = "foo"; + _val = "bar"; + _val2 = "baz"; + + var _setup = new SetupContext() + .Query(_key, _val) + .Query(_key, _val2); + _execution = new HttpActionContext(_setup) + .Get("http://test.com"); + + } + + [Test] + public void UrlContainsAllQuiries() + { + var stout = Console.Out; + using (StringWriter sw = new StringWriter()) + { + Console.SetOut(sw); + + _execution.Debug(); + Console.SetOut(stout); + + StringAssert.Contains(string.Format("{0}={1}", _key, _val), sw.ToString()); + StringAssert.Contains(string.Format("{0}={1}", _key, _val2), sw.ToString()); + } + } + } +} \ No newline at end of file diff --git a/src/RA/ExecutionContext.cs b/src/RA/ExecutionContext.cs index db55b93..8330140 100644 --- a/src/RA/ExecutionContext.cs +++ b/src/RA/ExecutionContext.cs @@ -149,12 +149,9 @@ private Uri BuildUri() var builder = new UriBuilder(_httpActionContext.Url()); var query = HttpUtility.ParseQueryString(builder.Query); - foreach (var queryString in _setupContext.Queries()) - { - query.Add(_setupContext.Queries()); - } + query.Add(_setupContext.Queries()); - builder.Query = query.ToString(); + builder.Query = query.ToQueryString(); return new Uri(builder.ToString()); } diff --git a/src/RA/Extensions/NameValueCollectionExtensions.cs b/src/RA/Extensions/NameValueCollectionExtensions.cs new file mode 100644 index 0000000..db503ef --- /dev/null +++ b/src/RA/Extensions/NameValueCollectionExtensions.cs @@ -0,0 +1,29 @@ +using System.Collections.Specialized; +using System.Linq; +using System.Text; +using System.Web; + +namespace RA.Extensions +{ + public static class NameValueCollectionExtensions + { + public static string ToQueryString(this NameValueCollection nvc) + { + int count = nvc.Count; + if (count == 0) + return ""; + StringBuilder sb = new StringBuilder(); + string[] keys = nvc.AllKeys; + + var items = nvc.AllKeys.SelectMany(nvc.GetValues, (k, v) => new { key = k, value = v }); + foreach (var item in items) + sb.AppendFormat("{0}={1}&", item.key, HttpUtility.UrlEncode(item.value, Encoding.UTF8)); + + if (sb.Length > 0) + sb.Length--; + return sb.ToString(); + } + + + } +} From 6006b3078358b4abb058332324dd72922004cd7b Mon Sep 17 00:00:00 2001 From: Zdenek Havlin Date: Tue, 20 Aug 2019 21:43:44 +0200 Subject: [PATCH 6/6] Simplify `NameValueCollectionExtensions`: drop LINQ, handle `null` as key; Improve test case --- ...ockExecutionContextWithMulitipleQueries.cs | 74 +++++++++++++------ .../NameValueCollectionExtensions.cs | 41 ++++++---- 2 files changed, 78 insertions(+), 37 deletions(-) diff --git a/src/RA.Tests/MockExecutionContextWithMulitipleQueries.cs b/src/RA.Tests/MockExecutionContextWithMulitipleQueries.cs index d09739f..89c649b 100644 --- a/src/RA.Tests/MockExecutionContextWithMulitipleQueries.cs +++ b/src/RA.Tests/MockExecutionContextWithMulitipleQueries.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using System.Collections.Specialized; using System.IO; using NUnit.Framework; @@ -7,39 +9,65 @@ namespace RA.Tests [TestFixture] public class MockExecutionContextWithMulitipleQueries { - private ExecutionContext _execution; - private string _key; - private string _val; - private string _val2; + private SetupContext _setupContext; + private ExecutionContext _executionContext; - public MockExecutionContextWithMulitipleQueries() + [SetUp] + public void Setup() { - _key = "foo"; - _val = "bar"; - _val2 = "baz"; - - var _setup = new SetupContext() - .Query(_key, _val) - .Query(_key, _val2); - _execution = new HttpActionContext(_setup) + _setupContext = new SetupContext(); + _executionContext = new HttpActionContext(_setupContext) .Get("http://test.com"); - } [Test] - public void UrlContainsAllQuiries() + [TestCaseSource(nameof(GenerateTestData))] + public void UrlContainsAllQueries(NameValueCollection queryStrings, string expectedQuery) { - var stout = Console.Out; - using (StringWriter sw = new StringWriter()) - { - Console.SetOut(sw); + _setupContext.Queries(queryStrings); - _execution.Debug(); - Console.SetOut(stout); + var stdOut = Console.Out; + try + { + using (StringWriter sw = new StringWriter()) + { + Console.SetOut(sw); - StringAssert.Contains(string.Format("{0}={1}", _key, _val), sw.ToString()); - StringAssert.Contains(string.Format("{0}={1}", _key, _val2), sw.ToString()); + _executionContext.Debug(); + StringAssert.Contains(expectedQuery, sw.ToString()); + } + } + finally + { + Console.SetOut(stdOut); } } + + private static IEnumerable GenerateTestData() + { + yield return new TestCaseData( + new NameValueCollection + { + { "a", "x" }, + { "b", "y" } + }, + "a=x&b=y"); + + yield return new TestCaseData( + new NameValueCollection + { + { "foo", "bar" }, + { "foo", "baz" } + }, + "foo=bar&foo=baz"); + + yield return new TestCaseData( + new NameValueCollection + { + { null, "foo" }, + { "bar", "baz" } + }, + "foo&bar=baz"); + } } } \ No newline at end of file diff --git a/src/RA/Extensions/NameValueCollectionExtensions.cs b/src/RA/Extensions/NameValueCollectionExtensions.cs index db503ef..11006c1 100644 --- a/src/RA/Extensions/NameValueCollectionExtensions.cs +++ b/src/RA/Extensions/NameValueCollectionExtensions.cs @@ -1,5 +1,4 @@ using System.Collections.Specialized; -using System.Linq; using System.Text; using System.Web; @@ -9,21 +8,35 @@ public static class NameValueCollectionExtensions { public static string ToQueryString(this NameValueCollection nvc) { - int count = nvc.Count; - if (count == 0) - return ""; - StringBuilder sb = new StringBuilder(); - string[] keys = nvc.AllKeys; - - var items = nvc.AllKeys.SelectMany(nvc.GetValues, (k, v) => new { key = k, value = v }); - foreach (var item in items) - sb.AppendFormat("{0}={1}&", item.key, HttpUtility.UrlEncode(item.value, Encoding.UTF8)); + if (nvc == null || nvc.Count == 0) + { + return string.Empty; + } - if (sb.Length > 0) - sb.Length--; - return sb.ToString(); - } + var sb = new StringBuilder(); + string[] keys = nvc.AllKeys; + for (int i = 0; i < nvc.Count; i++) + { + string[] values = nvc.GetValues(keys[i]); + if (values != null) + { + foreach (string value in values) + { + if (string.IsNullOrEmpty(keys[i])) + { + sb.AppendFormat("{0}&", HttpUtility.UrlEncode(value)); + } + else + { + sb.AppendFormat("{0}={1}&", keys[i], HttpUtility.UrlEncode(value)); + } + } + } + } + // trim trailing `&` + return sb.ToString(0, sb.Length - 1); + } } }