/KestrelHttpServer

Permalink
Browse files

Move TestServer to shared directory.

  • Loading branch information...
1 parent 4dc2a38 commit 19f8958fa84b7caa15c8727f7379cb069298c910 @cesarbs cesarbs committed Aug 30, 2016
Unified Split
Showing with 32 additions and 18 deletions.
  1. +8 −0 KestrelHttpServer.sln
  2. +1 −0 src/Microsoft.AspNetCore.Server.Kestrel/Properties/AssemblyInfo.cs
  3. +1 −0 test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json
  4. +1 −0 test/Microsoft.AspNetCore.Server.KestrelTests/ChunkedRequestTests.cs
  5. +1 −1 test/Microsoft.AspNetCore.Server.KestrelTests/ChunkedResponseTests.cs
  6. +1 −0 test/Microsoft.AspNetCore.Server.KestrelTests/ConnectionFilterTests.cs
  7. +1 −0 test/Microsoft.AspNetCore.Server.KestrelTests/ConnectionTests.cs
  8. +1 −1 test/Microsoft.AspNetCore.Server.KestrelTests/DateHeaderValueManagerTests.cs
  9. +1 −2 test/Microsoft.AspNetCore.Server.KestrelTests/DefaultHeaderTests.cs
  10. +1 −0 test/Microsoft.AspNetCore.Server.KestrelTests/FrameTests.cs
  11. +1 −1 test/Microsoft.AspNetCore.Server.KestrelTests/KestrelServerTests.cs
  12. +1 −2 test/Microsoft.AspNetCore.Server.KestrelTests/LoggingThreadPoolTests.cs
  13. +1 −0 test/Microsoft.AspNetCore.Server.KestrelTests/RequestTargetProcessingTests.cs
  14. +1 −0 test/Microsoft.AspNetCore.Server.KestrelTests/SocketInputTests.cs
  15. +1 −0 test/Microsoft.AspNetCore.Server.KestrelTests/SocketOutputTests.cs
  16. +1 −1 test/Microsoft.AspNetCore.Server.KestrelTests/StreamSocketOutputTests.cs
  17. +1 −0 test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/PassThroughConnectionFilter.cs
  18. +1 −0 test/Microsoft.AspNetCore.Server.KestrelTests/TestInput.cs
  19. +1 −1 test/{Microsoft.AspNetCore.Server.KestrelTests → shared}/DummyApplication.cs
  20. +1 −1 test/{Microsoft.AspNetCore.Server.KestrelTests → shared}/LifetimeNotImplemented.cs
  21. +1 −1 test/{Microsoft.AspNetCore.Server.KestrelTests/TestHelpers → shared}/MockSystemClock.cs
  22. +1 −2 test/{Microsoft.AspNetCore.Server.KestrelTests/TestHelpers → shared}/TestApplicationErrorLogger.cs
  23. +1 −1 test/{Microsoft.AspNetCore.Server.KestrelTests/TestHelpers → shared}/TestKestrelTrace.cs
  24. +1 −2 test/{Microsoft.AspNetCore.Server.KestrelTests → shared}/TestServer.cs
  25. +1 −2 test/{Microsoft.AspNetCore.Server.KestrelTests → shared}/TestServiceContext.cs
View
8 KestrelHttpServer.sln
@@ -34,7 +34,15 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Server
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{0EF2ACDF-012F-4472-A13A-4272419E2903}"
ProjectSection(SolutionItems) = preProject
+ test\shared\DummyApplication.cs = test\shared\DummyApplication.cs
test\shared\HttpClientSlim.cs = test\shared\HttpClientSlim.cs
+ test\shared\LifetimeNotImplemented.cs = test\shared\LifetimeNotImplemented.cs
+ test\shared\MockSystemClock.cs = test\shared\MockSystemClock.cs
+ test\shared\TestApplicationErrorLogger.cs = test\shared\TestApplicationErrorLogger.cs
+ test\shared\TestConnection.cs = test\shared\TestConnection.cs
+ test\shared\TestKestrelTrace.cs = test\shared\TestKestrelTrace.cs
+ test\shared\TestServer.cs = test\shared\TestServer.cs
+ test\shared\TestServiceContext.cs = test\shared\TestServiceContext.cs
EndProjectSection
EndProject
Global
View
1 src/Microsoft.AspNetCore.Server.Kestrel/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@
using System.Resources;
using System.Runtime.CompilerServices;
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.FunctionalTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.KestrelTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: AssemblyMetadata("Serviceable", "True")]
[assembly: NeutralResourcesLanguage("en-us")]
View
1 test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json
@@ -36,6 +36,7 @@
"../shared/**/*.cs"
]
},
+ "keyFile": "../../tools/Key.snk",
"copyToOutput": {
"include": "TestResources/testCert.pfx"
}
View
1 test/Microsoft.AspNetCore.Server.KestrelTests/ChunkedRequestTests.cs
@@ -7,6 +7,7 @@
using System.Text;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Testing;
using Xunit;
namespace Microsoft.AspNetCore.Server.KestrelTests
View
2 test/Microsoft.AspNetCore.Server.KestrelTests/ChunkedResponseTests.cs
@@ -5,7 +5,7 @@
using System.Text;
using System.Threading;
using System.Threading.Tasks;
-using Microsoft.AspNetCore.Server.Kestrel;
+using Microsoft.AspNetCore.Testing;
using Xunit;
namespace Microsoft.AspNetCore.Server.KestrelTests
View
1 test/Microsoft.AspNetCore.Server.KestrelTests/ConnectionFilterTests.cs
@@ -6,6 +6,7 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Server.Kestrel.Filter;
+using Microsoft.AspNetCore.Testing;
using Xunit;
namespace Microsoft.AspNetCore.Server.KestrelTests
View
1 test/Microsoft.AspNetCore.Server.KestrelTests/ConnectionTests.cs
@@ -6,6 +6,7 @@
using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure;
using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking;
using Microsoft.AspNetCore.Server.KestrelTests.TestHelpers;
+using Microsoft.AspNetCore.Testing;
using Xunit;
namespace Microsoft.AspNetCore.Server.KestrelTests
View
2 test/Microsoft.AspNetCore.Server.KestrelTests/DateHeaderValueManagerTests.cs
@@ -5,7 +5,7 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Server.Kestrel.Internal.Http;
using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure;
-using Microsoft.AspNetCore.Server.KestrelTests.TestHelpers;
+using Microsoft.AspNetCore.Testing;
using Xunit;
namespace Microsoft.AspNetCore.Server.KestrelTests
View
3 test/Microsoft.AspNetCore.Server.KestrelTests/DefaultHeaderTests.cs
@@ -2,9 +2,8 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Server.Kestrel;
using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure;
+using Microsoft.AspNetCore.Testing;
using Xunit;
namespace Microsoft.AspNetCore.Server.KestrelTests
View
1 test/Microsoft.AspNetCore.Server.KestrelTests/FrameTests.cs
@@ -10,6 +10,7 @@
using Microsoft.AspNetCore.Server.Kestrel.Internal.Http;
using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure;
using Microsoft.AspNetCore.Server.KestrelTests.TestHelpers;
+using Microsoft.AspNetCore.Testing;
using Xunit;
namespace Microsoft.AspNetCore.Server.KestrelTests
View
2 test/Microsoft.AspNetCore.Server.KestrelTests/KestrelServerTests.cs
@@ -2,11 +2,11 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
-using System.Reflection;
using Microsoft.AspNetCore.Hosting.Server;
using Microsoft.AspNetCore.Hosting.Server.Features;
using Microsoft.AspNetCore.Server.Kestrel;
using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure;
+using Microsoft.AspNetCore.Testing;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Moq;
View
3 test/Microsoft.AspNetCore.Server.KestrelTests/LoggingThreadPoolTests.cs
@@ -3,10 +3,9 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure;
+using Microsoft.AspNetCore.Testing;
using Xunit;
namespace Microsoft.AspNetCore.Server.KestrelTests
View
1 test/Microsoft.AspNetCore.Server.KestrelTests/RequestTargetProcessingTests.cs
@@ -4,6 +4,7 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Testing;
using Xunit;
namespace Microsoft.AspNetCore.Server.KestrelTests
View
1 test/Microsoft.AspNetCore.Server.KestrelTests/SocketInputTests.cs
@@ -7,6 +7,7 @@
using Microsoft.AspNetCore.Server.Kestrel.Internal.Http;
using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure;
using Microsoft.AspNetCore.Server.KestrelTests.TestHelpers;
+using Microsoft.AspNetCore.Testing;
using Moq;
using Xunit;
View
1 test/Microsoft.AspNetCore.Server.KestrelTests/SocketOutputTests.cs
@@ -10,6 +10,7 @@
using Microsoft.AspNetCore.Server.Kestrel.Internal.Http;
using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure;
using Microsoft.AspNetCore.Server.KestrelTests.TestHelpers;
+using Microsoft.AspNetCore.Testing;
using Xunit;
namespace Microsoft.AspNetCore.Server.KestrelTests
View
2 test/Microsoft.AspNetCore.Server.KestrelTests/StreamSocketOutputTests.cs
@@ -3,9 +3,9 @@
using System;
using System.IO;
-using Microsoft.AspNetCore.Server.Kestrel.Filter;
using Microsoft.AspNetCore.Server.Kestrel.Filter.Internal;
using Microsoft.AspNetCore.Server.Kestrel.Internal.Http;
+using Microsoft.AspNetCore.Testing;
using Xunit;
namespace Microsoft.AspNetCore.Server.KestrelTests
View
1 test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/PassThroughConnectionFilter.cs
@@ -5,6 +5,7 @@
using Microsoft.AspNetCore.Server.Kestrel.Filter;
using Microsoft.AspNetCore.Server.Kestrel.Filter.Internal;
using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure;
+using Microsoft.AspNetCore.Testing;
namespace Microsoft.AspNetCore.Server.KestrelTests
{
View
1 test/Microsoft.AspNetCore.Server.KestrelTests/TestInput.cs
@@ -9,6 +9,7 @@
using Microsoft.AspNetCore.Server.Kestrel.Internal.Http;
using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure;
using Microsoft.AspNetCore.Server.KestrelTests.TestHelpers;
+using Microsoft.AspNetCore.Testing;
namespace Microsoft.AspNetCore.Server.KestrelTests
{
View
2 ...e.Server.KestrelTests/DummyApplication.cs → test/shared/DummyApplication.cs
@@ -7,7 +7,7 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Features;
-namespace Microsoft.AspNetCore.Server.KestrelTests
+namespace Microsoft.AspNetCore.Testing
{
public class DummyApplication : IHttpApplication<HttpContext>
{
View
2 ...er.KestrelTests/LifetimeNotImplemented.cs → test/shared/LifetimeNotImplemented.cs
@@ -5,7 +5,7 @@
using System.Threading;
using Microsoft.AspNetCore.Hosting;
-namespace Microsoft.AspNetCore.Server.KestrelTests
+namespace Microsoft.AspNetCore.Testing
{
public class LifetimeNotImplemented : IApplicationLifetime
{
View
2 ...strelTests/TestHelpers/MockSystemClock.cs → test/shared/MockSystemClock.cs
@@ -4,7 +4,7 @@
using System;
using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure;
-namespace Microsoft.AspNetCore.Server.KestrelTests.TestHelpers
+namespace Microsoft.AspNetCore.Testing
{
public class MockSystemClock : ISystemClock
{
View
3 ...TestHelpers/TestApplicationErrorLogger.cs → test/shared/TestApplicationErrorLogger.cs
@@ -2,11 +2,10 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
-using Microsoft.AspNetCore.Server.Kestrel;
using Microsoft.AspNetCore.Server.Kestrel.Internal;
using Microsoft.Extensions.Logging;
-namespace Microsoft.AspNetCore.Server.KestrelTests
+namespace Microsoft.AspNetCore.Testing
{
public class TestApplicationErrorLogger : ILogger
{
View
2 ...trelTests/TestHelpers/TestKestrelTrace.cs → test/shared/TestKestrelTrace.cs
@@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Server.Kestrel.Internal;
using Microsoft.Extensions.Logging;
-namespace Microsoft.AspNetCore.Server.KestrelTests
+namespace Microsoft.AspNetCore.Testing
{
public class TestKestrelTrace : KestrelTrace
{
View
3 ...NetCore.Server.KestrelTests/TestServer.cs → test/shared/TestServer.cs
@@ -6,9 +6,8 @@
using Microsoft.AspNetCore.Server.Kestrel;
using Microsoft.AspNetCore.Server.Kestrel.Internal;
using Microsoft.AspNetCore.Server.Kestrel.Internal.Http;
-using Microsoft.AspNetCore.Testing;
-namespace Microsoft.AspNetCore.Server.KestrelTests
+namespace Microsoft.AspNetCore.Testing
{
/// <summary>
/// Summary description for TestServer
View
3 ...Server.KestrelTests/TestServiceContext.cs → test/shared/TestServiceContext.cs
@@ -8,9 +8,8 @@
using Microsoft.AspNetCore.Server.Kestrel.Internal;
using Microsoft.AspNetCore.Server.Kestrel.Internal.Http;
using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure;
-using Microsoft.AspNetCore.Server.KestrelTests.TestHelpers;
-namespace Microsoft.AspNetCore.Server.KestrelTests
+namespace Microsoft.AspNetCore.Testing
{
public class TestServiceContext : ServiceContext
{

0 comments on commit 19f8958

Please sign in to comment.