From 4a5d8f2960b43e17295d83997b4ed715013577bc Mon Sep 17 00:00:00 2001 From: Chris R Date: Tue, 22 Nov 2016 16:05:42 -0800 Subject: [PATCH] #126 Test the bin deployed aspnetcore.dll --- WebSockets.sln | 1 + test/AutobahnTestApp/project.json | 1 + .../Autobahn/AutobahnTester.cs | 4 +- .../Http.config | 1029 +++++++++++++++++ .../project.json | 2 +- 5 files changed, 1035 insertions(+), 2 deletions(-) create mode 100644 test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Http.config diff --git a/WebSockets.sln b/WebSockets.sln index 94f0f8e042..9b752188e5 100644 --- a/WebSockets.sln +++ b/WebSockets.sln @@ -11,6 +11,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{86E1ADA2-631C-484F-906C-2D0BCF628E65}" ProjectSection(SolutionItems) = preProject global.json = global.json + NuGet.config = NuGet.config EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestServer", "samples\TestServer\TestServer.csproj", "{4E5F5FCC-172C-44D9-BEA0-39098A79CD0B}" diff --git a/test/AutobahnTestApp/project.json b/test/AutobahnTestApp/project.json index 5d4a550d9c..85f87150cd 100644 --- a/test/AutobahnTestApp/project.json +++ b/test/AutobahnTestApp/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.AspNetCore.AspNetCoreModule": "1.0.0-*", "Microsoft.AspNetCore.Diagnostics": "1.2.0-*", "Microsoft.AspNetCore.Server.IISIntegration": "1.2.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*", diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnTester.cs b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnTester.cs index 3217f4029b..045e86428c 100644 --- a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnTester.cs +++ b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnTester.cs @@ -100,7 +100,9 @@ namespace Microsoft.AspNetCore.WebSockets.ConformanceTest.Autobahn ApplicationBaseUriHint = baseUrl, ApplicationType = ApplicationType.Portable, TargetFramework = "netcoreapp1.1", - EnvironmentName = environment + EnvironmentName = environment, + SiteName = "HttpTestSite", // This is configured in the Http.config + ServerConfigTemplateContent = (server == ServerType.IISExpress) ? File.ReadAllText("Http.config") : null, }; var deployer = ApplicationDeployerFactory.Create(parameters, logger); diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Http.config b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Http.config new file mode 100644 index 0000000000..3668f762c8 --- /dev/null +++ b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Http.config @@ -0,0 +1,1029 @@ + + + + + + + + +
+
+
+
+
+
+
+
+ + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+ + +
+
+
+
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/project.json b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/project.json index 91c30bb791..f3f62c16dd 100644 --- a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/project.json +++ b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/project.json @@ -1,7 +1,7 @@ { "dependencies": { "dotnet-test-xunit": "2.2.0-*", - "Microsoft.AspNetCore.Server.IntegrationTesting": "0.2.0-*", + "Microsoft.AspNetCore.Server.IntegrationTesting": "0.3.0-*", "Microsoft.AspNetCore.Testing": "1.2.0-*", "Microsoft.Extensions.Logging": "1.2.0-*", "Microsoft.Extensions.Logging.Console": "1.2.0-*",