nullable

Author: xljiulang

WebApiClientCore.Test/Abstractions/KeyValueTest.cs

@@ -9,7 +9,7 @@ public class KeyValueTest
         public void CtorTest()
         {
             Assert.Throws<ArgumentNullException>(() => new KeyValue("", ""));
-            Assert.Throws<ArgumentNullException>(() => new KeyValue(null, ""));
+            Assert.Throws<ArgumentNullException>(() => new KeyValue(null!, ""));
 
             var kv = new KeyValue("key", "value");
             Assert.Equal("key", kv.Key);

WebApiClientCore.Test/Attributes/ActionAttributes/BasicAuthAttributeTest.cs

@@ -13,15 +13,15 @@ public class BasicAuthAttributeTest
         [Fact]
         public async Task OnRequestAsyncTest()
         {
-            var apiAction = new DefaultApiActionDescriptor(typeof(ITestApi).GetMethod("PostAsync"));
+            var apiAction = new DefaultApiActionDescriptor(typeof(ITestApi).GetMethod("PostAsync")!);
             var context = new TestRequestContext(apiAction, string.Empty);
 
             var attr = new BasicAuthAttribute("laojiu", "123456");
             await attr.OnRequestAsync(context);
 
             var auth = Convert.ToBase64String(Encoding.ASCII.GetBytes("laojiu:123456"));
-            Assert.True(context.HttpContext.RequestMessage.Headers.Authorization.Scheme == "Basic");
-            Assert.True(context.HttpContext.RequestMessage.Headers.Authorization.Parameter == auth);
+            Assert.Equal("Basic", context.HttpContext.RequestMessage.Headers.Authorization?.Scheme);
+            Assert.True(context.HttpContext.RequestMessage.Headers.Authorization?.Parameter == auth);
         }
     }
 }

WebApiClientCore.Test/Attributes/ActionAttributes/HttpDeleteAttributeTest.cs

@@ -12,7 +12,7 @@ public class HttpDeleteAttributeTest
         [Fact]
         public async Task OnRequestAsyncTest()
         {
-            var apiAction = new DefaultApiActionDescriptor(typeof(ITestApi).GetMethod("PostAsync"));
+            var apiAction = new DefaultApiActionDescriptor(typeof(ITestApi).GetMethod("PostAsync")!);
             var context = new TestRequestContext(apiAction, string.Empty);
 
             context.HttpContext.RequestMessage.RequestUri = new Uri("http://www.webapi.com/");

WebApiClientCore.Test/Attributes/ActionAttributes/HttpGetAttributeTest.cs

@@ -12,7 +12,7 @@ public class HttpGetAttributeTest
         [Fact]
         public async Task OnRequestAsyncTest()
         {
-            var apiAction = new DefaultApiActionDescriptor(typeof(ITestApi).GetMethod("PostAsync"));
+            var apiAction = new DefaultApiActionDescriptor(typeof(ITestApi).GetMethod("PostAsync")!);
             var context = new TestRequestContext(apiAction, string.Empty);
 
             context.HttpContext.RequestMessage.RequestUri = new Uri("http://www.webapi.com/");

WebApiClientCore.Test/Attributes/ActionAttributes/HttpHeadsAttributeTest.cs

@@ -12,7 +12,7 @@ public class HttpHeadsAttributeTest
         [Fact]
         public async Task OnRequestAsyncTest()
         {
-            var apiAction = new DefaultApiActionDescriptor(typeof(ITestApi).GetMethod("PostAsync"));
+            var apiAction = new DefaultApiActionDescriptor(typeof(ITestApi).GetMethod("PostAsync")!);
             var context = new TestRequestContext(apiAction, string.Empty);
 
             context.HttpContext.RequestMessage.RequestUri = new Uri("http://www.webapi.com/");

WebApiClientCore.Test/Attributes/ActionAttributes/HttpHostAttributeTest.cs

@@ -11,10 +11,10 @@ public class HttpHostAttributeTest
         [Fact]
         public async Task OnRequestAsyncTest()
         {
-            var apiAction = new DefaultApiActionDescriptor(typeof(ITestApi).GetMethod("PostAsync"));
+            var apiAction = new DefaultApiActionDescriptor(typeof(ITestApi).GetMethod("PostAsync")!);
             var context = new TestRequestContext(apiAction, string.Empty);
 
-            Assert.Throws<ArgumentNullException>(() => new HttpHostAttribute(null));
+            Assert.Throws<ArgumentNullException>(() => new HttpHostAttribute(null!));
             Assert.Throws<UriFormatException>(() => new HttpHostAttribute("/"));
 
             context.HttpContext.RequestMessage.RequestUri = null;

WebApiClientCore.Test/Attributes/ActionAttributes/HttpOptionsAttributeTest.cs

@@ -12,7 +12,7 @@ public class HttpOptionsAttributeTest
         [Fact]
         public async Task OnRequestAsync()
         {
-            var apiAction = new DefaultApiActionDescriptor(typeof(ITestApi).GetMethod("PostAsync"));
+            var apiAction = new DefaultApiActionDescriptor(typeof(ITestApi).GetMethod("PostAsync")!);
             var context = new TestRequestContext(apiAction, string.Empty);
 
             context.HttpContext.RequestMessage.RequestUri = new Uri("http://www.webapi.com/");

WebApiClientCore.Test/Attributes/ActionAttributes/HttpPostAttributeTest.cs

@@ -12,7 +12,7 @@ public class HttpPostAttributeTest
         [Fact]
         public async Task OnRequestAsyncTest()
         {
-            var apiAction = new DefaultApiActionDescriptor(typeof(ITestApi).GetMethod("PostAsync"));
+            var apiAction = new DefaultApiActionDescriptor(typeof(ITestApi).GetMethod("PostAsync")!);
             var context = new TestRequestContext(apiAction, string.Empty);
 
             context.HttpContext.RequestMessage.RequestUri = new Uri("http://www.webapi.com/");

WebApiClientCore.Test/Attributes/ActionAttributes/HttpPutAttributeTest.cs

@@ -12,7 +12,7 @@ public class HttpPutAttributeTest
         [Fact]
         public async Task OnRequestAsyncTest()
         {
-            var apiAction = new DefaultApiActionDescriptor(typeof(ITestApi).GetMethod("PostAsync"));
+            var apiAction = new DefaultApiActionDescriptor(typeof(ITestApi).GetMethod("PostAsync")!);
             var context = new TestRequestContext(apiAction, string.Empty);
 
             context.HttpContext.RequestMessage.RequestUri = new Uri("http://www.webapi.com/");

WebApiClientCore.Test/Attributes/FormDataTextAttributeTest.cs

@@ -21,27 +21,27 @@ private string get(string name, string value)
         [Fact]
         public async Task OnRequestAsync_Parameter()
         {
-            var apiAction = new DefaultApiActionDescriptor(typeof(ITestApi).GetMethod("PostAsync"));
+            var apiAction = new DefaultApiActionDescriptor(typeof(ITestApi).GetMethod("PostAsync")!);
             var context = new TestRequestContext(apiAction, "laojiu");
             context.HttpContext.RequestMessage.Method = HttpMethod.Post;
             var parameterContext = new ApiParameterContext(context, 0);
 
             var attr = new FormDataTextAttribute();
             await attr.OnRequestAsync(parameterContext );
-            var body = await context.HttpContext.RequestMessage.Content.ReadAsStringAsync();
+            var body = await context.HttpContext.RequestMessage.Content!.ReadAsStringAsync();
             Assert.Contains(get("value", "laojiu"), body);
         }
 
         [Fact]
         public async Task OnRequestAsync()
         {
-            var apiAction = new DefaultApiActionDescriptor(typeof(ITestApi).GetMethod("PostAsync"));
+            var apiAction = new DefaultApiActionDescriptor(typeof(ITestApi).GetMethod("PostAsync")!);
             var context = new TestRequestContext(apiAction, string.Empty);
             context.HttpContext.RequestMessage.Method = HttpMethod.Post;
 
             var attr = new FormDataTextAttribute("value", "laojiu");
             await attr.OnRequestAsync(context);
-            var body = await context.HttpContext.RequestMessage.Content.ReadAsStringAsync();
+            var body = await context.HttpContext.RequestMessage.Content!.ReadAsStringAsync();
             Assert.Contains(get("value", "laojiu"), body);
         }
     }