Update tests, remove warnings

basdijkstra · Nov 20, 2024 · 0bf817e · 0bf817e
1 parent ac4ddbe
commit 0bf817e
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 17 deletions.
diff --git a/RestAssured.Net.Tests/JsonRequestBodySerializationTests.cs b/RestAssured.Net.Tests/JsonRequestBodySerializationTests.cs
@@ -15,10 +15,8 @@
 // </copyright>
 namespace RestAssured.Tests
 {
-    using System;
     using System.Collections.Generic;
     using NUnit.Framework;
-    using RestAssured.Request.Exceptions;
     using RestAssured.Tests.Models;
     using WireMock.Matchers;
     using WireMock.RequestBuilders;

diff --git a/RestAssured.Net.Tests/LoggingTests.cs b/RestAssured.Net.Tests/LoggingTests.cs
@@ -18,8 +18,6 @@ namespace RestAssured.Tests
     using NUnit.Framework;
     using RestAssured.Logging;
     using RestAssured.Request.Builders;
-    using RestAssured.Request.Logging;
-    using RestAssured.Response.Logging;
     using WireMock.RequestBuilders;
     using WireMock.ResponseBuilders;
     using static RestAssured.Dsl;

diff --git a/RestAssured.Net.Tests/NtlmAuthenticationTests.cs b/RestAssured.Net.Tests/NtlmAuthenticationTests.cs
@@ -16,7 +16,6 @@
 namespace RestAssured.Tests
 {
     using NUnit.Framework;
-    using WireMock.Matchers;
     using WireMock.RequestBuilders;
     using WireMock.ResponseBuilders;
     using static RestAssured.Dsl;

diff --git a/RestAssured.Net.Tests/QueryParameterTests.cs b/RestAssured.Net.Tests/QueryParameterTests.cs
@@ -42,8 +42,7 @@ public class QueryParameterTests : TestBase
         public void CreateRequestSpecifications()
         {
             this.requestSpecification = new RequestSpecBuilder()
-                .WithScheme("http")
-                .WithHostName("localhost")
+                .WithBaseUri("http://localhost")
                 .WithBasePath("api")
                 .WithPort(MOCK_SERVER_PORT)
                 .Build();
@@ -131,7 +130,7 @@ public void MultipleQueryParametersCanBeSpecifiedUsingADictionary()
         [Test]
         public void MultipleQueryParametersCanBeSpecifiedUsingAListOfKeyValuePairs()
         {
-            List<KeyValuePair<string, object>> queryParams = new List<KeyValuePair<string, object>>()
+            var queryParams = new List<KeyValuePair<string, object>>()
             {
                 new KeyValuePair<string, object>("name", this.name),
                 new KeyValuePair<string, object>("id", this.firstId),

diff --git a/RestAssured.Net.Tests/RequestBodyTests.cs b/RestAssured.Net.Tests/RequestBodyTests.cs
@@ -36,6 +36,7 @@ public class RequestBodyTests : TestBase
         /// A test demonstrating RestAssuredNet syntax for sending
         /// a plaintext request body when performing an HTTP POST.
         /// </summary>
+        /// <param name="bodySize">The size of the plaintext request body.</param>
         [TestCase("small", TestName = "Sending small plaintext request body")]
         [TestCase("medium", TestName = "Sending medium plaintext request body")]
         [TestCase("large", TestName = "Sending large plaintext request body")]

diff --git a/RestAssured.Net.Tests/RequestSpecificationTests.cs b/RestAssured.Net.Tests/RequestSpecificationTests.cs
@@ -17,6 +17,7 @@ namespace RestAssured.Tests
 {
     using System.Text;
     using NUnit.Framework;
+    using RestAssured.Logging;
     using RestAssured.Request.Builders;
     using RestAssured.Request.Exceptions;
     using RestAssured.Request.Logging;
@@ -40,12 +41,17 @@ public class RequestSpecificationTests : TestBase
         [TestCase("request-specification", TestName = "With base path in request specification, works without a leading /")]
         public void FullRequestSpecificationCanBeUsed(string endpoint)
         {
+            var logConfig = new LogConfiguration
+            {
+                RequestLogLevel = Logging.RequestLogLevel.All,
+            };
+
             var fullRequestSpecification = new RequestSpecBuilder()
                 .WithBaseUri("http://localhost:9876")
                 .WithBasePath("api")
                 .WithQueryParam("param_name", "param_value")
                 .WithQueryParam("another_param_name", "another_param_value")
-                .WithRequestLogLevel(RequestLogLevel.All)
+                .WithLogConfiguration(logConfig)
                 .Build();
 
             this.CreateStubForRequestSpecification();

diff --git a/RestAssured.Net.Tests/ResponseBodyHtmlVerificationTests.cs b/RestAssured.Net.Tests/ResponseBodyHtmlVerificationTests.cs
@@ -15,7 +15,6 @@
 // </copyright>
 namespace RestAssured.Tests
 {
-    using System.Net.Http;
     using NUnit.Framework;
     using RestAssured.Response;
     using RestAssured.Response.Exceptions;

diff --git a/RestAssured.Net.Tests/ResponseBodyLengthVerificationTests.cs b/RestAssured.Net.Tests/ResponseBodyLengthVerificationTests.cs
@@ -15,9 +15,9 @@
 // </copyright>
 namespace RestAssured.Tests
 {
-    using System;
     using System.Collections.Generic;
     using NUnit.Framework;
+    using RestAssured.Logging;
     using RestAssured.Response.Exceptions;
     using RestAssured.Tests.Models;
     using WireMock.RequestBuilders;
@@ -83,11 +83,16 @@ public void ResponseBodyLengthCanBeVerified()
         {
             this.CreateStubForJsonResponseBody();
 
+            var logConfig = new LogConfiguration
+            {
+                ResponseLogLevel = ResponseLogLevel.All,
+            };
+
             Given()
+                .Log(logConfig)
                 .When()
                 .Get($"{MOCK_SERVER_BASE_URL}/json-response-body")
                 .Then()
-                .Log(RestAssured.Response.Logging.ResponseLogLevel.All)
                 .StatusCode(200)
                 .ResponseBodyLength(NHamcrest.Is.GreaterThan(25));
         }

diff --git a/RestAssured.Net.Tests/ResponseBodyVerificationTests.cs b/RestAssured.Net.Tests/ResponseBodyVerificationTests.cs
@@ -36,6 +36,7 @@ public class ResponseBodyVerificationTests : TestBase
         /// A test demonstrating RestAssuredNet syntax for verifying
         /// a plaintext response body.
         /// </summary>
+        /// <param name="bodySize">The plain text body size to be used in the test.</param>
         [TestCase("small")]
         [TestCase("medium")]
         [TestCase("large")]

diff --git a/RestAssured.Net.Tests/ResponseBodyXmlVerificationTests.cs b/RestAssured.Net.Tests/ResponseBodyXmlVerificationTests.cs
@@ -39,6 +39,9 @@ public class ResponseBodyXmlVerificationTests : TestBase
         private int placeInhabitants;
         private bool isCapital;
 
+        /// <summary>
+        /// Initializes test data used in these tests.
+        /// </summary>
         [SetUp]
         public void SetLocation()
         {
@@ -62,6 +65,9 @@ public void SetLocation()
             this.location.Places.Add(new Place());
         }
 
+        /// <summary>
+        /// Clears the list of places.
+        /// </summary>
         [TearDown]
         public void ClearPlaces()
         {

diff --git a/RestAssured.Net.Tests/ResponseHeaderVerificationTests.cs b/RestAssured.Net.Tests/ResponseHeaderVerificationTests.cs
@@ -30,6 +30,9 @@ public class ResponseHeaderVerificationTests : TestBase
         private string headerName;
         private string headerValue;
 
+        /// <summary>
+        /// Initializes the header name and value to be used in the tests.
+        /// </summary>
         [SetUp]
         public void InitializeHeaderNameAndValue()
         {

diff --git a/RestAssured.Net.Tests/TestBase.cs b/RestAssured.Net.Tests/TestBase.cs
@@ -15,7 +15,6 @@
 // </copyright>
 namespace RestAssured.Tests
 {
-    using System;
     using System.Collections.Generic;
     using NUnit.Framework;
     using RestAssured.Tests.Models;
@@ -31,8 +30,14 @@ public class TestBase
         /// </summary>
         protected WireMockServer Server { get; private set; }
 
+        /// <summary>
+        /// The port used by the WireMock mock server.
+        /// </summary>
         protected static readonly int MOCK_SERVER_PORT = 9876;
 
+        /// <summary>
+        /// The base URL used by the WireMock mock server.
+        /// </summary>
         protected static readonly string MOCK_SERVER_BASE_URL = $"http://localhost:{MOCK_SERVER_PORT}";
 
         /// <summary>

diff --git a/RestAssured.Net.Tests/TimeoutTests.cs b/RestAssured.Net.Tests/TimeoutTests.cs
@@ -38,8 +38,7 @@ public class TimeoutTests : TestBase
         public void CreateRequestSpecifications()
         {
             this.requestSpecification = new RequestSpecBuilder()
-                .WithScheme("http")
-                .WithHostName("localhost")
+                .WithBaseUri("http://localhost")
                 .WithPort(9876)
                 .WithTimeout(TimeSpan.FromSeconds(2))
                 .Build();

diff --git a/RestAssured.Net.Tests/UserAgentTests.cs b/RestAssured.Net.Tests/UserAgentTests.cs
@@ -37,8 +37,7 @@ public class UserAgentTests : TestBase
         public void CreateRequestSpecifications()
         {
             this.requestSpecification = new RequestSpecBuilder()
-                .WithScheme("http")
-                .WithHostName("localhost")
+                .WithBaseUri("http://localhost")
                 .WithPort(9876)
                 .WithUserAgent(new ProductInfoHeaderValue("MyUserAgent", "1.0"))
                 .Build();