Skip to content

Commit

Permalink
Some missing stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
Huib Piguillet committed Oct 21, 2020
1 parent 69b114c commit a5e8517
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 79 deletions.
1 change: 0 additions & 1 deletion Bynder/Sdk/Api/RequestSender/ApiRequestSender.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
using System.Threading.Tasks;
using Bynder.Sdk.Model;
using Bynder.Sdk.Api.Requests;
using Bynder.Sdk.Service;
using Newtonsoft.Json;
using Bynder.Sdk.Query.Decoder;
using Bynder.Sdk.Query;
Expand Down
5 changes: 4 additions & 1 deletion Bynder/Sdk/Api/RequestSender/HttpRequestSender.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ internal class HttpRequestSender : IHttpRequestSender
{
private readonly HttpClient _httpClient = new HttpClient();

/// <summary>
/// User-Agent header we add to each request.
/// </summary>
public string UserAgent
{
get { return "bynder-c-sharp-sdk/" + Assembly.GetExecutingAssembly().GetName().Version.ToString(); }
Expand All @@ -28,7 +31,7 @@ public string UserAgent
public async Task<HttpResponseMessage> SendHttpRequest(HttpRequestMessage httpRequest)
{
httpRequest.Headers.Add("User-Agent", UserAgent);
HttpResponseMessage response = await _httpClient.SendAsync(httpRequest).ConfigureAwait(false);
var response = await _httpClient.SendAsync(httpRequest).ConfigureAwait(false);
response.EnsureSuccessStatusCode();
return response;
}
Expand Down
75 changes: 0 additions & 75 deletions Bynder/Test/Api/RequestSender/ApiRequestSenderTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ public async Task WhenCredentialInvalidTwoRequestsSent()
[Fact]
public async Task WhenRequestIsGetThenParametersAreAddedToUrl()
{
//await SendRequest(true, HttpMethod.Get)
using (var apiRequestSender = CreateApiRequestSender(true))
{
var apiRequest = new ApiRequest<bool>
Expand All @@ -129,80 +128,6 @@ public async Task WhenRequestIsGetThenParametersAreAddedToUrl()
}
}

//private asynv Task SendRequest(
// bool hasValidCredentials,
// HttpMethod httpMethod
//)
//{
// var httpSenderMock = new Mock<IHttpRequestSender>();
// var query = new StubQuery
// {
// Item1 = "Value"
// };
// var accessToken = "access_token";

// using (ApiRequestSender apiRequestSender = new ApiRequestSender(
// new Configuration
// {
// BaseUrl = new Uri("https://example.bynder.com"),
// },
// GetCredentials(hasValidCredentials, accessToken),
// httpSenderMock.Object
// ))
// {
// var apiRequest = new ApiRequest<bool>
// {
// Path = "/fake/api",
// HTTPMethod = httpMethod,
// Query = query
// };

// await apiRequestSender.SendRequestAsync(apiRequest);

// //httpSenderMock.Verify(sender => sender.SendHttpRequest(
// // It.Is<HttpRequestMessage>(
// // req => req.RequestUri.PathAndQuery.Contains("/fake/api")
// // && req.Method == httpMethod
// // && req.Headers.Authorization.ToString() == $"Bearer {accessToken}"
// // && req.Content.ReadAsStringAsync().Result.Contains("Item1=Value")
// // )));
// //httpSenderMock.Verify(sender => sender.SendHttpRequest(
// // It.Is<HttpRequestMessage>(
// // req => req.RequestUri.PathAndQuery.Contains("/fake/api")
// // && req.Method == HttpMethod.Get
// // && req.Headers.Authorization.ToString() == $"Bearer {accessToken}"
// // && req.RequestUri.Query.Contains("Item1=Value")
// // )));
// //httpSenderMock.Verify(sender => sender.SendHttpRequest(
// // It.Is<HttpRequestMessage>(
// // req => req.RequestUri.PathAndQuery.Contains("/fake/api")
// // && req.Method == HttpMethod.Get
// // && req.Headers.Authorization.ToString() == $"Bearer {accessToken}"
// // && req.RequestUri.Query.Contains("Item1=Value")
// // )));



// ////httpSenderMock.Verify(sender => sender.SendHttpRequest(
// //// It.IsAny<HttpRequestMessage>()
// ////), Times.Once);
// //httpSenderMock.Verify(sender => sender.SendHttpRequest(
// // It.Is<HttpRequestMessage>(
// // req => req.RequestUri.PathAndQuery.Contains("/oauth2/token")
// // && req.Method == HttpMethod.Post
// // )
// //), Times.Once);

// //httpSenderMock.Verify(sender => sender.SendHttpRequest(
// // It.IsAny<HttpRequestMessage>()
// //), Times.Exactly(2));

// //httpSenderMock.Verify(sender => sender.SendHttpRequest(
// // It.IsAny<HttpRequestMessage>()
// //), Times.Once);
// }
//}

private IApiRequestSender CreateApiRequestSender(bool hasValidCredentials)
{
return new ApiRequestSender(
Expand Down
5 changes: 3 additions & 2 deletions Bynder/Test/Api/RequestSender/HttpRequestSenderTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ public async Task WhenSuccessReceivedResponseIsReturned()
using (var httpListener = new TestHttpListener(HttpStatusCode.OK))
using (var httpRequestSender = new HttpRequestSender())
{
HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Get, httpListener.ListeningUrl);
var requestMessage = new HttpRequestMessage(HttpMethod.Get, httpListener.ListeningUrl);
var response = await httpRequestSender.SendHttpRequest(requestMessage);

Assert.Equal(
httpRequestSender.UserAgent,
response.RequestMessage.Headers.GetValues("User-Agent").First()
Expand All @@ -34,7 +35,7 @@ public async Task WhenErrorReceivedAnExceptionIsThown()
using (var httpListener = new TestHttpListener(HttpStatusCode.Forbidden))
using (var httpRequestSender = new HttpRequestSender())
{
HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Get, httpListener.ListeningUrl);
var requestMessage = new HttpRequestMessage(HttpMethod.Get, httpListener.ListeningUrl);
var doRequest = httpRequestSender.SendHttpRequest(requestMessage);

await Assert.ThrowsAsync<HttpRequestException>(() => doRequest);
Expand Down

0 comments on commit a5e8517

Please sign in to comment.