-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* CallResponse refactored to async/await * Fix for too early dispose. * Fixed tests. * Testfix. * Fixed few warnings. * Readme fixes.
- Loading branch information
Showing
14 changed files
with
222 additions
and
189 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,12 @@ | ||
| using System; | ||
|
|
||
| namespace Protacon.NetCore.WebApi.TestUtil | ||
| namespace Protacon.NetCore.WebApi.TestUtil | ||
| { | ||
| public class CallData<T> | ||
| { | ||
| private readonly T _data; | ||
| internal readonly T Data; | ||
|
|
||
| public CallData(T data) | ||
| { | ||
| _data = data; | ||
| } | ||
|
|
||
| public CallData<T> Passing(Action<T> asserts) | ||
| { | ||
| asserts.Invoke(_data); | ||
| return this; | ||
| } | ||
|
|
||
| public TSelect Select<TSelect>(Func<T, TSelect> selector) | ||
| { | ||
| return selector.Invoke(_data); | ||
| } | ||
|
|
||
| public T Select() | ||
| { | ||
| return _data; | ||
| Data = data; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| using System; | ||
| using System.Threading.Tasks; | ||
|
|
||
| namespace Protacon.NetCore.WebApi.TestUtil | ||
| { | ||
| public static class CallDataExtensions | ||
| { | ||
| public static async Task<CallData<T>> Passing<T>(this Task<CallData<T>> dataWrapperTask, Action<T> asserts) | ||
| { | ||
| var wrappedData = await dataWrapperTask; | ||
| asserts(wrappedData.Data); | ||
| return wrappedData; | ||
| } | ||
|
|
||
| public static async Task<TSelect> Select<T, TSelect>(this Task<CallData<T>> dataWrapperTask, Func<T, TSelect> selector) | ||
| { | ||
| var wrappedData = await dataWrapperTask; | ||
| return selector.Invoke(wrappedData.Data); | ||
| } | ||
|
|
||
| public static async Task<T> Select<T>(this Task<CallData<T>> dataWrapperTask) | ||
| { | ||
| var data = await dataWrapperTask; | ||
| return data.Data; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| using Newtonsoft.Json; | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Net; | ||
| using System.Net.Http; | ||
| using System.Text; | ||
| using System.Threading.Tasks; | ||
|
|
||
| namespace Protacon.NetCore.WebApi.TestUtil | ||
| { | ||
| public static class CallExtensions | ||
| { | ||
| public static async Task<Call> ExpectStatusCode(this Task<Call> callTask, HttpStatusCode code) | ||
| { | ||
| var call = await callTask.ConfigureAwait(false); | ||
| var httpCall = await call.HttpTask.ConfigureAwait(false); | ||
|
|
||
| if (httpCall.StatusCode != code) | ||
| { | ||
| throw new ExpectedStatusCodeException($"Expected statuscode '{code}' but got '{(int)httpCall.StatusCode}'"); | ||
| } | ||
|
|
||
| call.ExpectedStatusCode = code; | ||
|
|
||
| return call; | ||
| } | ||
|
|
||
| public static async Task<Call> HeaderPassing(this Task<Call> callTask, string header, Action<string> assertsForValue) | ||
| { | ||
| var call = await callTask.ConfigureAwait(false); | ||
| var response = await call.HttpTask.ConfigureAwait(false); | ||
|
|
||
| var match = response.Headers | ||
| .SingleOrDefault(x => x.Key == header); | ||
|
|
||
| if (match.Equals(default(KeyValuePair<string, IEnumerable<string>>))) | ||
| throw new InvalidOperationException($"Header '{header}' not found, available headers are '{HeadersAsReadableList(response)}'"); | ||
|
|
||
| assertsForValue.Invoke(match.Value.Single()); | ||
|
|
||
| return call; | ||
| } | ||
|
|
||
| private static string HeadersAsReadableList(HttpResponseMessage message) | ||
| { | ||
| return message.Headers.Select(x => x.Key.ToString()).Aggregate("", (a, b) => $"{a}, {b}"); | ||
| } | ||
|
|
||
| public static async Task<CallData<T>> WithContentOf<T>(this Task<Call> callTask) | ||
| { | ||
| var call = await callTask.ConfigureAwait(false); | ||
| var result = await call.HttpTask.ConfigureAwait(false); | ||
| var code = (int)result.StatusCode; | ||
|
|
||
| var content = await result.Content.ReadAsByteArrayAsync().ConfigureAwait(false); | ||
|
|
||
| if ((code > 299 || code < 199) && code != (int?)call.ExpectedStatusCode) | ||
| throw new ExpectedStatusCodeException( | ||
| $"Tried to get data from non ok statuscode response, expected status is '2xx' or '{call.ExpectedStatusCode}' but got '{code}' with content '{Encoding.Default.GetString(content)}'"); | ||
|
|
||
| if (!result.Content.Headers.Contains("Content-Type")) | ||
| throw new InvalidOperationException("Response didn't contain any 'Content-Type'. Reason may be that you didn't return anything?"); | ||
|
|
||
| var contentType = result.Content.Headers.Single(x => x.Key == "Content-Type").Value.FirstOrDefault() ?? ""; | ||
|
|
||
|
|
||
| switch (contentType) | ||
| { | ||
| case var ctype when ctype.StartsWith("application/json"): | ||
| return ParseJson<T>(content); | ||
| case "application/pdf": | ||
| if (typeof(T) != typeof(byte[])) | ||
| throw new InvalidOperationException("Only output type of 'byte[]' is supported for 'application/pdf'."); | ||
|
|
||
| return new CallData<T>((T)(object)content.ToArray()); | ||
| default: | ||
| if (typeof(T) != typeof(string)) | ||
| throw new InvalidOperationException($"Only output type of 'string' is supported for '{contentType}'."); | ||
|
|
||
| return new CallData<T>((T)(object)Encoding.Default.GetString(content)); | ||
| } | ||
| } | ||
|
|
||
| private static CallData<T> ParseJson<T>(byte[] content) | ||
| { | ||
| var asString = Encoding.Default.GetString(content); | ||
|
|
||
| try | ||
| { | ||
| var asObject = JsonConvert.DeserializeObject<T>(asString); | ||
| return new CallData<T>(asObject); | ||
| } | ||
| catch (JsonSerializationException) | ||
| { | ||
| throw new InvalidOperationException($"Cannot serialize '{asString}' as type '{typeof(T)}'"); | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.