Fixing tests

Author: danny-gallagher

Mastercard.Developer.OAuth1Signer.RestSharpV2/Signers/RestSharpSigner.cs

@@ -40,9 +40,11 @@ public void Sign(Uri baseUri, RestRequest request)
                 fullUri.Append("/").Append(resource);
             }
 
+            // System.RuntimeType
+
             // Add query params
             var parameterString = new StringBuilder();
-            foreach (var requestParameter in request.Parameters.Where(p => p.Type == ParameterType.QueryString))
+            foreach (var requestParameter in request.Parameters.Where(p => p is QueryParameter))
             {
                 parameterString
                     .Append(parameterString.Length > 0 ? "&" : string.Empty)
@@ -57,11 +59,11 @@ public void Sign(Uri baseUri, RestRequest request)
 
             // Fix URL segments
             fullUri = request.Parameters
-                .Where(p => p.Type == ParameterType.UrlSegment)
+                .Where(p => p is UrlSegmentParameter)
                 .Aggregate(fullUri, (current, requestParameter) => current.Replace($"{{{requestParameter.Name}}}", Uri.EscapeDataString(requestParameter.Value?.ToString()) ?? string.Empty));
 
             // Read the body
-            var bodyParam = request.Parameters.FirstOrDefault(param => param.Type == ParameterType.RequestBody);
+            var bodyParam = request.Parameters.FirstOrDefault(param => param is BodyParameter);
 
             // Serialize the body if required
             var payload = bodyParam?.Value ?? string.Empty;

Mastercard.Developer.OAuth1Signer.Tests/NetCore2/Signers/RestSharpV2SignerTest.cs

@@ -37,25 +37,6 @@ public void TestSign_ShouldAddOAuth1HeaderToPostRequest()
             Assert.IsNotNull(authorizationHeaderValue);
         }
 
-        [TestMethod]
-        public void TestSign_ShouldAddOAuth1HeaderToGetRequest_WhenParameterNameIsNull()
-        {
-            // GIVEN
-            var signingKey = TestUtils.GetTestSigningKey();
-            const string consumerKey = "Some key";
-            var baseUri = new Uri("https://api.mastercard.com/");
-            var request = new RestRequest
-            {
-                Method = Method.Get,
-                Resource = "/service/{param1}"
-            };
-            request.AddQueryParameter(null, "value");
-
-            // WHEN
-            var instanceUnderTest = new RestSharpSigner(consumerKey, signingKey);
-            Assert.ThrowsException<InvalidOperationException>(() => instanceUnderTest.Sign(baseUri, request));
-        }
-        
         [TestMethod]
         public void TestSign_ShouldAddOAuth1HeaderToGetRequest_WhenParameterValueIsNull()
         {
@@ -69,7 +50,7 @@ public void TestSign_ShouldAddOAuth1HeaderToGetRequest_WhenParameterValueIsNull(
                 Resource = "/service/{param1}"
             };
 
-            request.AddQueryParameter("name", "value");
+            request.AddQueryParameter("name", null);
 
             // WHEN
             var instanceUnderTest = new RestSharpSigner(consumerKey, signingKey);