tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-06-19 11:38:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed unused usings, removed empty spaces, removed tons os warnings (#903)

Browse Source
This commit is contained in:
Thiago Loureiro
2019-05-28 11:00:54 +08:00
committed by GitHub
parent 4476f8273e
commit 5d82e68534
486 changed files with 3049 additions and 3143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
test/Ocelot.UnitTests/Requester/DelegatingHandlerHandlerProviderFactoryTests.cs
View File

@ -1,21 +1,20 @@
namespace Ocelot.UnitTests.Requester
{
using System;
using System.Collections.Generic;
using System.Net.Http;
using Microsoft.Extensions.DependencyInjection;
using Moq;
using Ocelot.Configuration;
using Ocelot.Configuration.Builder;
using Ocelot.Errors;
using Ocelot.Logging;
using Ocelot.Requester;
using Ocelot.Requester.QoS;
using Ocelot.Responses;
using Responder;
using Shouldly;
using System;
using System.Collections.Generic;
using System.Net.Http;
using TestStack.BDDfy;
using Xunit;
using Responder;
public class DelegatingHandlerHandlerProviderFactoryTests
{
@ -32,7 +31,7 @@ namespace Ocelot.UnitTests.Requester
public DelegatingHandlerHandlerProviderFactoryTests()
{
_qosDelegate = (a, b) => new FakeQoSHandler();
_qosDelegate = (a, b) => new FakeQoSHandler();
_tracingFactory = new Mock<ITracingHandlerFactory>();
_qosFactory = new Mock<IQoSFactory>();
_loggerFactory = new Mock<IOcelotLoggerFactory>();
@ -259,7 +258,7 @@ namespace Ocelot.UnitTests.Requester
.Then(x => ThenThereIsDelegatesInProvider(3))
.And(x => ThenTheDelegatesAreAddedCorrectly())
.And(x => ThenItIsQosHandler(2))
.BDDfy();
.BDDfy();
}
[Fact]
@ -401,17 +400,19 @@ namespace Ocelot.UnitTests.Requester
.Returns(new FakeTracingHandler());
}
private void GivenTheServiceProviderReturnsGlobalDelegatingHandlers<TOne, TTwo>()
private void GivenTheServiceProviderReturnsGlobalDelegatingHandlers<TOne, TTwo>()
where TOne : DelegatingHandler
where TTwo : DelegatingHandler
{
_services.AddTransient<TOne>();
_services.AddTransient<GlobalDelegatingHandler>(s => {
_services.AddTransient<GlobalDelegatingHandler>(s =>
{
var service = s.GetService<TOne>();
return new GlobalDelegatingHandler(service);
});
_services.AddTransient<TTwo>();
_services.AddTransient<GlobalDelegatingHandler>(s => {
_services.AddTransient<GlobalDelegatingHandler>(s =>
{
var service = s.GetService<TTwo>();
return new GlobalDelegatingHandler(service);
});
@ -440,11 +441,11 @@ namespace Ocelot.UnitTests.Requester
var delegates = _result.Data;
var del = delegates[0].Invoke();
var handler = (FakeDelegatingHandler) del;
var handler = (FakeDelegatingHandler)del;
handler.Order.ShouldBe(1);
del = delegates[1].Invoke();
var handlerTwo = (FakeDelegatingHandlerTwo) del;
var handlerTwo = (FakeDelegatingHandlerTwo)del;
handlerTwo.Order.ShouldBe(2);
}

8
test/Ocelot.UnitTests/Requester/FakeDelegatingHandler.cs
View File

@ -17,9 +17,9 @@ namespace Ocelot.UnitTests.Requester
Order = order;
}
public int Order {get;private set;}
public int Order { get; private set; }
public DateTime TimeCalled {get;private set;}
public DateTime TimeCalled { get; private set; }
protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
{
@ -71,9 +71,9 @@ namespace Ocelot.UnitTests.Requester
Order = 2;
}
public int Order {get;private set;}
public int Order { get; private set; }
public DateTime TimeCalled {get;private set;}
public DateTime TimeCalled { get; private set; }
protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
{

22
test/Ocelot.UnitTests/Requester/HttpClientBuilderTests.cs
View File

@ -1,9 +1,3 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
@ -16,6 +10,12 @@ using Ocelot.Request.Middleware;
using Ocelot.Requester;
using Ocelot.Responses;
using Shouldly;
using System;
using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using TestStack.BDDfy;
using Xunit;
@ -194,7 +194,7 @@ namespace Ocelot.UnitTests.Requester
var fakeTwo = new FakeDelegatingHandler();
var handlers = new List<Func<DelegatingHandler>>()
{
{
() => fakeOne,
() => fakeTwo
};
@ -396,7 +396,7 @@ namespace Ocelot.UnitTests.Requester
private void GivenTheFactoryReturns()
{
var handlers = new List<Func<DelegatingHandler>>(){ () => new FakeDelegatingHandler()};
var handlers = new List<Func<DelegatingHandler>>() { () => new FakeDelegatingHandler() };
_factory
.Setup(x => x.Get(It.IsAny<DownstreamReRoute>()))
@ -414,9 +414,9 @@ namespace Ocelot.UnitTests.Requester
private void GivenTheFactoryReturns(List<Func<DelegatingHandler>> handlers)
{
_factory
.Setup(x => x.Get(It.IsAny<DownstreamReRoute>()))
.Returns(new OkResponse<List<Func<DelegatingHandler>>>(handlers));
_factory
.Setup(x => x.Get(It.IsAny<DownstreamReRoute>()))
.Returns(new OkResponse<List<Func<DelegatingHandler>>>(handlers));
}
private void WhenIBuild()

36
test/Ocelot.UnitTests/Requester/HttpClientHttpRequesterTest.cs
View File

@ -1,20 +1,20 @@
using Moq;
using Microsoft.AspNetCore.Http;
using Moq;
using Ocelot.Configuration;
using Ocelot.Configuration.Builder;
using Ocelot.Logging;
using Ocelot.Middleware;
using Ocelot.Request.Middleware;
using Ocelot.Requester;
using Ocelot.Responses;
using Shouldly;
using System;
using System.Collections.Generic;
using System.Net.Http;
using Microsoft.AspNetCore.Http;
using Ocelot.Configuration;
using Ocelot.Configuration.Builder;
using Ocelot.Middleware;
using System.Threading;
using System.Threading.Tasks;
using TestStack.BDDfy;
using Xunit;
using Shouldly;
using Ocelot.Request.Middleware;
using System.Threading.Tasks;
using System.Threading;
namespace Ocelot.UnitTests.Requester
{
@ -41,10 +41,10 @@ namespace Ocelot.UnitTests.Requester
_cacheHandlers = new Mock<IHttpClientCache>();
_mapper = new Mock<IExceptionToErrorMapper>();
_httpClientRequester = new HttpClientHttpRequester(
_loggerFactory.Object,
_cacheHandlers.Object,
_loggerFactory.Object,
_cacheHandlers.Object,
_factory.Object,
_mapper.Object);
_mapper.Object);
}
[Fact]
@ -69,9 +69,9 @@ namespace Ocelot.UnitTests.Requester
DownstreamRequest = new DownstreamRequest(new HttpRequestMessage() { RequestUri = new Uri("http://www.bbc.co.uk") }),
};
this.Given(x=>x.GivenTheRequestIs(context))
this.Given(x => x.GivenTheRequestIs(context))
.And(x => GivenTheHouseReturnsOkHandler())
.When(x=>x.WhenIGetResponse())
.When(x => x.WhenIGetResponse())
.Then(x => x.ThenTheResponseIsCalledCorrectly())
.BDDfy();
}
@ -136,7 +136,7 @@ namespace Ocelot.UnitTests.Requester
private void GivenTheRequestIs(DownstreamContext request)
{
_request = request;
_request = request;
}
private void WhenIGetResponse()
@ -182,7 +182,7 @@ namespace Ocelot.UnitTests.Requester
_mapper.Setup(x => x.Map(It.IsAny<Exception>())).Returns(new UnableToCompleteRequestError(new Exception()));
}
class OkDelegatingHandler : DelegatingHandler
private class OkDelegatingHandler : DelegatingHandler
{
protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
{
@ -190,7 +190,7 @@ namespace Ocelot.UnitTests.Requester
}
}
class TimeoutDelegatingHandler : DelegatingHandler
private class TimeoutDelegatingHandler : DelegatingHandler
{
protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
{
@ -198,5 +198,5 @@ namespace Ocelot.UnitTests.Requester
return new HttpResponseMessage();
}
}
}
}
}

6
test/Ocelot.UnitTests/Requester/HttpExeptionToErrorMapperTests.cs
View File

@ -1,13 +1,13 @@
namespace Ocelot.UnitTests.Requester
{
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Ocelot.Errors;
using Ocelot.Requester;
using Responder;
using Shouldly;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Xunit;
public class HttpExeptionToErrorMapperTests

14
test/Ocelot.UnitTests/Requester/HttpRequesterMiddlewareTests.cs
View File

@ -1,21 +1,21 @@
namespace Ocelot.UnitTests.Requester
{
using Microsoft.AspNetCore.Http;
using System.Net.Http;
using Moq;
using Ocelot.Configuration.Builder;
using Ocelot.Logging;
using Ocelot.Middleware;
using Ocelot.Requester;
using Ocelot.Requester.Middleware;
using Ocelot.Responses;
using TestStack.BDDfy;
using Xunit;
using Ocelot.UnitTests.Responder;
using Shouldly;
using System.Threading.Tasks;
using Ocelot.Configuration.Builder;
using Ocelot.Middleware;
using System;
using System.Linq;
using Ocelot.UnitTests.Responder;
using System.Net.Http;
using System.Threading.Tasks;
using TestStack.BDDfy;
using Xunit;
public class HttpRequesterMiddlewareTests
{

4
test/Ocelot.UnitTests/Requester/QoSFactoryTests.cs
View File

@ -1,6 +1,5 @@
namespace Ocelot.UnitTests.Requester
{
using System.Net.Http;
using Microsoft.Extensions.DependencyInjection;
using Moq;
using Ocelot.Configuration;
@ -9,6 +8,7 @@
using Ocelot.Requester;
using Ocelot.Requester.QoS;
using Shouldly;
using System.Net.Http;
using Xunit;
public class QoSFactoryTests
@ -48,7 +48,7 @@
handler.Data.ShouldBeOfType<FakeDelegatingHandler>();
}
class FakeDelegatingHandler : DelegatingHandler
private class FakeDelegatingHandler : DelegatingHandler
{
}
}

4
test/Ocelot.UnitTests/Requester/TracingHandlerFactoryTests.cs
View File

@ -1,13 +1,13 @@
namespace Ocelot.UnitTests.Requester
{
using System;
using Microsoft.Extensions.DependencyInjection;
using Moq;
using Ocelot.Infrastructure.RequestData;
using Ocelot.Logging;
using Ocelot.Requester;
using Shouldly;
using System;
using Xunit;
using Ocelot.Logging;
public class TracingHandlerFactoryTests
{