wip

test/TestSuite/Blueprint/aws-sig-v4-test-suite/get-header-key-duplicate/get-header-key-duplicate.creq

@@ -2,7 +2,7 @@ GET
 /
 
 host:example.amazonaws.com
-my-header1:value2, value2, value1
+my-header1:value2,value2,value1
 x-amz-date:20150830T123600Z
 
 host;my-header1;x-amz-date

test/TestSuite/Blueprint/aws-sig-v4-test-suite/get-header-value-multiline/get-header-value-multiline.creq

@@ -2,7 +2,7 @@ GET
 /
 
 host:example.amazonaws.com
-my-header1:value1, value2, value3
+my-header1:value1,value2,value3
 x-amz-date:20150830T123600Z
 
 host;my-header1;x-amz-date

test/TestSuite/Blueprint/aws-sig-v4-test-suite/get-header-value-order/get-header-value-order.creq

@@ -2,7 +2,7 @@ GET
 /
 
 host:example.amazonaws.com
-my-header1:value4, value1, value3, value2
+my-header1:value4,value1,value3,value2
 x-amz-date:20150830T123600Z
 
 host;my-header1;x-amz-date

test/TestSuite/Fixtures/TestSuiteFixture.cs

@@ -9,6 +9,8 @@ namespace AwsSignatureVersion4.TestSuite.Fixtures
 {
     public class TestSuiteFixture
     {
+        private string defaultHeaderValueSeparator;
+
         public RegionEndpoint Region => RegionEndpoint.USEast1;
 
         public string ServiceName => "service";
@@ -49,5 +51,25 @@ public HttpRequestMessage RedirectRequest(HttpRequestMessage request, string to)
 
             return request;
         }
+
+        /// <summary>
+        /// The header value separator chosen by Microsoft in .NET is ", " and not "," as defined
+        /// by the test suite. This means that we have to change the default behavior to match the
+        /// test suite.
+        /// </summary>
+        public void AdjustHeaderValueSeparator()
+        {
+            defaultHeaderValueSeparator = CanonicalRequest.HeaderValueSeparator;
+            CanonicalRequest.HeaderValueSeparator = ",";
+        }
+
+        /// <summary>
+        /// Lets reset the default header value separator before we continue with the rest of the
+        /// tests.
+        /// </summary>
+        public void ResetHeaderValueSeparator()
+        {
+            CanonicalRequest.HeaderValueSeparator = defaultHeaderValueSeparator;
+        }
     }
 }

test/Unit/Private/CanonicalRequestShould.cs

@@ -11,15 +11,19 @@
 namespace AwsSignatureVersion4.Unit.Private
 {
     [Collection("Canonical request - These tests are modifying global scope which prevents them from running in parallel with other canonical request tests")]
-    public class CanonicalRequestShould : IClassFixture<TestSuiteFixture>
+    public class CanonicalRequestShould : IClassFixture<TestSuiteFixture>, IDisposable
     {
         private readonly Func<string[], Scenario> loadScenario;
         private readonly DateTime utcNow;
+        private readonly Action resetHeaderValueSeparator;
 
         public CanonicalRequestShould(TestSuiteFixture fixture)
         {
             loadScenario = fixture.LoadScenario;
             utcNow = fixture.UtcNow;
+            resetHeaderValueSeparator = fixture.ResetHeaderValueSeparator;
+
+            fixture.AdjustHeaderValueSeparator();
         }
 
         [Theory]
@@ -223,5 +227,10 @@ public void SortQueryParameterValues(string query, string parameterName, string[
             // Assert
             actual[parameterName].ShouldBe(expected);
         }
+
+        public void Dispose()
+        {
+            resetHeaderValueSeparator();
+        }
     }
 }

test/Unit/Private/SignerShould.cs

@@ -13,6 +13,7 @@
 
 namespace AwsSignatureVersion4.Unit.Private
 {
+    [Collection("Canonical request - These tests are modifying global scope which prevents them from running in parallel with other canonical request tests")]
     public class SignerShould : IClassFixture<TestSuiteFixture>, IDisposable
     {
         private readonly HttpClient httpClient;
@@ -21,6 +22,7 @@ public class SignerShould : IClassFixture<TestSuiteFixture>, IDisposable
         private readonly string region;
         private readonly string serviceName;
         private readonly ImmutableCredentials immutableCredentials;
+        private readonly Action resetHeaderValueSeparator;
 
         public SignerShould(TestSuiteFixture fixture)
         {
@@ -30,6 +32,9 @@ public SignerShould(TestSuiteFixture fixture)
             region = fixture.Region.SystemName;
             serviceName = fixture.ServiceName;
             immutableCredentials = fixture.ImmutableCredentials;
+            resetHeaderValueSeparator = fixture.ResetHeaderValueSeparator;
+
+            fixture.AdjustHeaderValueSeparator();
         }
 
         #region Pass test suite
@@ -395,6 +400,8 @@ public void ThrowArgumentExceptionGivenAuthorizationHeaderAddedByName()
         public void Dispose()
         {
             httpClient.Dispose();
+
+            resetHeaderValueSeparator();
         }
     }
 }