remove sync methods

dragonfruitnetwork · Jan 19, 2023 · 9f336fe · 9f336fe
1 parent 44ceab7
commit 9f336fe
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 96 deletions.
diff --git a/src/ApiClient_Sync.cs b/src/ApiClient_Sync.cs
diff --git a/tests/Header/HeaderLevelTests.cs b/tests/Header/HeaderLevelTests.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License. Please refer to the LICENSE file at the root of this project for details
 
 using System;
+using System.Threading.Tasks;
 using DragonFruit.Data.Extensions;
 using DragonFruit.Data.Tests.Requests;
 using Newtonsoft.Json.Linq;
@@ -19,7 +20,7 @@ public class HeaderLevelTests : ApiTest
         /// Test whether request-headers and default headers are sent together successfully
         /// </summary>
         [TestCase]
-        public void LevelSpecificHeaderTest()
+        public async Task LevelSpecificHeaderTest()
         {
             var request = new EchoRequest();
 
@@ -29,7 +30,7 @@ public void LevelSpecificHeaderTest()
             Client.Headers[GlobalHeaderName] = globalHeaderValue;
             request.WithHeader(HeaderName, requestHeaderValue);
 
-            var response = Client.Perform<JObject>(request);
+            var response = await Client.PerformAsync<JObject>(request);
             Assert.AreEqual(requestHeaderValue, (string)response["headers"]![HeaderName]);
             Assert.AreEqual(globalHeaderValue, (string)response["headers"][GlobalHeaderName]);
         }
@@ -39,7 +40,7 @@ public void LevelSpecificHeaderTest()
         /// with the request header taking priority
         /// </summary>
         [TestCase]
-        public void LevelOverrideHeaderTest()
+        public async Task LevelOverrideHeaderTest()
         {
             var request = new EchoRequest();
 
@@ -49,7 +50,7 @@ public void LevelOverrideHeaderTest()
             Client.Headers[GlobalHeaderName] = globalHeaderValue;
             request.WithHeader(GlobalHeaderName, requestHeaderValue);
 
-            var response = Client.Perform<JObject>(request);
+            var response = await Client.PerformAsync<JObject>(request);
             Assert.AreEqual(requestHeaderValue, (string)response["headers"]![GlobalHeaderName]);
         }
     }

diff --git a/tests/Header/HeaderTests.cs b/tests/Header/HeaderTests.cs
@@ -2,13 +2,12 @@
 // Licensed under the MIT License. Please refer to the LICENSE file at the root of this project for details
 
 using System;
+using System.Threading.Tasks;
 using DragonFruit.Data.Extensions;
 using DragonFruit.Data.Tests.Requests;
 using Newtonsoft.Json.Linq;
 using NUnit.Framework;
 
-#pragma warning disable 1998
-
 namespace DragonFruit.Data.Tests.Header
 {
     [TestFixture]
@@ -21,31 +20,32 @@ public class HeaderTests : ApiTest
         /// Test whether client headers are sent and changed successfully
         /// </summary>
         [TestCase]
-        public void HeaderTest()
+        public async Task HeaderTest()
         {
             var headerValue = Rng.Next().ToString();
             var request = new EchoRequest();
 
             Client.Headers[HeaderName] = headerValue;
-            var response = Client.Perform<JObject>(request);
+            var response = await Client.PerformAsync<JObject>(request);
             Assert.AreEqual(headerValue, (string)response["headers"][HeaderName]);
 
             headerValue = Rng.Next().ToString();
             Client.Headers[HeaderName] = headerValue;
-            response = Client.Perform<JObject>(request);
+
+            response = await Client.PerformAsync<JObject>(request);
             Assert.AreEqual(headerValue, (string)response["headers"][HeaderName]);
         }
 
         /// <summary>
         /// Test whether a header sent in a request is recieved successfully
         /// </summary>
         [TestCase]
-        public void PerRequestHeaderTest()
+        public async Task PerRequestHeaderTest()
         {
             var headerValue = Rng.Next().ToString();
 
             var request = new EchoRequest().WithHeader(HeaderName, headerValue);
-            var response = Client.Perform<JObject>(request);
+            var response = await Client.PerformAsync<JObject>(request);
 
             Assert.AreEqual((string)response["headers"]![HeaderName], headerValue);
         }

diff --git a/tests/Requests/FileRequestTests.cs b/tests/Requests/FileRequestTests.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using System.Threading.Tasks;
 using DragonFruit.Data.Basic;
 using NUnit.Framework;
 
@@ -12,7 +13,7 @@ namespace DragonFruit.Data.Tests.Requests
     public class FileRequestTests : ApiTest
     {
         [TestCase("https://github.com/ppy/osu/archive/2020.1121.0.zip", 19018589)]
-        public void FileDownloadTest(string path, long expectedFileSize)
+        public async Task FileDownloadTest(string path, long expectedFileSize)
         {
             var request = new BasicApiFileRequest(path, Path.GetTempPath());
 
@@ -30,7 +31,7 @@ public void FileDownloadTest(string path, long expectedFileSize)
 
             try
             {
-                Client.Perform(request, (progress, total) => TestContext.Out.WriteLine($"Progress: {progress:n0}/{total:n0} ({Convert.ToSingle(progress) / Convert.ToSingle(total):F2}%)"));
+                await Client.PerformAsync(request, (progress, total) => TestContext.Out.WriteLine($"Progress: {progress:n0}/{total:n0} ({Convert.ToSingle(progress) / Convert.ToSingle(total):F2}%)"));
 
                 Assert.IsTrue(File.Exists(request.Destination));
                 Assert.GreaterOrEqual(new FileInfo(request.Destination).Length, expectedFileSize);

diff --git a/tests/Requests/RequestFilterTests.cs b/tests/Requests/RequestFilterTests.cs
@@ -13,7 +13,6 @@ public class RequestFilterTests : ApiTest
         [Test]
         public void TestFilteredRequests()
         {
-            Assert.Catch<AggregateException>(() => Client.Perform(new FilteredRequest()));
             Assert.CatchAsync<ArgumentException>(() => Client.PerformAsync(new InheritedRequest()));
         }
 

diff --git a/tests/Requests/RequestTests.cs b/tests/Requests/RequestTests.cs
@@ -43,10 +43,10 @@ public async Task TestBasicRequest()
         }
 
         [Test]
-        public void TestSyncHttp2Request()
+        public async Task TestHttp2Request()
         {
             var request = new HttpRequestMessage(HttpMethod.Get, "https://google.com") { Version = HttpVersion.Version20 };
-            using var result = Client.Perform(request);
+            using var result = await Client.PerformAsync(request);
 
             Assert.IsTrue(result.IsSuccessStatusCode);
             Assert.AreEqual(request.Version, result.Version);